[ExpressionLanguage] Fix matches to handle booleans being used as regexp

ivantsepp · fabpot · commit e0fbc7ee0237 · 2024-10-06T11:28:53.000+02:00
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -52,6 +52,8 @@ public function compile(Compiler $compiler): void
         if ('matches' == $operator) {
             if ($this->nodes['right'] instanceof ConstantNode) {
                 $this->evaluateMatches($this->nodes['right']->evaluate([], []), '');
+            } elseif ($this->nodes['right'] instanceof self && '~' !== $this->nodes['right']->attributes['operator']) {
+                throw new SyntaxError('The regex passed to "matches" must be a string.');
             }
 
             $compiler
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -221,6 +221,27 @@ public function testCompileMatchesWithInvalidRegexpAsExpression()
         eval('$regexp = "this is not a regexp"; '.$compiler->getSource().';');
     }
 
+    public function testCompileMatchesWithBooleanBinaryNode()
+    {
+        $binaryNode = new BinaryNode('||', new ConstantNode(true), new ConstantNode(false));
+        $node = new BinaryNode('matches', new ConstantNode('abc'), $binaryNode);
+
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('The regex passed to "matches" must be a string');
+        $compiler = new Compiler([]);
+        $node->compile($compiler);
+    }
+
+    public function testCompileMatchesWithStringBinaryNode()
+    {
+        $binaryNode = new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'));
+        $node = new BinaryNode('matches', new ConstantNode('abc'), $binaryNode);
+
+        $compiler = new Compiler([]);
+        $node->compile($compiler);
+        $this->expectNotToPerformAssertions();
+    }
+
     public function testDivisionByZero()
     {
         $node = new BinaryNode('/', new ConstantNode(1), new ConstantNode(0));

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@ public function compile(Compiler $compiler): void`
`52`	`52`	`if ('matches' == $operator) {`
`53`	`53`	`if ($this->nodes['right'] instanceof ConstantNode) {`
`54`	`54`	`$this->evaluateMatches($this->nodes['right']->evaluate([], []), '');`
	`55`	`+ } elseif ($this->nodes['right'] instanceof self && '~' !== $this->nodes['right']->attributes['operator']) {`
	`56`	`+ throw new SyntaxError('The regex passed to "matches" must be a string.');`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`$compiler`