Merge branch 'master' into start-1.1

Conflicts:
	ChainRouter.php

Author: dbu

ChainRouter.php

@@ -30,7 +30,8 @@ class ChainRouter implements RouterInterface, RequestMatcherInterface, WarmableI
     private $context;
 
     /**
-     * @var \Symfony\Component\Routing\RouterInterface[]
+     * Array of arrays of routers grouped by priority
+     * @var array
      */
     private $routers = array();
 

ContentAwareGenerator.php

@@ -61,6 +61,8 @@ public function generate($name, $parameters = array(), $absolute = false)
             throw new RouteNotFoundException('Route of this document is not an instance of Symfony\Component\Routing\Route but: '.$hint);
         }
 
+        $this->unsetLocaleIfNotNeeded($route, $parameters);
+
         return parent::generate($route, $parameters, $absolute);
     }
 
@@ -249,4 +251,23 @@ public function getRouteDebugMessage($name, array $parameters = array())
 
         return parent::getRouteDebugMessage($name, $parameters);
     }
+
+    /**
+     * Unset the _locale parameter if it is there and not needed
+     *
+     * @param SymfonyRoute $route
+     * @param array $parameters
+     */
+    protected  function unsetLocaleIfNotNeeded(SymfonyRoute $route, array &$parameters)
+    {
+        $locale = $this->getLocale($parameters);
+        if (null !== $locale) {
+            if (preg_match('/'.$route->getRequirement('_locale').'/', $locale) && $locale == $route->getDefault('_locale')) {
+                $compiledRoute = $route->compile();
+                if (!in_array('_locale', $compiledRoute->getVariables())) {
+                    unset($parameters['_locale']);
+                }
+            }
+        }
+    }
 }

DynamicRouter.php

@@ -91,8 +91,11 @@ public function getRouteCollection()
      */
     public function getMatcher()
     {
-        // we may not set the context in DynamicRouter::setContext as this would lead to symfony cache warmup problems
-        // a request matcher does not need the request context separately as it can get it from the request.
+        /* we may not set the context in DynamicRouter::setContext as this
+         * would lead to symfony cache warmup problems.
+         * a request matcher does not need the request context separately as it
+         * can get it from the request.
+         */
         if ($this->matcher instanceof RequestContextAwareInterface) {
             $this->matcher->setContext($this->getContext());
         }
@@ -113,8 +116,8 @@ public function getGenerator()
     /**
      * Generates a URL from the given parameters.
      *
-     * If the generator is not able to generate the url, it must throw the RouteNotFoundException
-     * as documented below.
+     * If the generator is not able to generate the url, it must throw the
+     * RouteNotFoundException as documented below.
      *
      * @param string  $name       The name of the route
      * @param mixed   $parameters An array of parameters
@@ -151,12 +154,14 @@ public function supports($name)
      * If the matcher can not find information, it must throw one of the
      * exceptions documented below.
      *
-     * @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded)
+     * @param string $pathinfo The path info to be parsed (raw format, i.e. not
+     *      urldecoded)
      *
      * @return array An array of parameters
      *
      * @throws ResourceNotFoundException If the resource could not be found
-     * @throws MethodNotAllowedException If the resource was found but the request method is not allowed
+     * @throws MethodNotAllowedException If the resource was found but the
+     *      request method is not allowed
      *
      * @api
      */
@@ -188,16 +193,20 @@ public function match($pathinfo)
      * @return array An array of parameters
      *
      * @throws ResourceNotFoundException If no matching resource could be found
-     * @throws MethodNotAllowedException If a matching resource was found but the request method is not allowed
+     * @throws MethodNotAllowedException If a matching resource was found but
+     *      the request method is not allowed
      */
     public function matchRequest(Request $request)
     {
-        if (! empty($this->uriFilterRegexp) && ! preg_match($this->uriFilterRegexp, $request->getPathInfo())) {
+        if (! empty($this->uriFilterRegexp)
+            && ! preg_match($this->uriFilterRegexp, $request->getPathInfo())
+        ) {
             throw new ResourceNotFoundException("{$request->getPathInfo()} does not match the '{$this->uriFilterRegexp}' pattern");
         }
 
         $matcher = $this->getMatcher();
         if ($matcher instanceof UrlMatcherInterface) {
+            // the match method will enhance the route $defaults
             return $this->match($request->getPathInfo());
         }
 

RouteProviderInterface.php

@@ -31,7 +31,7 @@ interface RouteProviderInterface
      *
      * @param Request $request A request against which to match.
      *
-     * @return \Symfony\Component\Routing\RouteCollection with all urls that
+     * @return \Symfony\Component\Routing\RouteCollection with all Routes that
      *      could potentially match $request. Empty collection if nothing can
      *      match.
      */

composer.json

@@ -17,6 +17,9 @@
         "symfony/routing": ">=2.2,<2.3-dev",
         "symfony/http-kernel": ">=2.2,<2.3-dev"
     },
+    "suggest": {
+        "symfony/http-foundation": "ChainRouter/DynamicRouter have optional support for Request instances, several enhancers require a Request instances, >=2.1,<2.3-dev"
+    },
     "autoload": {
         "psr-0": { "Symfony\\Cmf\\Component\\Routing": "" }
     },