Merge remote branch 'aurelijus/routehelper_cachedrouter_fix'

* aurelijus/routehelper_cachedrouter_fix: Add cache warmed routers support to RouteHelper
symfony · Mar 6, 2011 · c2e0537 · c2e0537
2 parents c6bbecf + 218a9ae
commit c2e0537
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/CachedRouter.php b/src/Symfony/Bundle/FrameworkBundle/Routing/CachedRouter.php
@@ -86,4 +86,14 @@ public function match($url)
     {
         return $this->matcher->match($url);
     }
+
+    /**
+     * Gets the UrlGenerator instance associated with this Router.
+     *
+     * @return UrlGeneratorInterface A UrlGeneratorInterface instance
+     */
+    public function getGenerator()
+    {
+        return $this->generator;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
@@ -12,7 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Templating\Helper;
 
 use Symfony\Component\Templating\Helper\Helper;
-use Symfony\Component\Routing\Router;
+use Symfony\Component\Routing\RouterInterface;
 
 /**
  * RouterHelper manages links between pages in a template context.
@@ -26,9 +26,9 @@ class RouterHelper extends Helper
     /**
      * Constructor.
      *
-     * @param Router $router A Router instance
+     * @param RouterInterface $router A Router instance
      */
-    public function __construct(Router $router)
+    public function __construct(RouterInterface $router)
     {
         $this->generator = $router->getGenerator();
     }