working on the route class.

This commit is contained in:
Taylor Otwell 2012-01-18 12:44:00 -06:00
parent bfc04e283b
commit eb193c1d12
3 changed files with 3 additions and 6 deletions

View File

@ -58,7 +58,7 @@ public function __construct($key, $action, $parameters = array())
// Extract each URI from the route key. Since the route key has the request
// method, we will extract that from the string. If the URI points to the
// root of the application, a single forward slash will be returned.
$uris = array_get($action, 'handles', array());
$uris = array_get($action, 'handles', array($key));
$this->uris = array_map(array($this, 'extract'), $uris);

View File

@ -200,8 +200,6 @@ protected static function controller($bundle, $method, $destination, $segments)
$action = array('uses' => Bundle::prefix($bundle).'home@index');
$action['handles'] = array($destination);
return new Route($method.' '.$uri, $action);
}
@ -245,8 +243,6 @@ protected static function controller($bundle, $method, $destination, $segments)
$action = array('uses' => $prefix.$controller.'@'.$method);
$action['handles'] = array($destination);
return new Route($destination, $action, $segments);
}
}

View File

@ -19,9 +19,10 @@ public function testHandlesIndicatesIfTheRouteHandlesAGivenURI()
{
$route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /foo/bar')));
$this->assertFalse($route->handles('/'));
$this->assertFalse($route->handles('baz'));
$this->assertTrue($route->handles('foo/*'));
$this->assertTrue($route->handles('foo/bar'));
$this->assertFalse($route->handles('baz'));
$route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /', 'GET /home')));