Commit 0356873a authored by Fabien Potencier's avatar Fabien Potencier

changed Controller::generateRouteName() visibility

parent 31652440
......@@ -186,7 +186,7 @@ class Controller
$this->isFrozen = true;
}
public function generateRouteName($prefix)
protected function generateRouteName($prefix)
{
$requirements = $this->route->getRequirements();
$method = isset($requirements['_method']) ? $requirements['_method'] : '';
......
......@@ -76,7 +76,10 @@ class ControllerCollectionTest extends \PHPUnit_Framework_TestCase
$controllers->add($mountedRootController);
$mainRootController = new Controller(new Route('/'));
$mainRootController->bind($mainRootController->generateRouteName('main_'));
$r = new \ReflectionObject($mainRootController);
$m = $r->getMethod('generateRouteName');
$m->setAccessible(true);
$mainRootController->bind($m->invoke($mainRootController, 'main_'));
$controllers->flush();
......
......@@ -75,7 +75,10 @@ class ControllerTest extends \PHPUnit_Framework_TestCase
public function testDefaultRouteNameGeneration(Route $route, $expectedRouteName)
{
$controller = new Controller($route);
$controller->bind($controller->generateRouteName(''));
$r = new \ReflectionObject($controller);
$m = $r->getMethod('generateRouteName');
$m->setAccessible(true);
$controller->bind($m->invoke($controller, ''));
$this->assertEquals($expectedRouteName, $controller->getRouteName());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment