diff --git a/AltoRouter.php b/AltoRouter.php index 23bdcf4..194a672 100644 --- a/AltoRouter.php +++ b/AltoRouter.php @@ -186,7 +186,8 @@ class AltoRouter { if ($_route === '*') { $match = true; } elseif (isset($_route[0]) && $_route[0] === '@') { - $match = preg_match('`' . substr($_route, 1) . '`u', $requestUrl, $params); + $pattern = '`' . substr($_route, 1) . '`u'; + $match = preg_match($pattern, $requestUrl, $params); } else { $route = null; $regex = false; diff --git a/AltoRouterTest.php b/AltoRouterTest.php index 2462cd8..9ef9d08 100644 --- a/AltoRouterTest.php +++ b/AltoRouterTest.php @@ -351,7 +351,7 @@ class AltoRouterTest extends PHPUnit_Framework_TestCase $pattern .= '\x{FE70}-\x{FEFF}'; $pattern .= '\x{0750}-\x{077F}'; // Alphanumeric, /, _, - and space characters - $pattern .= 'a-zA-Z0-9\/_-\s'; + $pattern .= 'a-zA-Z0-9\/_\-\s'; // 'ZERO WIDTH NON-JOINER' $pattern .= '\x{200C}'; $pattern .= ']+)';