diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php index 12c66da0a7..65d7dd22e8 100644 --- a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php @@ -40,12 +40,12 @@ class RoutingExtension extends \Twig_Extension ); } - 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 index f1797c04b2..f9e27d25b2 100644 --- 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 index 22576b8efa..6ce78960df 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RouterHelper.php @@ -37,12 +37,12 @@ class RouterHelper extends Helper * 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 index e4769aa223..0725ca6ecd 100644 --- a/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php +++ b/src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php @@ -78,7 +78,7 @@ EOF return << '/', ); - private $routes; - private $cache; + protected $routes; + protected $cache; /** * Constructor. @@ -77,7 +77,7 @@ class UrlGenerator implements UrlGeneratorInterface * 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 @@ class UrlGenerator implements UrlGeneratorInterface * * @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 index 2afeab9099..d1d8d00332 100644 --- 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 index f535487910..a1e0c89c4a 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -171,12 +171,12 @@ class Router implements RouterInterface * 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); }