Fix build with PHP 5.6.

gomoob · Nov 28, 2017 · 42e5703 · 42e5703
1 parent 47b36b9
commit 42e5703
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/main/php/Gomoob/Filter/Sql/SqlFilterConverter.php b/src/main/php/Gomoob/Filter/Sql/SqlFilterConverter.php
@@ -532,8 +532,8 @@ private function transformComplexFilter(
 
             // If a logical expression is expressed
             if (count($tokens) === 3 &&
-                ($tokens[1]->getTokenCode() === LogicOperatorToken::AND ||
-                 $tokens[1]->getTokenCode() === LogicOperatorToken::OR)) {
+                ($tokens[1]->getTokenCode() === LogicOperatorToken::AND_OPERATOR ||
+                 $tokens[1]->getTokenCode() === LogicOperatorToken::OR_OPERATOR)) {
                 // Transform the first part of the logical expression
                 $sqlFilter1 = $this->transformSimpleFilter($key, $tokens[0]->getSequence(), $context);
 
@@ -543,9 +543,9 @@ private function transformComplexFilter(
                 // Creates the resulting SQL logical expression
                 $result[0] = $sqlFilter1->getExpression();
 
-                if ($tokens[1]->getTokenCode() === LogicOperatorToken::AND) {
+                if ($tokens[1]->getTokenCode() === LogicOperatorToken::AND_OPERATOR) {
                     $result[0] .= ' AND ';
-                } elseif ($tokens[1]->getTokenCode() === LogicOperatorToken::OR) {
+                } elseif ($tokens[1]->getTokenCode() === LogicOperatorToken::OR_OPERATOR) {
                     $result[0] .= ' OR ';
                 }
 

diff --git a/src/main/php/Gomoob/Filter/Tokenizer/LogicOperatorToken.php b/src/main/php/Gomoob/Filter/Tokenizer/LogicOperatorToken.php
@@ -34,11 +34,10 @@
  */
 class LogicOperatorToken extends Token
 {
-
     /**
      * Token code associated to the '+' terminal.
      */
-    const AND = 1;
+    const AND_OPERATOR = 1;
 
     /**
      * Token code associated to an integer or float number terminal.
@@ -48,7 +47,7 @@ class LogicOperatorToken extends Token
     /**
      * Token code associated to the '-' terminal.
      */
-    const OR = 3;
+    const OR_OPERATOR = 3;
 
     /**
      * Token code associated to a string terminal.

diff --git a/src/main/php/Gomoob/Filter/Tokenizer/LogicOperatorTokenizer.php b/src/main/php/Gomoob/Filter/Tokenizer/LogicOperatorTokenizer.php
@@ -47,8 +47,8 @@ public function __construct()
         // WARNING, ORDER IS VERY IMPORTANT
 
         // Logic operator
-        $this->addTokenInfo('(\+)', LogicOperatorToken::AND);
-        $this->addTokenInfo('(-)', LogicOperatorToken::OR);
+        $this->addTokenInfo('(\+)', LogicOperatorToken::AND_OPERATOR);
+        $this->addTokenInfo('(-)', LogicOperatorToken::OR_OPERATOR);
 
         // "Raw" values
         $this->addTokenInfo('([0-9.]+)', LogicOperatorToken::NUMBER);