ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in route handles method.

Browse Source
This commit is contained in:
Taylor Otwell
2012-01-18 15:28:16 -06:00
parent 7fa80bcdba
commit 9bcbe6a357
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/routing/route.php
View File

@@ -214,11 +214,11 @@ class Route {
*/ */
public function handles($uri) public function handles($uri)
{ {
$pattern = '#'.str_replace('*', '(.*)', $uri).'#'; $pattern = ($uri !== '/') ? str_replace('*', '(.*)', $uri) : '^/$';
return ! is_null(array_first($this->uris, function($key, $uri) use ($pattern) return ! is_null(array_first($this->uris, function($key, $uri) use ($pattern)
{ {
return preg_match($pattern, $uri); return preg_match('#'.$pattern.'#', $uri);
})); }));
} }

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

@@ -19,10 +19,11 @@ class RouteTest extends PHPUnit_Framework_TestCase {
{ {
$route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /foo/bar'))); $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/*'));
$this->assertTrue($route->handles('foo/bar')); $this->assertTrue($route->handles('foo/bar'));
$this->assertFalse($route->handles('/'));
$this->assertFalse($route->handles('baz'));
$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')));