Merge branch 'release/1.3.2'

all-ride · Sep 16, 2016 · 76d8cb3 · 76d8cb3
2 parents bdb991a + a96613d
commit 76d8cb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/ride/library/router/Route.php b/src/ride/library/router/Route.php
@@ -157,11 +157,17 @@ protected function setPath($path) {
             throw new RouterException('Could not set the path of the route: ' . $path . ' is not a valid HTTP path');
         }
 
-        if (substr($path, 0, 1) != '/') {
-            $path = '/' . $path;
+        if ($path !== '/') {
+            if (substr($path, 0, 1) !== '/') {
+                $path = '/' . $path;
+            }
+
+            if (substr($path, -1) === '/') {
+                $path = substr($path, 0, -1);
+            }
         }
 
-        $this->path = rtrim($path, '/');
+        $this->path = $path;
     }
 
     /**

diff --git a/test/src/ride/library/router/RouteTest.php b/test/src/ride/library/router/RouteTest.php
@@ -37,6 +37,7 @@ public function providerConstruct() {
         return array(
             array('/path', 'path'),
             array('///admin', '///admin'),
+            array('/', '/'),
         );
     }