merged branch Tobion/typhint-routing-profiler (PR #7377)

fabpot · fabpot · commit 469330da92ee · 2013-03-20T15:28:26.000+01:00
This PR was submitted for the 2.2 branch but it was merged into the master branch instead (closes #7377). Commits ------- a58a443 [WebProfiler] add missing typehint to RouterController Discussion ---------- [WebProfiler] add missing typehint to RouterController It must be a RouteCollection because TraceableUrlMatcher expects it anyway. | Q | A | ------------- | --- | Bug fix? | [no] | New feature? | [no] | BC breaks? | [no] | Deprecations? | [no] | Tests pass? | [yes] | License | MIT
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\TraceableUrlMatcher;
+use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
 
@@ -29,14 +30,14 @@ class RouterController
     private $matcher;
     private $routes;
 
-    public function __construct(Profiler $profiler, \Twig_Environment $twig, UrlMatcherInterface $matcher = null, $routes = null)
+    public function __construct(Profiler $profiler, \Twig_Environment $twig, UrlMatcherInterface $matcher = null, RouteCollection $routes = null)
     {
         $this->profiler = $profiler;
         $this->twig = $twig;
         $this->matcher = $matcher;
         $this->routes = $routes;
 
-        if (null === $this->routes && null !== $this->matcher && $this->matcher instanceof RouterInterface) {
+        if (null === $this->routes && $this->matcher instanceof RouterInterface) {
             $this->routes = $matcher->getRouteCollection();
         }
     }
