diff --git a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
index c5d0673deadc3..c2edc86378d64 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php
@@ -28,7 +28,7 @@ public function guessRoute(Request $request, $controller)
$controller = $controller[0];
}
- if ($controller instanceof RedirectController) {
+ if ($controller instanceof RedirectController && $request->attributes->has('_route')) {
return $request->attributes->get('_route');
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DataCollector/RouterDataCollectorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DataCollector/RouterDataCollectorTest.php
new file mode 100644
index 0000000000000..5681bd04ae48f
--- /dev/null
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DataCollector/RouterDataCollectorTest.php
@@ -0,0 +1,66 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DataCollector;
+
+use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
+use Symfony\Bundle\FrameworkBundle\DataCollector\RouterDataCollector;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+class RouterDataCollectorTest extends TestCase
+{
+ public function testRouteRedirectControllerNoRouteAtrribute()
+ {
+ $collector = new RouterDataCollector();
+
+ $request = Request::create('http://test.com/foo?bar=baz');
+ $response = new RedirectResponse('http://test.com/redirect');
+
+ $event = $this->createControllerEvent($request);
+
+ $collector->onKernelController($event);
+ $collector->collect($request, $response);
+
+ $this->assertTrue($collector->getRedirect());
+ $this->assertEquals('http://test.com/redirect', $collector->getTargetUrl());
+ $this->assertEquals('n/a', $collector->getTargetRoute());
+ }
+
+ public function testRouteRedirectControllerWithRouteAttribute()
+ {
+ $collector = new RouterDataCollector();
+
+ $request = Request::create('http://test.com/foo?bar=baz');
+ $request->attributes->set('_route', 'current-route');
+
+ $response = new RedirectResponse('http://test.com/redirect');
+
+ $event = $this->createControllerEvent($request);
+
+ $collector->onKernelController($event);
+ $collector->collect($request, $response);
+
+ $this->assertTrue($collector->getRedirect());
+ $this->assertEquals('http://test.com/redirect', $collector->getTargetUrl());
+ $this->assertEquals('current-route', $collector->getTargetRoute());
+ }
+
+ protected function createControllerEvent(Request $request): ControllerEvent
+ {
+ $kernel = $this->createMock(KernelInterface::class);
+
+ return new ControllerEvent($kernel, new RedirectController(), $request, null);
+ }
+}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy