hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

BooleanOperator → BooleanExpression

Browse Source
This commit is contained in:
Mathieu Darse
2015-11-10 14:56:50 +01:00
parent 9f923e0409
commit c89d48c6f7
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/QueryVisitor.php
View File

@@ -125,21 +125,21 @@ class QueryVisitor implements Visit
private function visitAndNode(Element $element)
{
return $this->handleBinaryExpression($element, function($left, $right) {
return new AST\Boolean\AndOperator($left, $right);
return new AST\Boolean\AndExpression($left, $right);
});
}
private function visitOrNode(Element $element)
{
return $this->handleBinaryExpression($element, function($left, $right) {
return new AST\Boolean\OrOperator($left, $right);
return new AST\Boolean\OrExpression($left, $right);
});
}
private function visitExceptNode(Element $element)
{
return $this->handleBinaryExpression($element, function($left, $right) {
return new AST\Boolean\ExceptOperator($left, $right);
return new AST\Boolean\ExceptExpression($left, $right);
});
}
@@ -236,7 +236,7 @@ class QueryVisitor implements Visit
throw new Exception('Unexpected context after non-contextualizable node');
}
} elseif ($node instanceof AST\Node) {
$root = new AST\Boolean\AndOperator($root, $node);
$root = new AST\Boolean\AndExpression($root, $node);
} else {
throw new Exception('Unexpected node type inside text node.');
}