kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2025-02-08

Browse Source
This commit is contained in:
github-actions
2025-02-08 08:18:18 +01:00
parent 2189fb46a2
commit f3fe86167c
48 changed files with 498 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Support/Search/QueryParser/Node.php
View File

@@ -56,20 +56,23 @@ abstract class Node
}
public function equals(Node $compare): bool
public function equals(self $compare): bool
{
if ($compare->isProhibited(false) !== $this->isProhibited(false)) {
Log::debug('Return false because prohibited status is different');
return false;
}
if ($compare instanceof NodeGroup) {
if (count($compare->getNodes()) !== count($this->getNodes())) {
Log::debug(sprintf('Return false because node count is different. Original is %d, compare is %d', count($this->getNodes()), count($compare->getNodes())));
// var_dump($this);
// var_dump($compare);
// exit;
// var_dump($this);
// var_dump($compare);
// exit;
return false;
}
/**
* @var int $index
* @var Node $node
@@ -79,12 +82,16 @@ abstract class Node
Log::debug('Return false because nodes are different!');
var_dump($this);
var_dump($compare);
exit;
return false;
}
}
return true;
}
return true;
}
}

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

@@ -71,7 +71,7 @@ class QueryParser implements QueryParserInterface
while ($this->position < strlen($this->query)) {
$char = $this->query[$this->position];
//Log::debug(sprintf('Char #%d: %s', $this->position, $char));
// Log::debug(sprintf('Char #%d: %s', $this->position, $char));
// If we're in a quoted string, we treat all characters except another quote as ordinary characters
if ($inQuotes) {