Merge pull request #301 from eggyal/patch-1

Generate candidates from decoded URLs

Author: dbu

Doctrine/Phpcr/PrefixCandidates.php

@@ -103,7 +103,7 @@ public function restrictQuery($queryBuilder)
     public function getCandidates(Request $request)
     {
         $candidates = array();
-        $url = $request->getPathInfo();
+        $url = rawurldecode($request->getPathInfo());
         foreach ($this->getPrefixes() as $prefix) {
             $candidates = array_unique(array_merge($candidates, $this->getCandidatesFor($url, $prefix)));
         }

Tests/Unit/Doctrine/Phpcr/PrefixCandidatesTest.php

@@ -50,6 +50,28 @@ public function testGetCandidates()
         );
     }
 
+    public function testGetCandidatesPercentEncoded()
+    {
+        $request = Request::create('/my/path%20percent%20encoded.html');
+
+        $candidates = new PrefixCandidates(array('/routes', '/simple'));
+        $paths = $candidates->getCandidates($request);
+
+        $this->assertEquals(
+            array(
+                '/routes/my/path percent encoded.html',
+                '/routes/my/path percent encoded',
+                '/routes/my',
+                '/routes',
+                '/simple/my/path percent encoded.html',
+                '/simple/my/path percent encoded',
+                '/simple/my',
+                '/simple',
+            ),
+            $paths
+        );
+    }
+
     public function testGetCandidatesLocales()
     {
         $request = Request::create('/de/path.html');