[WebProfilerBundle] moved the computation of the Router panel at runtime

src/Symfony/Bundle/FrameworkBundle/DataCollector/RouterDataCollector.php

@@ -14,8 +14,6 @@ namespace Symfony\Bundle\FrameworkBundle\DataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
-use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
-use Symfony\Component\Routing\RouterInterface;
 
 /**
  * RouterDataCollector.
@@ -24,37 +22,11 @@ use Symfony\Component\Routing\RouterInterface;
  */
 class RouterDataCollector extends DataCollector
 {
-    private $router;
-
-    public function __construct(RouterInterface $router = null)
-    {
-        $this->router = $router;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $this->data['path_info'] = $request->getPathInfo();
-
-        if (!$this->router) {
-            $this->data['traces'] = array();
-        } else {
-            $matcher = new TraceableUrlMatcher($this->router->getRouteCollection(), $this->router->getContext());
-
-            $this->data['traces'] = $matcher->getTraces($request->getPathInfo());
-        }
-    }
-
-    public function getPathInfo()
-    {
-        return $this->data['path_info'];
-    }
-
-    public function getTraces()
-    {
-        return $this->data['traces'];
     }
 
     /**

src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

@@ -54,7 +54,6 @@
 
         <service id="data_collector.router" class="%data_collector.router.class%" public="false">
             <tag name="data_collector" template="WebProfilerBundle:Collector:router" id="router" priority="255" />
-            <argument type="service" id="router" on-invalid="ignore" />
         </service>
     </services>
 </container>

src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Controller;
+
+use Symfony\Component\DependencyInjection\ContainerAware;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
+
+/**
+ * RouterController.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class RouterController extends ContainerAware
+{
+    /**
+     * Renders the profiler panel for the given token.
+     *
+     * @param string $token The profiler token
+     *
+     * @return Response A Response instance
+     */
+    public function panelAction($token)
+    {
+        if (!$router = $this->container->get('router')) {
+            return new Response('The Router is not enabled.');
+        }
+
+        $profiler = $this->container->get('profiler');
+        $profiler->disable();
+        $profile = $profiler->loadProfile($token);
+
+        $matcher = new TraceableUrlMatcher($router->getRouteCollection(), $router->getContext());
+        $pathinfo = $profile->getCollector('request')->getPathInfo();
+
+        return $this->container->get('templating')->renderResponse('WebProfilerBundle:Router:panel.html.twig', array(
+            'pathinfo' => $pathinfo,
+            'traces'   => $matcher->getTraces($pathinfo),
+        ));
+    }
+}

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig

@@ -11,20 +11,5 @@
 {% endblock %}
 
 {% block panel %}
-    <h2>Routing for "{{ collector.pathinfo }}"</h2>
-
-    <table class="routing">
-        <tr>
-            <th>Route name</th>
-            <th>Pattern</th>
-            <th>Log</th>
-        </tr>
-        {% for trace in collector.traces %}
-            <tr class="{{ 1 == trace.level ? 'almost' : 2 == trace.level ? 'matches' : '' }}">
-                <td>{{ trace.name }}</td>
-                <td>{{ trace.pattern }}</td>
-                <td>{{ trace.log }}</td>
-            </tr>
-        {% endfor %}
-    </table>
+    {% render "WebProfilerBundle:Router:panel" with {'token': token} %}
 {% endblock %}

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Router/panel.html.twig

@@ -0,0 +1,16 @@
+<h2>Routing for "{{ pathinfo }}"</h2>
+
+<table class="routing">
+    <tr>
+        <th>Route name</th>
+        <th>Pattern</th>
+        <th>Log</th>
+    </tr>
+    {% for trace in traces %}
+        <tr class="{{ 1 == trace.level ? 'almost' : 2 == trace.level ? 'matches' : '' }}">
+            <td>{{ trace.name }}</td>
+            <td>{{ trace.pattern }}</td>
+            <td>{{ trace.log }}</td>
+        </tr>
+    {% endfor %}
+</table>