Merge pull request symfony#3 from uwej711/fix_route_renaming

dbu · dbu · commit 8c83f16a13ba · 2012-05-18T05:07:02.000-07:00
routes' names are very restrictive
diff --git a/DoctrineRouter.php b/DoctrineRouter.php
@@ -190,7 +190,7 @@ public function match($url)
         $collection = new RouteCollection();
 
         foreach ($routes as $key => $route) {
-            $collection->add(self::ROUTE_NAME_PREFIX.str_replace('/', '_', $key), $route);
+            $collection->add(self::ROUTE_NAME_PREFIX.preg_replace('/[^a-z0-9A-Z_.]/', '_', $key), $route);
         }
 
         $defaults = $this->getMatcher($collection)->match($url);

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public function match($url)`
`190`	`190`	`$collection = new RouteCollection();`
`191`	`191`
`192`	`192`	`foreach ($routes as $key => $route) {`
`193`		`- $collection->add(self::ROUTE_NAME_PREFIX.str_replace('/', '_', $key), $route);`
	`193`	`+ $collection->add(self::ROUTE_NAME_PREFIX.preg_replace('/[^a-z0-9A-Z_.]/', '_', $key), $route);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`$defaults = $this->getMatcher($collection)->match($url);`