[ExpressionLanguage] Fix matching null against a regular expression

ausi · fabpot · commit 3326da0e6fdb · 2022-04-03T18:32:29.000+02:00
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -52,7 +52,7 @@ public function compile(Compiler $compiler)
             }
 
             $compiler
-                ->raw('(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, $str); } finally { restore_error_handler(); } })(')
+                ->raw('(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, (string) $str); } finally { restore_error_handler(); } })(')
                 ->compile($this->nodes['right'])
                 ->raw(', ')
                 ->compile($this->nodes['left'])
@@ -173,13 +173,13 @@ public function toArray()
         return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
     }
 
-    private function evaluateMatches(string $regexp, string $str): int
+    private function evaluateMatches(string $regexp, ?string $str): int
     {
         set_error_handler(function ($t, $m) use ($regexp) {
             throw new SyntaxError(sprintf('Regexp "%s" passed to "matches" is not valid', $regexp).substr($m, 12));
         });
         try {
-            return preg_match($regexp, $str);
+            return preg_match($regexp, (string) $str);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/BinaryNodeTest.php
@@ -66,6 +66,8 @@ public function getEvaluateData()
             [[1, 2, 3], new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
             [1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
+            [0, new BinaryNode('matches', new ConstantNode(''), new ConstantNode('/^[a-z]+$/'))],
+            [0, new BinaryNode('matches', new ConstantNode(null), new ConstantNode('/^[a-z]+$/'))],
         ];
     }
 
@@ -114,7 +116,7 @@ public function getCompileData()
 
             ['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
 
-            ['(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, $str); } finally { restore_error_handler(); } })("/^[a-z]+\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
+            ['(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, (string) $str); } finally { restore_error_handler(); } })("/^[a-z]+\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function compile(Compiler $compiler)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$compiler`
`55`		`- ->raw('(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, $str); } finally { restore_error_handler(); } })(')`
	`55`	`+ ->raw('(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, (string) $str); } finally { restore_error_handler(); } })(')`
`56`	`56`	`->compile($this->nodes['right'])`
`57`	`57`	`->raw(', ')`
`58`	`58`	`->compile($this->nodes['left'])`
`@@ -173,13 +173,13 @@ public function toArray()`
`173`	`173`	`return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];`
`174`	`174`	`}`
`175`	`175`
`176`		`- private function evaluateMatches(string $regexp, string $str): int`
	`176`	`+ private function evaluateMatches(string $regexp, ?string $str): int`
`177`	`177`	`{`
`178`	`178`	`set_error_handler(function ($t, $m) use ($regexp) {`
`179`	`179`	`throw new SyntaxError(sprintf('Regexp "%s" passed to "matches" is not valid', $regexp).substr($m, 12));`
`180`	`180`	`});`
`181`	`181`	`try {`
`182`		`- return preg_match($regexp, $str);`
	`182`	`+ return preg_match($regexp, (string) $str);`
`183`	`183`	`} finally {`
`184`	`184`	`restore_error_handler();`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ public function getEvaluateData()`
`66`	`66`	`[[1, 2, 3], new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],`
`67`	`67`
`68`	`68`	`[1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],`
	`69`	`+ [0, new BinaryNode('matches', new ConstantNode(''), new ConstantNode('/^[a-z]+$/'))],`
	`70`	`+ [0, new BinaryNode('matches', new ConstantNode(null), new ConstantNode('/^[a-z]+$/'))],`
`69`	`71`	`];`
`70`	`72`	`}`
`71`	`73`
`@@ -114,7 +116,7 @@ public function getCompileData()`
`114`	`116`
`115`	`117`	`['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],`
`116`	`118`
`117`		`- ['(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, $str); } finally { restore_error_handler(); } })("/^[a-z]+\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],`
	`119`	`+ ['(static function ($regexp, $str) { set_error_handler(function ($t, $m) use ($regexp, $str) { throw new \Symfony\Component\ExpressionLanguage\SyntaxError(sprintf(\'Regexp "%s" passed to "matches" is not valid\', $regexp).substr($m, 12)); }); try { return preg_match($regexp, (string) $str); } finally { restore_error_handler(); } })("/^[a-z]+\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],`
`118`	`120`	`];`
`119`	`121`	`}`
`120`	`122`