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

fixing bugs in router.

This commit is contained in:
Taylor Otwell 2012-02-12 19:26:16 -06:00
parent 775b97ee76
commit 74887986a7
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/bundle.php
View File

@ -107,6 +107,8 @@ public static function start($bundle)
*/ */
public static function routes($bundle) public static function routes($bundle)
{ {
if (static::routed($bundle)) return;
$path = static::path($bundle).'routes'.EXT; $path = static::path($bundle).'routes'.EXT;
// By setting the bundle property on the router the router knows what // By setting the bundle property on the router the router knows what
@ -116,10 +118,10 @@ public static function routes($bundle)
if ( ! static::routed($bundle) and file_exists($path)) if ( ! static::routed($bundle) and file_exists($path))
{ {
static::$routed[] = $bundle;
require $path; require $path;
} }
static::$routed[] = $bundle;
} }
/** /**

36
laravel/routing/router.php
View File

@ -367,14 +367,17 @@ public static function find($name)
// To find a named route, we will iterate through every route defined // To find a named route, we will iterate through every route defined
// for the application. We will cache the routes by name so we can // for the application. We will cache the routes by name so we can
// load them very quickly the next time. // load them very quickly the next time.
foreach (static::all() as $key => $value) foreach (static::routes() as $method => $routes)
{ {
if (array_get($value, 'name') === $name) foreach ($routes as $key => $value)
{
if (isset($value['name']) and $value['name'] === $name)
{ {
return static::$names[$name] = array($key => $value); return static::$names[$name] = array($key => $value);
} }
} }
} }
}
/** /**
* Find the route that uses the given action. * Find the route that uses the given action.
@ -397,11 +400,14 @@ public static function uses($action)
// To find the route, we'll simply spin through the routes looking // To find the route, we'll simply spin through the routes looking
// for a route with a "uses" key matching the action, and if we // for a route with a "uses" key matching the action, and if we
// find one we cache and return it. // find one we cache and return it.
foreach (static::all() as $uri => $route) foreach (static::routes() as $method => $routes)
{ {
if (array_get($route, 'uses') == $action) foreach ($routes as $key => $value)
{ {
return static::$uses[$action] = array($uri => $route); if (isset($value['uses']) and $value['uses'] === $action)
{
return static::$uses[$action] = array($key => $value);
}
} }
} }
} }
@ -490,26 +496,6 @@ protected static function wildcards($key)
return strtr($key, static::$patterns); return strtr($key, static::$patterns);
} }
/**
* Get all of the routes across all request methods.
*
* @return array
*/
public static function all()
{
$all = array();
// To get all the routes, we'll just loop through each request
// method supported by the router and merge in each of the
// arrays into the main array of routes.
foreach (static::$methods as $method)
{
$all = array_merge($all, static::routes($method));
}
return $all;
}
/** /**
* Get all of the registered routes, with fallbacks at the end. * Get all of the registered routes, with fallbacks at the end.
* *

4
laravel/url.php
View File

@ -244,7 +244,9 @@ public static function to_route($name, $parameters = array())
// should be generated with an HTTPS protocol string or just HTTP. // should be generated with an HTTPS protocol string or just HTTP.
$https = array_get(current($route), 'https', false); $https = array_get(current($route), 'https', false);
return static::to(static::transpose(key($route), $parameters), $https); $uri = trim(static::transpose(key($route), $parameters), '/');
return static::to($uri, $https);
} }
/** /**