fix that Route::compile needs to recompile once route is modified

symfony · Tobion · Apr 1, 2012 · Apr 4, 2012 · Apr 5, 2012 · Apr 10, 2012
commit a4a3f4476f53336d22dc7ac2d17fecad8c3ac850
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -79,10 +79,12 @@ public function setPattern($pattern)
         $this->pattern = trim($pattern);
 
         // a route must start with a slash
-        if (empty($this->pattern) || '/' !== $this->pattern[0]) {
+        if ('' === $this->pattern || '/' !== $this->pattern[0]) {
             $this->pattern = '/'.$this->pattern;
         }
 
+        $this->compiled = null;
+
         return $this;
     }
 
@@ -128,6 +130,7 @@ public function addOptions(array $options)
         foreach ($options as $name => $option) {
             $this->options[(string) $name] = $option;
         }
+        $this->compiled = null;
 
         return $this;
     }
@@ -147,6 +150,7 @@ public function addOptions(array $options)
     public function setOption($name, $value)
     {
         $this->options[$name] = $value;
+        $this->compiled = null;
 
         return $this;
     }
@@ -203,6 +207,7 @@ public function addDefaults(array $defaults)
         foreach ($defaults as $name => $default) {
             $this->defaults[(string) $name] = $default;
         }
+        $this->compiled = null;
 
         return $this;
     }
@@ -244,6 +249,7 @@ public function hasDefault($name)
     public function setDefault($name, $default)
     {
         $this->defaults[(string) $name] = $default;
+        $this->compiled = null;
 
         return $this;
     }
@@ -288,6 +294,7 @@ public function addRequirements(array $requirements)
         foreach ($requirements as $key => $regex) {
             $this->requirements[$key] = $this->sanitizeRequirement($key, $regex);
         }
+        $this->compiled = null;
 
         return $this;
     }
@@ -317,6 +324,7 @@ public function getRequirement($key)
     public function setRequirement($key, $regex)
     {
         $this->requirements[$key] = $this->sanitizeRequirement($key, $regex);
+        $this->compiled = null;
 
         return $this;
     }

diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -119,7 +119,9 @@ public function getInvalidRequirements()
     public function testCompile()
     {
         $route = new Route('/{foo}');
-        $this->assertEquals('Symfony\\Component\\Routing\\CompiledRoute', get_class($compiled = $route->compile()), '->compile() returns a compiled route');
-        $this->assertEquals($compiled, $route->compile(), '->compile() only compiled the route once');
+        $this->assertInstanceOf('Symfony\Component\Routing\CompiledRoute', $compiled = $route->compile(), '->compile() returns a compiled route');
+        $this->assertSame($compiled, $route->compile(), '->compile() only compiled the route once if unchanged');
+        $route->setRequirement('foo', '.*');
+        $this->assertNotSame($compiled, $route->compile(), '->compile() recompiles if the route was modified');
     }
 }