use a request attribute flag for redirection profile

HeahDude · HeahDude · commit df19c1405060 · 2016-04-23T05:34:37.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
@@ -130,10 +130,8 @@ public function collect(Request $request, Response $response, \Exception $except
         }
 
         if (isset($session)) {
-            if ($session->has('sf_redirected')) {
-                $this->data['redirect'] = $session->get('sf_redirect');
-                $session->remove('sf_redirect');
-                $session->remove('sf_redirected');
+            if ($request->attributes->has('_redirected')) {
+                $this->data['redirect'] = $session->remove('sf_redirect');
             }
 
             if ($response->isRedirect()) {
@@ -297,7 +295,7 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         if ($event->getRequest()->getSession()->has('sf_redirect')) {
-            $event->getRequest()->getSession()->set('sf_redirected', true);
+            $event->getRequest()->attributes->set('_redirected', true);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,8 @@ public function collect(Request $request, Response $response, \Exception $except`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`if (isset($session)) {`
`133`		`- if ($session->has('sf_redirected')) {`
`134`		`- $this->data['redirect'] = $session->get('sf_redirect');`
`135`		`- $session->remove('sf_redirect');`
`136`		`- $session->remove('sf_redirected');`
	`133`	`+ if ($request->attributes->has('_redirected')) {`
	`134`	`+ $this->data['redirect'] = $session->remove('sf_redirect');`
`137`	`135`	`}`
`138`	`136`
`139`	`137`	`if ($response->isRedirect()) {`
`@@ -297,7 +295,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`297`	`295`	`}`
`298`	`296`
`299`	`297`	`if ($event->getRequest()->getSession()->has('sf_redirect')) {`
`300`		`- $event->getRequest()->getSession()->set('sf_redirected', true);`
	`298`	`+ $event->getRequest()->attributes->set('_redirected', true);`
`301`	`299`	`}`
`302`	`300`	`}`
`303`	`301`