Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #246 from ericbarnes/develop 

Bug fix for route::handles
This commit is contained in:
Taylor Otwell 2012-01-21 08:42:35 -08:00
parent 35e364282a ea8c6e1825
commit e6cec8c54b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/routing/route.php
View File

@ -118,7 +118,7 @@ public function call()
*/ */
public function response() public function response()
{ {
// If the action is a string, it is simply pointing the route to a // If the action is a string, it is simply pointing the route to a
// controller action, and we can just call the action and return // controller action, and we can just call the action and return
// its response. This is the most basic form of route, and is // its response. This is the most basic form of route, and is
// the simplest to handle. // the simplest to handle.
@ -214,7 +214,7 @@ public function is($name)
*/ */
public function handles($uri) public function handles($uri)
{ {
$pattern = ($uri !== '/') ? str_replace('*', '(.*)', $uri) : '^/$'; $pattern = ($uri !== '/') ? str_replace('*', '(.*)', $uri).'\z' : '^/$';
return ! is_null(array_first($this->uris, function($key, $uri) use ($pattern) return ! is_null(array_first($this->uris, function($key, $uri) use ($pattern)
{ {

1
tests/cases/laravel/route.test.php
View File

@ -24,6 +24,7 @@ public function testHandlesIndicatesIfTheRouteHandlesAGivenURI()
$this->assertFalse($route->handles('/')); $this->assertFalse($route->handles('/'));
$this->assertFalse($route->handles('baz')); $this->assertFalse($route->handles('baz'));
$this->assertFalse($route->handles('/foo')); $this->assertFalse($route->handles('/foo'));
$this->assertFalse($route->handles('foo'));
$route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /', 'GET /home'))); $route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /', 'GET /home')));