kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Include safe methods and require the correct package.

Browse Source
This commit is contained in:
James Cole
2025-05-11 14:19:07 +02:00
parent 4af2aadc48
commit 9a02739251
61 changed files with 295 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Validation/Api/Data/Bulk/ValidatesBulkTransactionQuery.php
View File

@@ -34,7 +34,7 @@ trait ValidatesBulkTransactionQuery
$data = $validator->getData();
// assumption is all validation has already taken place and the query key exists.
$query = $data['query'] ?? '[]';
$json = json_decode($query, true, 8, JSON_THROW_ON_ERROR);
$json = \Safe\json_decode($query, true, 8, JSON_THROW_ON_ERROR);
if (
array_key_exists('where', $json)

6
app/Validation/FireflyValidator.php
View File

@@ -110,7 +110,7 @@ class FireflyValidator extends Validator
return false;
}
$regex = '/^[a-z]{6}[0-9a-z]{2}([0-9a-z]{3})?\z/i';
$result = preg_match($regex, $value);
$result = \Safe\preg_match($regex, $value);
if (false === $result || 0 === $result) {
return false;
}
@@ -200,7 +200,7 @@ class FireflyValidator extends Validator
$value = strtoupper($value);
// replace characters outside of ASCI range.
$value = (string) iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $value);
$value = (string) \Safe\iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $value);
$search = [' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'];
$replace = ['', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '32', '33', '34', '35'];
@@ -634,7 +634,7 @@ class FireflyValidator extends Validator
->whereNull('accounts.deleted_at')
->where('accounts.user_id', auth()->user()->id)
->where('account_meta.name', 'account_number')
->where('account_meta.data', json_encode($value))
->where('account_meta.data', \Safe\json_encode($value))
;
if ($accountId > 0) {