8000 [Routing] fixed several bugs and applied improvements by Tobion · Pull Request #3754 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Routing] fixed several bugs and applied improvements #3754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[Routing] fixed several bugs and applied improvements #3754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30839fb
fix bugs and improvements in RouteCollection
Tobion Apr 1, 2012
55b4482
fixed bugs and added tests for Routing
Tobion Apr 4, 2012
d4a5f9f
fixed CS and minor tweaks
Tobion Apr 5, 2012
46434e0
fixed dumping of a root collection with prefix
Tobion Apr 10, 2012
a6b8d54
fixed CS and added notes in changelog
Tobion Apr 10, 2012
a4a3f44
fix that Route::compile needs to recompile once route is modified
Tobion Apr 10, 2012
d4f63d3
apply required changes caused by upstream
Tobion Apr 11, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix that Route::compile needs to recompile once route is modified
  • Loading branch information
@Tobion
Tobion committed Apr 11, 2012
commit a4a3f4476f53336d22dc7ac2d17fecad8c3ac850
10 changes: 9 additions & 1 deletion src/Symfony/Component/Routing/Route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -128,6 +130,7 @@ public function addOptions(array $options)
foreach ($options as $name => $option) {
$this->options[(string) $name] = $option;
}
$this->compiled = null;

return $this;
}
Expand All @@ -147,6 +150,7 @@ public function addOptions(array $options)
public function setOption($name, $value)
{
$this->options[$name] = $value;
$this->compiled = null;

return $this;
}
Expand Down Expand Up @@ -203,6 +207,7 @@ public function addDefaults(array $defaults)
foreach ($defaults as $name => $default) {
$this->defaults[(string) $name] = $default;
}
$this->compiled = null;

return $this;
}
Expand Down Expand Up @@ -244,6 +249,7 @@ public function hasDefault($name)
public function setDefault($name, $default)
{
$this->defaults[(string) $name] = $default;
$this->compiled = null;

return $this;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
6 changes: 4 additions & 2 deletions src/Symfony/Component/Routing/Tests/RouteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
}
0