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

Move boolean logic in is own namespace

Browse Source
This commit is contained in:
Mathieu Darse
2015-11-03 18:42:56 +01:00
parent f1d6141766
commit 652f8be213
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/AndExpression.php → lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/Boolean/AndOperator.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST\Boolean;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
class AndExpression extends BinaryOperator
class AndOperator extends BinaryOperator
{
protected $operator = 'AND';

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/BinaryOperator.php → lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/Boolean/BinaryOperator.php
View File

@@ -1,6 +1,8 @@
<?php
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST\Boolean;
use Alchemy\Phrasea\SearchEngine\Elastic\AST\Node;
abstract class BinaryOperator extends Node
{

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/ExceptExpression.php → lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/Boolean/ExceptOperator.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST\Boolean;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
class ExceptExpression extends BinaryOperator
class ExceptOperator extends BinaryOperator
{
protected $operator = 'EXCEPT';

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/OrExpression.php → lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/Boolean/OrOperator.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST;
namespace Alchemy\Phrasea\SearchEngine\Elastic\AST\Boolean;
use Alchemy\Phrasea\SearchEngine\Elastic\Search\QueryContext;
class OrExpression extends BinaryOperator
class OrOperator extends BinaryOperator
{
protected $operator = 'OR';

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

@@ -121,21 +121,21 @@ class QueryVisitor implements Visit
private function visitAndNode(Element $element)
{
return $this->handleBinaryOperator($element, function($left, $right) {
return new AST\AndExpression($left, $right);
return new AST\Boolean\AndOperator($left, $right);
});
}
private function visitOrNode(Element $element)
{
return $this->handleBinaryOperator($element, function($left, $right) {
return new AST\OrExpression($left, $right);
return new AST\Boolean\OrOperator($left, $right);
});
}
private function visitExceptNode(Element $element)
{
return $this->handleBinaryOperator($element, function($left, $right) {
return new AST\ExceptExpression($left, $right);
return new AST\Boolean\ExceptOperator($left, $right);
});
}