Skip to content

remove reliance on __toString() #81

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

Merged
merged 1 commit into from
Sep 1, 2013
Merged

remove reliance on __toString() #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ContentAwareGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function getRouteDebugMessage($name, array $parameters = array())
}

if ($name instanceof RouteReferrersReadInterface) {
return 'Route aware content ' . $name;
return 'Route aware content ' . parent::getRouteDebugMessage($name, $parameters);
}

return parent::getRouteDebugMessage($name, $parameters);
Expand Down
10 changes: 9 additions & 1 deletion ProviderBasedGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ public function supports($name)
*/
public function getRouteDebugMessage($name, array $parameters = array())
{
if (is_scalar($name)) {
return $name;
}

if (is_array($name)) {
return serialize($name);
}

if ($name instanceof RouteObjectInterface) {
return 'Route with key ' . $name->getRouteKey();
}
Expand All @@ -73,7 +81,7 @@ public function getRouteDebugMessage($name, array $parameters = array())
return 'Route with pattern ' . $name->getPattern();
}

return $name;
return get_class($name);
}

}
6 changes: 1 addition & 5 deletions Tests/Routing/ContentAwareGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ public function testSupports()
public function testGetRouteDebugMessage()
{
$this->assertContains('/some/content', $this->generator->getRouteDebugMessage(null, array('content_id' => '/some/content')));
$this->assertContains('/some/content', $this->generator->getRouteDebugMessage(new RouteAware()));
$this->assertContains('Route aware content Symfony\Cmf\Component\Routing\Tests\Routing\RouteAware', $this->generator->getRouteDebugMessage(new RouteAware()));
$this->assertContains('/some/content', $this->generator->getRouteDebugMessage('/some/content'));
}
}
Expand All @@ -413,8 +413,4 @@ public function getRoutes()
{
return array();
}
public function __toString()
{
return '/some/content';
}
}