Add support for parsing multi-extensions

cakephp · Oct 24, 2016 · 5d6a7c4 · 5d6a7c4
1 parent 604278c
commit 5d6a7c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
@@ -349,7 +349,7 @@ protected function _parseExtension($url)
         if (empty($this->_extensions)) {
             return [$url, null];
         }
-        preg_match('/\.([0-9a-z]*)$/', $url, $match);
+        preg_match('/\.([0-9a-z\.]*)$/', $url, $match);
         if (empty($match[1])) {
             return [$url, null];
         }

diff --git a/tests/TestCase/Routing/Route/RouteTest.php b/tests/TestCase/Routing/Route/RouteTest.php
@@ -109,7 +109,7 @@ public function testRouteParsingWithExtensions()
         $result = $route->parse('/posts/index.pdf', 'GET');
         $this->assertFalse(isset($result['_ext']));
 
-        $route->extensions(['pdf', 'json', 'xml']);
+        $route->extensions(['pdf', 'json', 'xml', 'xml.gz']);
         $result = $route->parse('/posts/index.pdf', 'GET');
         $this->assertEquals('pdf', $result['_ext']);
 
@@ -118,6 +118,9 @@ public function testRouteParsingWithExtensions()
 
         $result = $route->parse('/posts/index.xml', 'GET');
         $this->assertEquals('xml', $result['_ext']);
+
+        $result = $route->parse('/posts/index.xml.gz', 'GET');
+        $this->assertEquals('xml.gz', $result['_ext']);
     }
 
     /**
@@ -619,6 +622,13 @@ public function testMatchWithExtension()
             'c' => 'd'
         ]);
         $this->assertEquals('/posts/view/1.json?id=b&c=d', $result);
+
+        $result = $route->match([
+            'controller' => 'posts',
+            'action' => 'index',
+            '_ext' => 'json.gz',
+        ]);
+        $this->assertEquals('/posts/index.json.gz', $result);
     }
 
     /**