minor #58461 [ExpressionLanguage] Improve tests on BinaryNode (alexandre-daubois)

fabpot · fabpot · commit e00cc1202473 · 2024-10-06T11:39:04.000+02:00
This PR was merged into the 7.2 branch.

Discussion
----------

[ExpressionLanguage] Improve tests on `BinaryNode`

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Issues        | -
| License       | MIT

`in` and `not in` have a shortcut above the operator switch. Also, `BinaryNode::evaluate()` may throw an error, lacking a return value when the operator is unsupported.

Commits
-------

c03cbe3c0c [ExpressionLanguage] Improve tests on `BinaryNode`
diff --git a/Node/BinaryNode.php b/Node/BinaryNode.php
@@ -154,10 +154,6 @@ public function evaluate(array $functions, array $values): mixed
                 return $left >= $right;
             case '<=':
                 return $left <= $right;
-            case 'not in':
-                return !\in_array($left, $right, true);
-            case 'in':
-                return \in_array($left, $right, true);
             case '+':
                 return $left + $right;
             case '-':
@@ -181,6 +177,8 @@ public function evaluate(array $functions, array $values): mixed
             case 'matches':
                 return $this->evaluateMatches($right, $left);
         }
+
+        throw new \LogicException(\sprintf('"%s" does not support the "%s" operator.', __CLASS__, $operator));
     }
 
     public function toArray(): array
diff --git a/Tests/Node/BinaryNodeTest.php b/Tests/Node/BinaryNodeTest.php
@@ -279,4 +279,14 @@ public function testInOperatorStrictness(mixed $value)
 
         $this->assertFalse($node->evaluate([], []));
     }
+
+    public function testEvaluateUnsupportedOperator()
+    {
+        $node = new BinaryNode('unsupported', new ConstantNode(1), new ConstantNode(2));
+
+        $this->expectException(\LogicException::class);
+        $this->expectExceptionMessage('"Symfony\Component\ExpressionLanguage\Node\BinaryNode" does not support the "unsupported" operator.');
+
+        $node->evaluate([], []);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -279,4 +279,14 @@ public function testInOperatorStrictness(mixed $value)`
`279`	`279`
`280`	`280`	`$this->assertFalse($node->evaluate([], []));`
`281`	`281`	`}`
	`282`	`+`
	`283`	`+ public function testEvaluateUnsupportedOperator()`
	`284`	`+ {`
	`285`	`+ $node = new BinaryNode('unsupported', new ConstantNode(1), new ConstantNode(2));`
	`286`	`+`
	`287`	`+ $this->expectException(\LogicException::class);`
	`288`	`+ $this->expectExceptionMessage('"Symfony\Component\ExpressionLanguage\Node\BinaryNode" does not support the "unsupported" operator.');`
	`289`	`+`
	`290`	`+ $node->evaluate([], []);`
	`291`	`+ }`
`282`	`292`	`}`