kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-17 11:59:05 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-10-30

Browse Source
This commit is contained in:
JC5
2025-10-30 20:51:16 +01:00
parent 2aabb56d2d
commit c29f997733
4 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Support/Search/QueryParser/QueryParser.php
View File

@@ -64,7 +64,7 @@ class QueryParser implements QueryParserInterface
if ('\\' === $char && '"' === $nextChar) {
// Log::debug('BACKSLASH!');
// escaped quote, pretend it's a normal char and continue two places (skipping the actual character).
$tokenUnderConstruction .= '\\' . $nextChar;
$tokenUnderConstruction .= '\\'.$nextChar;
$this->position += 2;
continue;
@@ -147,7 +147,7 @@ class QueryParser implements QueryParserInterface
if ('' === $tokenUnderConstruction) {
// In any other location, it's just a normal character
$tokenUnderConstruction .= $char;
$skipNext = true;
$skipNext = true;
}
if ('' !== $tokenUnderConstruction && !$skipNext) { // @phpstan-ignore-line
Log::debug(sprintf('Turns out that "%s" is a field name. Reset the token.', $tokenUnderConstruction));
@@ -179,7 +179,7 @@ class QueryParser implements QueryParserInterface
++$this->position;
}
$finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName
$finalNode = '' !== $tokenUnderConstruction || '' !== $fieldName
? $this->createNode($tokenUnderConstruction, $fieldName, $prohibited)
: null;
@@ -192,7 +192,7 @@ class QueryParser implements QueryParserInterface
$nodeResult = $this->buildNextNode($isSubquery);
while ($nodeResult->node instanceof Node) {
$nodes[] = $nodeResult->node;
$nodes[] = $nodeResult->node;
if ($nodeResult->isSubqueryEnd) {
break;
}
@@ -207,10 +207,10 @@ class QueryParser implements QueryParserInterface
if ('' !== $fieldName) {
// OK dus hoe trim je \" correct?
$token = ltrim($token, ':"');
if (!str_ends_with($token, '\\"')) {
if (!str_ends_with($token, '\"')) {
$token = rtrim($token, '"');
}
$token = str_replace('\\"', '"', $token);
$token = str_replace('\"', '"', $token);
Log::debug(sprintf('Create FieldNode %s:%s (%s)', $fieldName, $token, var_export($prohibited, true)));
return new FieldNode(trim($fieldName), trim($token), $prohibited);