Check for both halves of the brace.

Only checking for one makes it possible to enter brace mode accidentally.
cakephp · Jan 8, 2018 · f018dbf · f018dbf
1 parent d0e8f2d
commit f018dbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
@@ -322,7 +322,7 @@ protected function _writeRoute()
         $names = $routeParams = [];
         $parsed = preg_quote($this->template, '#');
 
-        if (strpos($route, '{') !== false) {
+        if (strpos($route, '{') !== false && strpos($route, '}') !== false) {
             preg_match_all('/\{([a-z0-9-_]+)\}/i', $route, $namedElements);
             $this->braceKeys = true;
         } else {

diff --git a/tests/TestCase/Routing/Route/RouteTest.php b/tests/TestCase/Routing/Route/RouteTest.php
@@ -190,6 +190,19 @@ public function testRouteCompileBraces()
      */
     public function testRouteCompileMixedPlaceholders()
     {
+        $route = new Route(
+            '/images/{open/:id',
+            ['controller' => 'Images', 'action' => 'open']
+        );
+        $pattern = $route->compile();
+        $this->assertRegExp($pattern, '/images/{open/9', 'Need both {} to enable brace mode');
+        $result = $route->match([
+            'controller' => 'Images',
+            'action' => 'open',
+            'id' => 123,
+        ]);
+        $this->assertEquals('/images/{open/123', $result);
+
         $route = new Route(
             '/fighters/{id}/move/{x}/:y',
             ['controller' => 'Fighters', 'action' => 'move'],