Remove _path from query parameters when fragment is a subrequest and request attributes are already set

Craig Menning · Craig Menning · commit 3fc89bc3508a · 2016-01-28T13:26:57.000-06:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
@@ -58,7 +58,14 @@ public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
 
-        if ($request->attributes->has('_controller') || $this->fragmentPath !== rawurldecode($request->getPathInfo())) {
+        if ($this->fragmentPath !== rawurldecode($request->getPathInfo())) {
+            return;
+        }
+
+        if ($request->attributes->has('_controller')) {
+            // Is a sub-request: no need to parse _path but it should still be removed from query parameters as below.
+            $request->query->remove('_path');
+
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,14 @@ public function onKernelRequest(GetResponseEvent $event)`
`58`	`58`	`{`
`59`	`59`	`$request = $event->getRequest();`
`60`	`60`
`61`		`- if ($request->attributes->has('_controller') \|\| $this->fragmentPath !== rawurldecode($request->getPathInfo())) {`
	`61`	`+ if ($this->fragmentPath !== rawurldecode($request->getPathInfo())) {`
	`62`	`+ return;`
	`63`	`+ }`
	`64`	`+`
	`65`	`+ if ($request->attributes->has('_controller')) {`
	`66`	`+ // Is a sub-request: no need to parse _path but it should still be removed from query parameters as below.`
	`67`	`+ $request->query->remove('_path');`
	`68`	`+`
`62`	`69`	`return;`
`63`	`70`	`}`
`64`	`71`