[HttpKernel] Fix a regression in the RequestDataCollector

jakzal · jakzal · commit 57008ea42bd5 · 2016-10-18T21:24:10.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -374,7 +374,7 @@ protected function parseController($controller)
             );
         }
 
-        return (string) $controller ?: 'n/a';
+        return is_string($controller) ? $controller : 'n/a';
     }
 
     private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly)
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpKernel\Tests\DataCollector;
 
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
@@ -182,6 +183,17 @@ function () { return 'foo'; },
         );
     }
 
+    public function testItIgnoresInvalidCallables()
+    {
+        $request = $this->createRequestWithSession();
+        $response = new RedirectResponse('/');
+
+        $c = new RequestDataCollector();
+        $c->collect($request, $response);
+
+        $this->assertSame('n/a', $c->getController());
+    }
+
     protected function createRequest()
     {
         $request = Request::create('http://test.com/foo?bar=baz');
@@ -194,6 +206,16 @@ protected function createRequest()
         return $request;
     }
 
+    private function createRequestWithSession()
+    {
+        $request = $this->createRequest();
+        $request->attributes->set('_controller', 'Foo::bar');
+        $request->setSession(new Session(new MockArraySessionStorage()));
+        $request->getSession()->start();
+
+        return $request;
+    }
+
     protected function createResponse()
     {
         $response = new Response();

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ protected function parseController($controller)`
`374`	`374`	`);`
`375`	`375`	`}`
`376`	`376`
`377`		`- return (string) $controller ?: 'n/a';`
	`377`	`+ return is_string($controller) ? $controller : 'n/a';`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`private function getCookieHeader($name, $value, $expires, $path, $domain, $secure, $httponly)`