|
|
@ -78,8 +78,9 @@ class Router {
|
|
|
|
* @return Route|bool Matching route or false if no match
|
|
|
|
* @return Route|bool Matching route or false if no match
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public function route(Request $request) {
|
|
|
|
public function route(Request $request) {
|
|
|
|
|
|
|
|
$url_decoded = urldecode( $request->url );
|
|
|
|
while ($route = $this->current()) {
|
|
|
|
while ($route = $this->current()) {
|
|
|
|
if ($route !== false && $route->matchMethod($request->method) && $route->matchUrl($request->url, $this->case_sensitive)) {
|
|
|
|
if ($route !== false && $route->matchMethod($request->method) && $route->matchUrl($url_decoded, $this->case_sensitive)) {
|
|
|
|
return $route;
|
|
|
|
return $route;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$this->next();
|
|
|
|
$this->next();
|
|
|
|