Merge branch '2.7' into 2.8

fabpot · fabpot · commit 3ebe036397cc · 2016-03-04T08:54:35.000+01:00
* 2.7: Updated all the README files [TwigBundle] Fix failing test on appveyor Improved the error message when using "@" in a decorated service Improve error reporting in router panel of web profiler [DoctrineBridge][Form] Fix performance regression in EntityType [FrameworkBundle] Fix a regression in handling absolute and namespaced template paths Allow to normalize \Traversable minor [Form] fix tests added by symfony#16886 Remove _path from query parameters when fragment is a subrequest and request attributes are already set Added tests for _path removal in FragmentListener Simplified everything Added a test Fixed the problem in an easier way Fixed a syntax issue Improved the error message when a template is not found [CodingStandards] Conformed to coding standards [TwigBundle] fixed Include file locations in "Template could not be found" exception
diff --git a/Controller/RouterController.php b/Controller/RouterController.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
+use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector;
 
 /**
  * RouterController.
@@ -62,16 +63,39 @@ public function panelAction($token)
 
         $profile = $this->profiler->loadProfile($token);
 
-        $context = $this->matcher->getContext();
-        $context->setMethod($profile->getMethod());
-        $matcher = new TraceableUrlMatcher($this->routes, $context);
-
+        /** @var RequestDataCollector $request */
         $request = $profile->getCollector('request');
 
         return new Response($this->twig->render('@WebProfiler/Router/panel.html.twig', array(
             'request' => $request,
             'router' => $profile->getCollector('router'),
-            'traces' => $matcher->getTraces($request->getPathInfo()),
+            'traces' => $this->getTraces($request, $profile->getMethod()),
         )), 200, array('Content-Type' => 'text/html'));
     }
+
+    /**
+     * Returns the routing traces associated to the given request.
+     *
+     * @param RequestDataCollector $request
+     * @param string               $method
+     *
+     * @return array
+     */
+    private function getTraces(RequestDataCollector $request, $method)
+    {
+        $traceRequest = Request::create(
+            $request->getPathInfo(),
+            $request->getRequestServer()->get('REQUEST_METHOD'),
+            $request->getRequestAttributes()->all(),
+            $request->getRequestCookies()->all(),
+            array(),
+            $request->getRequestServer()->all()
+        );
+
+        $context = $this->matcher->getContext();
+        $context->setMethod($method);
+        $matcher = new TraceableUrlMatcher($this->routes, $context);
+
+        return $matcher->getTracesForRequest($traceRequest);
+    }
 }
