Fix issue with RequestMatcher when attribute is a closure

Plopix · Plopix · commit 66491238e3a1 · 2021-04-15T08:06:12.000-07:00
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -167,7 +167,11 @@ public function matches(Request $request)
         }
 
         foreach ($this->attributes as $key => $pattern) {
-            if (!preg_match('{'.$pattern.'}', $request->attributes->get($key))) {
+            $requestAttribute = $request->attributes->get($key);
+            if (!\is_string($requestAttribute)) {
+                return false;
+            }
+            if (!preg_match('{'.$pattern.'}', $requestAttribute)) {
                 return false;
             }
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestMatcherTest.php
@@ -163,4 +163,17 @@ public function testAttributes()
         $matcher->matchAttribute('foo', 'babar');
         $this->assertFalse($matcher->matches($request));
     }
+
+    public function testAttributesWithClosure()
+    {
+        $matcher = new RequestMatcher();
+
+        $request = Request::create('/admin/foo');
+        $request->attributes->set('_controller', function () {
+            return new Response('foo');
+        });
+
+        $matcher->matchAttribute('_controller', 'babar');
+        $this->assertFalse($matcher->matches($request));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,11 @@ public function matches(Request $request)`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`foreach ($this->attributes as $key => $pattern) {`
`170`		`- if (!preg_match('{'.$pattern.'}', $request->attributes->get($key))) {`
	`170`	`+ $requestAttribute = $request->attributes->get($key);`
	`171`	`+ if (!\is_string($requestAttribute)) {`
	`172`	`+ return false;`
	`173`	`+ }`
	`174`	`+ if (!preg_match('{'.$pattern.'}', $requestAttribute)) {`
`171`	`175`	`return false;`
`172`	`176`	`}`
`173`	`177`	`}`