Fix incorrect staticPath() generation for brace style routes.

Brace style routes were not correctly generating their static path prefix. This resulted in routes not being found during URL parsing.
cakephp · Jun 12, 2018 · 9d2b24e · 9d2b24e
1 parent 2482145
commit 9d2b24e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
@@ -866,6 +866,10 @@ public function staticPath()
         if ($routeKey !== false) {
             return substr($this->template, 0, $routeKey);
         }
+        $routeKey = strpos($this->template, '{');
+        if ($routeKey !== false && strpos($this->template, '}') !== false) {
+            return substr($this->template, 0, $routeKey);
+        }
         $star = strpos($this->template, '*');
         if ($star !== false) {
             $path = rtrim(substr($this->template, 0, $star), '/');

diff --git a/tests/TestCase/Routing/Route/RouteTest.php b/tests/TestCase/Routing/Route/RouteTest.php
@@ -1728,6 +1728,26 @@ public function testStaticPath()
         $route = new Route('/:controller/:action/*');
         $this->assertEquals('/', $route->staticPath());
 
+        $route = new Route('/api/{/:action/*');
+        $this->assertEquals('/api/{/', $route->staticPath());
+
+        $route = new Route('/books/reviews', ['controller' => 'Reviews', 'action' => 'index']);
+        $this->assertEquals('/books/reviews', $route->staticPath());
+    }
+
+    /**
+     * Test getting the static path for a route.
+     *
+     * @return void
+     */
+    public function testStaticPathBrace()
+    {
+        $route = new Route('/pages/{id}/*', ['controller' => 'Pages', 'action' => 'display']);
+        $this->assertEquals('/pages/', $route->staticPath());
+
+        $route = new Route('/{controller}/{action}/*');
+        $this->assertEquals('/', $route->staticPath());
+
         $route = new Route('/books/reviews', ['controller' => 'Reviews', 'action' => 'index']);
         $this->assertEquals('/books/reviews', $route->staticPath());
     }