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

extracted the route wildcard translation to a separate method.

This commit is contained in:
Taylor Otwell 2011-07-09 23:54:07 -05:00
parent 8277694693
commit d0ba4719d8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
system/router.php
View File

@ -41,9 +41,7 @@ public static function route($method, $uri)
{ {
foreach (explode(', ', $keys) as $key) foreach (explode(', ', $keys) as $key)
{ {
$key = str_replace(':num', '[0-9]+', str_replace(':any', '[a-zA-Z0-9\-_]+', $key)); if (preg_match('#^'.$key = static::translate_wildcards($key).'$#', $uri))
if (preg_match('#^'.$key.'$#', $uri))
{ {
return Request::$route = new Route($keys, $callback, static::parameters($uri, $key)); return Request::$route = new Route($keys, $callback, static::parameters($uri, $key));
} }
@ -85,6 +83,17 @@ private static function load_from_directory($uri)
return (file_exists($path = APP_PATH.'routes/'.$segments[0].EXT)) ? array_merge(require $path, $home) : $home; return (file_exists($path = APP_PATH.'routes/'.$segments[0].EXT)) ? array_merge(require $path, $home) : $home;
} }
/**
* Translate route URI wildcards to regular expressions.
*
* @param string $key
* @return string
*/
private static function translate_wildcards($key)
{
return str_replace(':num', '[0-9]+', str_replace(':any', '[a-zA-Z0-9\-_]+', $key));
}
/** /**
* Extract the parameters from a URI based on a route URI. * Extract the parameters from a URI based on a route URI.
* *