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

added more dependency injection to route loader and finder.

This commit is contained in:
Taylor Otwell 2011-07-31 22:11:49 -05:00
parent 0af326b636
commit f9f168eacb
3 changed files with 48 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
system/routing/finder.php
View File

@ -2,13 +2,6 @@
class Finder {
/**
* All of the loaded routes.
*
* @var array
*/
public static $routes;
/**
* The named routes that have been found so far.
*
@ -17,35 +10,25 @@ class Finder {
public static $names = array();
/**
* Find a route by name.
* Find a named route in a given array of routes.
*
* @param string $name
* @param array $routes
* @return array
*/
public static function find($name)
public static function find($name, $routes)
{
// This class maintains its own list of routes because the router only loads routes that
// are applicable to the current request URI. But, this class obviously needs access
// to all of the routes, not just the ones applicable to the request URI.
if (is_null(static::$routes))
{
static::$routes = require APP_PATH.'routes'.EXT;
if (is_dir(APP_PATH.'routes'))
{
static::$routes = array_merge(static::load(), static::$routes);
}
}
if (array_key_exists($name, static::$names))
{
return static::$names[$name];
}
$arrayIterator = new \RecursiveArrayIterator(static::$routes);
$arrayIterator = new \RecursiveArrayIterator($routes);
$recursiveIterator = new \RecursiveIteratorIterator($arrayIterator);
// Since routes can be nested deep within sub-directories, we need to recursively
// iterate through each directory and gather all of the routes.
foreach ($recursiveIterator as $iterator)
{
$route = $recursiveIterator->getSubIterator();
@ -57,33 +40,4 @@ public static function find($name)
}
}
/**
* Load all of the routes from the routes directory.
*
* All of the various route files will be merged together
* into a single array that can be searched.
*
* @return array
*/
private static function load()
{
$routes = array();
// Since route files can be nested deep within the route directory, we need to
// recursively spin through the directory to find every file.
$directoryIterator = new \RecursiveDirectoryIterator(APP_PATH.'routes');
$recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
foreach ($recursiveIterator as $file)
{
if (filetype($file) === 'file' and strpos($file, EXT) !== false)
{
$routes = array_merge(require $file, $routes);
}
}
return $routes;
}
}

41
system/routing/loader.php
View File

@ -2,6 +2,13 @@
class Loader {
/**
* All of the routes for the application.
*
* @var array
*/
private static $routes;
/**
* Load the appropriate routes for the request URI.
*
@ -39,4 +46,38 @@ private function load_nested_routes($uri)
return array();
}
/**
* Get all of the routes for the application.
*
* To improve performance, this operation will only be performed once. The routes
* will be cached and returned on every subsequent call.
*
* @return array
*/
public static function everything()
{
if ( ! is_null(static::$routes)) return static::$routes;
$routes = require APP_PATH.'routes'.EXT;
if (is_dir(APP_PATH.'routes'))
{
// Since route files can be nested deep within the route directory, we need to
// recursively spin through the directory to find every file.
$directoryIterator = new \RecursiveDirectoryIterator(APP_PATH.'routes');
$recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
foreach ($recursiveIterator as $file)
{
if (filetype($file) === 'file' and strpos($file, EXT) !== false)
{
$routes = array_merge(require $file, $routes);
}
}
}
return static::$routes = $routes;
}
}

2
system/url.php
View File

@ -71,7 +71,7 @@ public static function to_asset($url)
*/
public static function to_route($name, $parameters = array(), $https = false)
{
if ( ! is_null($route = Routing\Finder::find($name)))
if ( ! is_null($route = Routing\Finder::find($name, Routing\Loader::everything())))
{
$uris = explode(', ', key($route));