Correctly handle leading slashes on routes add. Fixes #322

codeigniter4 · Jan 5, 2017 · a9c6cff · a9c6cff
1 parent 43de1a0
commit a9c6cff
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1009,7 +1009,7 @@ protected function create(string $from, $to, array $options = null)
         // it doens't work with matching, so remove them...
         if ($from != '/')
         {
-            $from = rtrim($from, '/');
+            $from = trim($from, '/');
         }
 
 		if (is_null($options))

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
@@ -85,6 +85,23 @@ public function testAddWorksWithCurrentHTTPMethods()
 
 	//--------------------------------------------------------------------
 
+    public function testAddWithLeadingSlash()
+    {
+        $routes = new RouteCollection();
+
+        $routes->add('/home', 'controller');
+
+        $expects = [
+            'home' => '\controller',
+        ];
+
+        $routes = $routes->getRoutes();
+
+        $this->assertEquals($expects, $routes);
+    }
+
+    //--------------------------------------------------------------------
+
 	public function testMatchIgnoresInvalidHTTPMethods()
 	{
 		$_SERVER['REQUEST_METHOD'] = 'GET';