[Routing] changed UrlGeneratorInterface::generate() signature to allo…

…w passing objects instead of arrays
lucasaba · Jul 26, 2011 · 04ac1fd · 04ac1fd
1 parent 1543ad1
commit 04ac1fd
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -40,12 +40,12 @@ public function getFunctions()
         );
     }
 
-    public function getPath($name, array $parameters = array())
+    public function getPath($name, $parameters = array())
     {
         return $this->generator->generate($name, $parameters, false);
     }
 
-    public function getUrl($name, array $parameters = array())
+    public function getUrl($name, $parameters = array())
     {
         return $this->generator->generate($name, $parameters, true);
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -34,12 +34,12 @@ class Controller extends ContainerAware
      * Generates a URL from the given parameters.
      *
      * @param string  $name       The name of the route
-     * @param array   $parameters An array of parameters
+     * @param mixed   $parameters An array of parameters
      * @param Boolean $absolute   Whether to generate an absolute URL
      *
      * @return string The generated URL
      */
-    public function generateUrl($route, array $parameters = array(), $absolute = false)
+    public function generateUrl($route, $parameters = array(), $absolute = false)
     {
         return $this->container->get('router')->generate($route, $parameters, $absolute);
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php
@@ -37,12 +37,12 @@ public function __construct(UrlGeneratorInterface $router)
      * Generates a URL from the given parameters.
      *
      * @param string  $name       The name of the route
-     * @param array   $parameters An array of parameters
+     * @param mixed   $parameters An array of parameters
      * @param Boolean $absolute   Whether to generate an absolute URL
      *
      * @return string The generated URL
      */
-    public function generate($name, array $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = false)
     {
         return $this->generator->generate($name, $parameters, $absolute);
     }

diff --git a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
@@ -78,7 +78,7 @@ private function get{$escapedName}RouteInfo()
 
         return <<<EOF
 
-    public function generate(\$name, array \$parameters = array(), \$absolute = false)
+    public function generate(\$name, \$parameters = array(), \$absolute = false)
     {
         if (!isset(self::\$declaredRouteNames[\$name])) {
             throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', \$name));

diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -33,8 +33,8 @@ class UrlGenerator implements UrlGeneratorInterface
         '%2F' => '/',
     );
 
-    private $routes;
-    private $cache;
+    protected $routes;
+    protected $cache;
 
     /**
      * Constructor.
@@ -77,7 +77,7 @@ public function getContext()
      * Generates a URL from the given parameters.
      *
      * @param  string  $name       The name of the route
-     * @param  array   $parameters An array of parameters
+     * @param  mixed   $parameters An array of parameters
      * @param  Boolean $absolute   Whether to generate an absolute URL
      *
      * @return string The generated URL
@@ -86,7 +86,7 @@ public function getContext()
      *
      * @api
      */
-    public function generate($name, array $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = false)
     {
         if (null === $route = $this->routes->get($name)) {
             throw new RouteNotFoundException(sprintf('Route "%s" does not exist.', $name));

diff --git a/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php b/src/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php
@@ -26,12 +26,12 @@ interface UrlGeneratorInterface extends RequestContextAwareInterface
      * Generates a URL from the given parameters.
      *
      * @param string  $name       The name of the route
-     * @param array   $parameters An array of parameters
+     * @param mixed   $parameters An array of parameters
      * @param Boolean $absolute   Whether to generate an absolute URL
      *
      * @return string The generated URL
      *
      * @api
      */
-    function generate($name, array $parameters = array(), $absolute = false);
+    function generate($name, $parameters = array(), $absolute = false);
 }
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
@@ -171,12 +171,12 @@ public function getContext()
      * Generates a URL from the given parameters.
      *
      * @param  string  $name       The name of the route
-     * @param  array   $parameters An array of parameters
+     * @param  mixed   $parameters An array of parameters
      * @param  Boolean $absolute   Whether to generate an absolute URL
      *
      * @return string The generated URL
      */
-    public function generate($name, array $parameters = array(), $absolute = false)
+    public function generate($name, $parameters = array(), $absolute = false)
     {
         return $this->getGenerator()->generate($name, $parameters, $absolute);
     }