Commit f11cb433 authored by Fabien Potencier's avatar Fabien Potencier

renamed setRouteName() to bind()

parent be04c437
......@@ -33,7 +33,7 @@ class Controller
public function __construct(Route $route)
{
$this->route = $route;
$this->setRouteName($this->defaultRouteName());
$this->bind($this->defaultRouteName());
}
/**
......@@ -57,7 +57,7 @@ class Controller
*
* @param string $routeName
*/
public function setRouteName($routeName)
public function bind($routeName)
{
if ($this->isFrozen) {
throw new ControllerFrozenException(sprintf('Calling %s on frozen %s instance.', __METHOD__, __CLASS__));
......
......@@ -54,23 +54,23 @@ class ControllerCollectionTest extends \PHPUnit_Framework_TestCase
$controllers = new ControllerCollection($routes);
$fooController = new Controller(new Route('/foo'));
$fooController->setRouteName('foo');
$fooController->bind('foo');
$controllers->add($fooController);
$barController = new Controller(new Route('/bar'));
$barController->setRouteName('bar');
$barController->bind('bar');
$controllers->add($barController);
$controllers->flush();
try {
$fooController->setRouteName('foo2');
$fooController->bind('foo2');
$this->fail();
} catch (ControllerFrozenException $e) {
}
try {
$barController->setRouteName('bar2');
$barController->bind('bar2');
$this->fail();
} catch (ControllerFrozenException $e) {
}
......
......@@ -21,21 +21,21 @@ use Symfony\Component\Routing\Route;
*/
class ControllerTest extends \PHPUnit_Framework_TestCase
{
public function testSetRouteName()
public function testBind()
{
$controller = new Controller(new Route('/foo'));
$controller->setRouteName('foo');
$controller->bind('foo');
$this->assertEquals('foo', $controller->getRouteName());
}
/**
* @expectedException Silex\Exception\ControllerFrozenException
*/
public function testSetRouteNameOnFrozenControllerShouldThrowException()
public function testBindOnFrozenControllerShouldThrowException()
{
$controller = new Controller(new Route('/foo'));
$controller->setRouteName('foo');
$controller->bind('foo');
$controller->freeze();
$controller->setRouteName('bar');
$controller->bind('bar');
}
}
......@@ -20,19 +20,19 @@ use Silex\Application;
*/
class FunctionalTest extends \PHPUnit_Framework_TestCase
{
public function testSetRouteName()
public function testBind()
{
$application = new Application();
$application->get('/', function() {
return 'hello';
})
->setRouteName('homepage');
->bind('homepage');
$application->get('/foo', function() {
return 'foo';
})
->setRouteName('foo_abc');
->bind('foo_abc');
$application->flush();
$routes = $application['routes'];
......
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