merged branch Seldaek/route_redirect (PR #3074)

fabpot · fabpot · commit 009e6d739e5d · 2012-01-10T07:35:44.000+01:00
Commits ------- af32590 [FrameworkBundle] Use only _route_params to generate redirect routes Discussion ---------- [FrameworkBundle] Use only _route_params to generate redirect routes Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Routes in RedirectController are generated using all request attributes, which is inconvenient since I abuse request attributes to store other things (device types and such) relevant to the app. It renders the RedirectController useless since it adds unrelated query parameters to URLs it creates.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -42,8 +42,8 @@ public function redirectAction($route, $permanent = false)
             return new Response(null, 410);
         }
 
-        $attributes = $this->container->get('request')->attributes->all();
-        unset($attributes['_route'], $attributes['route'], $attributes['permanent'] );
+        $attributes = $this->container->get('request')->attributes->get('_route_params');
+        unset($attributes['route'], $attributes['permanent']);
 
         return new RedirectResponse($this->container->get('router')->generate($route, $attributes), $permanent ? 301 : 302);
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -46,8 +46,18 @@ public function testRoute($permanent, $expectedCode)
         $route = 'new-route';
         $url = '/redirect-url';
         $params = array('additional-parameter' => 'value');
+        $attributes = array(
+            'route' => $route,
+            'permanent' => $permanent,
+            '_route' => 'current-route',
+            '_route_params' => array(
+                'route' => $route,
+                'permanent' => $permanent,
+            ),
+        );
+        $attributes['_route_params'] = $attributes['_route_params'] + $params;
 
-        $request->attributes = new ParameterBag(array('route' => $route, '_route' => 'current-route', 'permanent' => $permanent) + $params);
+        $request->attributes = new ParameterBag($attributes);
 
         $router = $this->getMock('Symfony\Component\Routing\RouterInterface');
         $router

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public function redirectAction($route, $permanent = false)`
`42`	`42`	`return new Response(null, 410);`
`43`	`43`	`}`
`44`	`44`
`45`		`- $attributes = $this->container->get('request')->attributes->all();`
`46`		`- unset($attributes['_route'], $attributes['route'], $attributes['permanent'] );`
	`45`	`+ $attributes = $this->container->get('request')->attributes->get('_route_params');`
	`46`	`+ unset($attributes['route'], $attributes['permanent']);`
`47`	`47`
`48`	`48`	`return new RedirectResponse($this->container->get('router')->generate($route, $attributes), $permanent ? 301 : 302);`
`49`	`49`	`}`