Merge pull request #10228 from cakephp/issue-10219

Fix issue where urlencoded URLs would not be matched

src/Routing/RouteCollection.php

@@ -166,7 +166,7 @@ class RouteCollection
     public function parseRequest(ServerRequestInterface $request)
     {
         $uri = $request->getUri();
-        $urlPath = $uri->getPath();
+        $urlPath = urldecode($uri->getPath());
         foreach (array_keys($this->_paths) as $path) {
             if (strpos($urlPath, $path) !== 0) {
                 continue;

tests/TestCase/Routing/RouteCollectionTest.php

@@ -150,6 +150,10 @@ class RouteCollectionTest extends TestCase
             '_matchedRoute' => '/ден/:day-:month',
         ];
         $this->assertEquals($expected, $result);
+
+        $request = new ServerRequest(['url' => $url]);
+        $result = $this->collection->parseRequest($request);
+        $this->assertEquals($expected, $result);
     }
 
     /**
@@ -350,6 +354,32 @@ class RouteCollectionTest extends TestCase
     }
 
     /**
+     * Test parsing routes that match non-ascii urls
+     *
+     * @return void
+     */
+    public function testParseRequestUnicode()
+    {
+        $routes = new RouteBuilder($this->collection, '/b', []);
+        $routes->connect('/alta/confirmación', ['controller' => 'Media', 'action' => 'confirm']);
+
+        $request = new ServerRequest(['url' => '/b/alta/confirmaci%C3%B3n']);
+        $result = $this->collection->parseRequest($request);
+        $expected = [
+            'controller' => 'Media',
+            'action' => 'confirm',
+            'pass' => [],
+            'plugin' => null,
+            '_matchedRoute' => '/b/alta/confirmación',
+        ];
+        $this->assertEquals($expected, $result);
+
+        $request = new ServerRequest(['url' => '/b/alta/confirmación']);
+        $result = $this->collection->parseRequest($request);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
      * Test match() throws an error on unknown routes.
      *
      * @expectedException \Cake\Routing\Exception\MissingRouteException

tests/TestCase/Routing/RouterTest.php

@@ -2297,10 +2297,10 @@ class RouterTest extends TestCase
         Router::reload();
         Router::connect('/:controller/:action/*');
         $result = Router::parse('/posts/view/something.', 'GET');
-        $this->assertEquals('something.', $result['pass'][0], 'Period was chopped off %s');
+        $this->assertEquals('something.', $result['pass'][0], 'Period was chopped off');
 
         $result = Router::parse('/posts/view/something. . .', 'GET');
-        $this->assertEquals('something. . .', $result['pass'][0], 'Period was chopped off %s');
+        $this->assertEquals('something. . .', $result['pass'][0], 'Period was chopped off');
     }
 
     /**
@@ -2315,10 +2315,10 @@ class RouterTest extends TestCase
         Router::extensions('json', false);
 
         $result = Router::parse('/posts/view/something.', 'GET');
-        $this->assertEquals('something.', $result['pass'][0], 'Period was chopped off %s');
+        $this->assertEquals('something.', $result['pass'][0], 'Period was chopped off');
 
         $result = Router::parse('/posts/view/something. . .', 'GET');
-        $this->assertEquals('something. . .', $result['pass'][0], 'Period was chopped off %s');
+        $this->assertEquals('something. . .', $result['pass'][0], 'Period was chopped off');
     }
 
     /**