Fix issue with RequestMatcher when attribute is a closure

symfony · Apr 15, 2021 · bc4e440 · bc4e440
1 parent 005b951
commit bc4e440
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/RequestMatcher.php b/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/Tests/RequestMatcherTest.php b/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));
+    }
 }