Merge branch '4.4'

* 4.4:
  [ExpressionLanguage] add XOR operator

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.4.0
+-----
+
+ * add `xor` operator
+
 4.0.0
 -----
 

Lexer.php

@@ -71,7 +71,7 @@ public function tokenize(string $expression)
                 // strings
                 $tokens[] = new Token(Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)), $cursor + 1);
                 $cursor += \strlen($match[0]);
-            } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
+            } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|xor(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
                 // operators
                 $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
                 $cursor += \strlen($match[0]);

Node/BinaryNode.php

@@ -104,6 +104,8 @@ public function evaluate(array $functions, array $values)
             case 'or':
             case '||':
                 return $left || $this->nodes['right']->evaluate($functions, $values);
+            case 'xor':
+                return $left xor $this->nodes['right']->evaluate($functions, $values);
             case 'and':
             case '&&':
                 return $left && $this->nodes['right']->evaluate($functions, $values);

Parser.php

@@ -45,6 +45,7 @@ public function __construct(array $functions)
         $this->binaryOperators = [
             'or' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
             '||' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
+            'xor' => ['precedence' => 13, 'associativity' => self::OPERATOR_LEFT],
             'and' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
             '&&' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
             '|' => ['precedence' => 16, 'associativity' => self::OPERATOR_LEFT],

Tests/ExpressionLanguageTest.php

@@ -256,4 +256,35 @@ function (ExpressionLanguage $el) {
             ],
         ];
     }
+
+    /**
+     * @dataProvider getLogicalOperators
+     */
+    public function testLogicalOperators($expression, $expected)
+    {
+        $this->assertSame($expected, (new ExpressionLanguage())->evaluate($expression));
+    }
+
+    public function getLogicalOperators()
+    {
+        return [
+            // AND
+            ['true and true', true],
+            ['true and false', false],
+            ['false and true', false],
+            ['false and false', false],
+
+            // OR
+            ['true or true', true],
+            ['true or false', true],
+            ['false or true', true],
+            ['false or false', false],
+
+            // XOR
+            ['true xor true', false],
+            ['true xor false', true],
+            ['false xor true', true],
+            ['false xor false', false],
+        ];
+    }
 }

Tests/LexerTest.php

@@ -114,6 +114,14 @@ public function getTokenizeData()
                 [new Token('string', '#foo', 1)],
                 '"#foo"',
             ],
+            [
+                [
+                    new Token('name', 'a', 1),
+                    new Token('operator', 'xor', 3),
+                    new Token('name', 'b', 7),
+                ],
+                'a xor b',
+            ],
         ];
     }
 }

Tests/ParserTest.php

@@ -151,6 +151,11 @@ public function getParseData()
                 'bar',
                 ['foo' => 'bar'],
             ],
+
+            [
+                new Node\BinaryNode('xor', new Node\ConstantNode(true), new Node\ConstantNode(false)),
+                'true xor false',
+            ],
         ];
     }