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

dbu · dbu · commit 43585d83fb07 · 2013-02-22T05:50:34.000-08:00
symfony 2.2 can have any string as route name
diff --git a/ChainRouter.php b/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;
                 }
             }
diff --git a/DynamicRouter.php b/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);
     }
 
     /**
diff --git a/NestedMatcher/ConfigurableUrlMatcher.php b/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
         ) {
diff --git a/Tests/Routing/ChainRouterTest.php b/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';
diff --git a/VersatileGeneratorInterface.php b/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.
      *

Original file line number	Diff line number	Diff line change
`@@ -199,10 +199,9 @@ public function generate($name, $parameters = array(), $absolute = false)`
`199`	`199`	`/** @var $router RouterInterface */`
`200`	`200`	`foreach ($this->all() as $router) {`
`201`	`201`
`202`		`- // if $name and $router does not implement ChainedRouterInterface and $name is not a string, continue`
`203`		`- // if $name and $router does not implement ChainedRouterInterface and $name is string but does not match a default Symfony2 route name, continue`
	`202`	`+ // if $router does not implement ChainedRouterInterface and $name is not a string, continue`
`204`	`203`	`if ($name && !$router instanceof ChainedRouterInterface) {`
`205`		`- if (!is_string($name) \|\| !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name)) {`
	`204`	`+ if (! is_string($name)) {`
`206`	`205`	`continue;`
`207`	`206`	`}`
`208`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function supports($name)`
`141`	`141`	`return $this->generator->supports($name);`
`142`	`142`	`}`
`143`	`143`
`144`		`- return (!is_string($name) \|\| !preg_match(VersatileGeneratorInterface::CORE_NAME_PATTERN, $name));`
	`144`	`+ return is_string($name);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,6 @@`
`10`	`10`	`*/`
`11`	`11`	`interface VersatileGeneratorInterface extends UrlGeneratorInterface`
`12`	`12`	`{`
`13`		`- /**`
`14`		`- * If $name preg_match this pattern, the name is valid for symfony core`
`15`		`- * compatible generators.`
`16`		`- */`
`17`		`- const CORE_NAME_PATTERN = '/^[a-z0-9A-Z_.]+$/';`
`18`		`-`
`19`	`13`	`/**`
`20`	`14`	`* Whether this generator supports the supplied $name.`
`21`	`15`	`*`