Merge pull request symfony#51 from symfony-cmf/support-2.2-routepattern

symfony 2.2 can have any string as route name

Author: dbu

ChainRouter.php

@@ -199,10 +199,9 @@ public function generate($name, $parameters = array(), $absolute = false)
         /** @var $router RouterInterface */
         foreach ($this->all() as $router) {
 
-            // if $name and $router does not implement ChainedRouterInterface and $name is not a string, continue
-            // if $name and $router does not implement ChainedRouterInterface and $name is string but does not match a default Symfony2 route name, continue
+            // if $router does not implement ChainedRouterInterface and $name is not a string, continue
             if ($name && !$router instanceof ChainedRouterInterface) {
-                if (!is_string($name) || !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name)) {
+                if (! is_string($name)) {
                     continue;
                 }
             }

DynamicRouter.php

@@ -141,7 +141,7 @@ public function supports($name)
             return $this->generator->supports($name);
         }
 
-        return (!is_string($name) || !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name));
+        return is_string($name);
     }
 
     /**

NestedMatcher/ConfigurableUrlMatcher.php

@@ -14,6 +14,8 @@
  * A final matcher that can proxy any matcher having the right constructor
  * signature, the same way the symfony core Router class does.
  *
+ * SYMFONY 2.1 COMPATIBILITY only. With 2.2 we could use the extending UrlMatcher class
+ *
  * @author DavidBuchmann
  */
 class ConfigurableUrlMatcher implements FinalMatcherInterface
@@ -35,7 +37,7 @@ public function finalMatch(RouteCollection $collection, Request $request)
         $matcher = $this->getMatcher($collection, $context);
         $attributes = $matcher->match($request->getPathInfo());
 
-        // cleanup route attributes
+        // SYMFONY 2.1 COMPATIBILITY: cleanup route attributes
         if (! isset($attributes[RouteObjectInterface::ROUTE_OBJECT])
             || ! $attributes[RouteObjectInterface::ROUTE_OBJECT] instanceof Route
         ) {

Tests/Routing/ChainRouterTest.php

@@ -488,37 +488,6 @@ public function testGenerateObjectName()
         $this->assertEquals($name, $result);
     }
 
-    public function testGenerateNonDefaultStringName()
-    {
-        $name = '/test/this';
-        $parameters = array('test' => 'value');
-
-        $defaultRouter = $this->getMock('Symfony\\Component\\Routing\\RouterInterface');
-        $chainedRouter = $this->getMock('Symfony\\Cmf\\Component\\Routing\\ChainedRouterInterface');
-
-        $defaultRouter
-            ->expects($this->never())
-            ->method('generate')
-        ;
-        $chainedRouter
-            ->expects($this->once())
-            ->method('supports')
-            ->will($this->returnValue(true))
-        ;
-        $chainedRouter
-            ->expects($this->once())
-            ->method('generate')
-            ->with($name, $parameters, false)
-            ->will($this->returnValue($name))
-        ;
-
-        $this->router->add($defaultRouter, 200);
-        $this->router->add($chainedRouter, 100);
-
-        $result = $this->router->generate($name, $parameters);
-        $this->assertEquals($name, $result);
-    }
-
     public function testWarmup()
     {
         $dir = 'test_dir';

VersatileGeneratorInterface.php

@@ -10,12 +10,6 @@
  */
 interface VersatileGeneratorInterface extends UrlGeneratorInterface
 {
-    /**
-     * If $name preg_match this pattern, the name is valid for symfony core
-     * compatible generators.
-     */
-    const CORE_NAME_PATTERN = '/^[a-z0-9A-Z_.]+$/';
-
     /**
      * Whether this generator supports the supplied $name.
      *