Merge pull request #158 from rande/use_url_generator_interface

Use UrlGeneratorInterface constants

Author: dbu

ChainRouter.php

@@ -211,7 +211,7 @@ private function doMatch($url, Request $request = null)
      * Loops through all registered routers and returns a router if one is found.
      * It will always return the first route generated.
      */
-    public function generate($name, $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
         $debug = array();
 
@@ -309,7 +309,7 @@ public function getRouteCollection()
 
     /**
      * Identify if any routers have been added into the chain yet
-     * 
+     *
      * @return boolean
      */
     public function hasRouters()

ContentAwareGenerator.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Component\Routing;
 
 use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 use Symfony\Component\Routing\RouteCollection;
@@ -65,7 +66,7 @@ public function setContentRepository(ContentRepositoryInterface $contentReposito
      *
      * @throws RouteNotFoundException If there is no such route in the database
      */
-    public function generate($name, $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
         if ($name instanceof SymfonyRoute) {
             $route = $this->getBestLocaleRoute($name, $parameters);

ProviderBasedGenerator.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Component\Routing;
 
 use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Route as SymfonyRoute;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
@@ -46,7 +47,7 @@ public function __construct(RouteProviderInterface $provider, LoggerInterface $l
     /**
      * {@inheritDoc}
      */
-    public function generate($name, $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
         if ($name instanceof SymfonyRoute) {
             $route = $name;

Tests/Routing/ChainRouterTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouteCollection;
@@ -506,13 +507,13 @@ public function testGenerate()
         $high
             ->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->throwException(new RouteNotFoundException()))
         ;
         $low
             ->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->returnValue($url))
         ;
         $lower
@@ -539,12 +540,12 @@ public function testGenerateNotFound()
         $high
             ->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->throwException(new RouteNotFoundException()))
         ;
         $low->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->throwException(new RouteNotFoundException()))
         ;
         $this->router->add($low, 10);
@@ -593,7 +594,7 @@ public function testGenerateObjectNotFoundVersatile()
         ;
         $chainedRouter->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->throwException(new RouteNotFoundException()))
         ;
         $chainedRouter->expects($this->once())
@@ -627,7 +628,7 @@ public function testGenerateObjectName()
         $chainedRouter
             ->expects($this->once())
             ->method('generate')
-            ->with($name, $parameters, false)
+            ->with($name, $parameters, UrlGeneratorInterface::ABSOLUTE_PATH)
             ->will($this->returnValue($name))
         ;
 

Tests/Routing/DynamicRouterTest.php

@@ -14,6 +14,7 @@
 use Symfony\Cmf\Component\Routing\Event\Events;
 use Symfony\Cmf\Component\Routing\Event\RouterMatchEvent;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouteCollection;
 
 use Symfony\Cmf\Component\Routing\DynamicRouter;
@@ -89,7 +90,7 @@ public function testGenerate()
     {
         $name = 'my_route_name';
         $parameters = array('foo' => 'bar');
-        $absolute = true;
+        $absolute = UrlGeneratorInterface::ABSOLUTE_PATH;
 
         $this->generator->expects($this->once())
             ->method('generate')