Merge pull request #384 from spytheman/master

Allow easy routing of URLs containing Cyrillic letters.

flight/net/Router.php

@@ -78,8 +78,9 @@ class Router {
      * @return Route|bool Matching route or false if no match
      */
     public function route(Request $request) {
+        $url_decoded = urldecode( $request->url );
         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;
             }
             $this->next();

tests/RouterTest.php

@@ -263,4 +263,16 @@ class RouterTest extends PHPUnit_Framework_TestCase
 
         $this->check('404');
     }
+
+    
+    // Passing URL parameters matched with regular expression for a URL containing Cyrillic letters:
+    function testRegExParametersCyrillic(){
+        $this->router->map('/категория/@name:[абвгдеёжзийклмнопрстуфхцчшщъыьэюя]+', function($name){
+            echo $name;
+        });
+        $this->request->url = urlencode('/категория/цветя');
+
+        $this->check('цветя');
+    }
+    
 }