Merge branch 'release/1.3.1'

all-ride · Sep 16, 2016 · b5acf42 · b5acf42
2 parents 66c0fa5 + 41b8a32
commit b5acf42
Show file tree

Hide file tree

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

diff --git a/test/src/ride/library/router/RouteTest.php b/test/src/ride/library/router/RouteTest.php
@@ -6,13 +6,15 @@
 
 class RouteTest extends PHPUnit_Framework_TestCase {
 
-    public function testConstruct() {
-        $path = 'path';
+    /**
+     * @dataProvider providerConstruct
+     */
+    public function testConstruct($expectedPath, $path) {
         $callback = 'callback';
 
         $route = new Route($path, $callback);
 
-        $this->assertEquals('/' . $path, $route->getPath());
+        $this->assertEquals($route->getPath(), $expectedPath);
         $this->assertEquals($callback, $route->getCallback());
         $this->assertNull($route->getId());
         $this->assertNull($route->getAllowedMethods());
@@ -31,6 +33,13 @@ public function testConstruct() {
         $this->assertEquals(array($allowedMethod => true), $route->getAllowedMethods());
     }
 
+    public function providerConstruct() {
+        return array(
+            array('/path', 'path'),
+            array('///admin', '///admin'),
+        );
+    }
+
     /**
      * @dataProvider providerSetPathThrowsExceptionWhenThePathIsInvalid
      * @expectedException ride\library\router\exception\RouterException