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

fixed bug in router.

This commit is contained in:
Taylor Otwell 2012-01-18 11:41:13 -06:00
parent 6865db3f21
commit 73c09f2f29
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/auth.php
View File

@ -62,7 +62,7 @@ public static function user()
{ {
if ( ! is_null(static::$user)) return static::$user; if ( ! is_null(static::$user)) return static::$user;
$id = Session::get(Auth::user_key); $id = IoC::core('session')->get(Auth::user_key);
// To retrieve the user, we'll first attempt to use the "user" Closure // To retrieve the user, we'll first attempt to use the "user" Closure
// defined in the auth configuration file, passing in the ID. The user // defined in the auth configuration file, passing in the ID. The user

2
laravel/routing/route.php
View File

@ -79,7 +79,7 @@ public function __construct($key, $action, $parameters = array())
*/ */
protected static function extract($segment) protected static function extract($segment)
{ {
$uri = substr($segment, strpos($segment, ' ')); $uri = substr($segment, strpos($segment, ' ') + 1);
return ($uri !== '/') ? trim($uri, '/') : $uri; return ($uri !== '/') ? trim($uri, '/') : $uri;
} }

4
laravel/routing/router.php
View File

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

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

@ -17,13 +17,13 @@ public function tearDown()
*/ */
public function testHandlesIndicatesIfTheRouteHandlesAGivenURI() public function testHandlesIndicatesIfTheRouteHandlesAGivenURI()
{ {
$route = new Laravel\Routing\Route('GET /', array('handles' => array('foo/bar'))); $route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /foo/bar')));
$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('baz')); $this->assertFalse($route->handles('baz'));
$route = new Laravel\Routing\Route('GET /', array('handles' => array('/', 'home'))); $route = new Laravel\Routing\Route('GET /', array('handles' => array('GET /', 'GET /home')));
$this->assertTrue($route->handles('/')); $this->assertTrue($route->handles('/'));
$this->assertTrue($route->handles('home')); $this->assertTrue($route->handles('home'));