feature #34333 Revert "feature #34329 [ExpressionLanguage] add XOR operator (ottaviano)" (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 7cee181e0855 · 2019-11-12T15:57:18.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- Revert "feature #34329 [ExpressionLanguage] add XOR operator (ottaviano)" | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This reverts commit d1d4bc8, reversing changes made to f63976f. Commits ------- adb716d Revert "feature #34329 [ExpressionLanguage] add XOR operator (ottaviano)"
diff --git a/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md b/src/Symfony/Component/ExpressionLanguage/CHANGELOG.md
@@ -1,11 +1,6 @@
 CHANGELOG
 =========
 
-4.4.0
------
-
- * add `xor` operator
-
 4.0.0
 -----
 
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -73,7 +73,7 @@ public function tokenize($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(])|xor(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
+            } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
                 // operators
                 $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
                 $cursor += \strlen($match[0]);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -104,8 +104,6 @@ public function evaluate($functions, $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);
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -45,7 +45,6 @@ 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],
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -256,35 +256,4 @@ 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],
-        ];
-    }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -114,14 +114,6 @@ 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',
-            ],
         ];
     }
 }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -151,11 +151,6 @@ public function getParseData()
                 'bar',
                 ['foo' => 'bar'],
             ],
-
-            [
-                new Node\BinaryNode('xor', new Node\ConstantNode(true), new Node\ConstantNode(false)),
-                'true xor false',
-            ],
         ];
     }
 
