[Routing] fixed side-effect in the PHP matcher dumper

fabpot · fabpot · commit 167a96fcf31e · 2011-10-24T11:39:31.000+02:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -54,7 +54,8 @@ public function dump(array $options = array())
 
     private function addMatcher($supportsRedirections)
     {
-        $code = implode("\n", $this->compileRoutes($this->getRoutes(), $supportsRedirections));
+        // we need to deep clone the routes as we will modify the structure to optimize the dump
+        $code = implode("\n", $this->compileRoutes(clone $this->getRoutes(), $supportsRedirections));
 
         return <<<EOF
 
@@ -74,7 +75,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections, $
     {
         $code = array();
 
-        $routes = clone $routes;
         $routeIterator = $routes->getIterator();
         $keys = array_keys($routeIterator->getArrayCopy());
         $keysCount = count($keys);
@@ -83,7 +83,6 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections, $
         foreach ($routeIterator as $name => $route) {
             $i++;
 
-            $route = clone $route;
             if ($route instanceof RouteCollection) {
                 $prefix = $route->getPrefix();
                 $optimizable = $prefix && count($route->all()) > 1 && false === strpos($route->getPrefix(), '{');
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -50,6 +50,11 @@ public function __construct($pattern, array $defaults = array(), array $requirem
         $this->setOptions($options);
     }
 
+    public function __clone()
+    {
+        $this->compiled = null;
+    }
+
     /**
      * Returns the pattern.
      *
diff --git a/src/Symfony/Component/Routing/RouteCollection.php b/src/Symfony/Component/Routing/RouteCollection.php
@@ -42,6 +42,17 @@ public function __construct()
         $this->prefix = '';
     }
 
+    public function __clone()
+    {
+        $parent = $this;
+        foreach ($this->routes as $name => $route) {
+            $this->routes[$name] = clone $route;
+            if ($route instanceof RouteCollection) {
+                $this->routes[$name]->setParent($this);
+            }
+        }
+    }
+
     /**
      * Gets the parent RouteCollection.
      *

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,11 @@ public function __construct($pattern, array $defaults = array(), array $requirem`
`50`	`50`	`$this->setOptions($options);`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ public function __clone()`
	`54`	`+ {`
	`55`	`+ $this->compiled = null;`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`/**`
`54`	`59`	`* Returns the pattern.`
`55`	`60`	`*`