Merge pull request #1275 from Sadeghi85/develop
segment pattern to match a single segment, also matches UTF-8 segments.
This commit is contained in:
commit
b8ed80608f
|
@ -76,6 +76,7 @@ class Router {
|
|||
public static $patterns = array(
|
||||
'(:num)' => '([0-9]+)',
|
||||
'(:any)' => '([a-zA-Z0-9\.\-_%=]+)',
|
||||
'(:segment)' => '([^/]+)',
|
||||
'(:all)' => '(.*)',
|
||||
);
|
||||
|
||||
|
@ -87,6 +88,7 @@ class Router {
|
|||
public static $optional = array(
|
||||
'/(:num?)' => '(?:/([0-9]+)',
|
||||
'/(:any?)' => '(?:/([a-zA-Z0-9\.\-_%=]+)',
|
||||
'/(:segment?)' => '(?:/([^/]+)',
|
||||
'/(:all?)' => '(?:/(.*)',
|
||||
);
|
||||
|
||||
|
@ -494,7 +496,7 @@ protected static function match($method, $uri)
|
|||
// we just did before we started searching.
|
||||
if (str_contains($route, '('))
|
||||
{
|
||||
$pattern = '#^'.static::wildcards($route).'$#';
|
||||
$pattern = '#^'.static::wildcards($route).'$#u';
|
||||
|
||||
// If we get a match we'll return the route and slice off the first
|
||||
// parameter match, as preg_match sets the first array item to the
|
||||
|
|
Loading…
Reference in New Issue