Ensure reverse routing provides a leading slash to match the docs and…

… ensure a conforming URL. Partial for #278
codeigniter4 · Oct 4, 2016 · 1eb08d9 · 1eb08d9
1 parent ce07f0c
commit 1eb08d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -905,6 +905,8 @@ public function environment(string $env, \Closure $callback): RouteCollectionInt
 	 *
 	 * @param string $search
 	 * @param        ...$params
+     *
+     * @return string
 	 */
 	public function reverseRoute(string $search, ...$params): string
 	{
@@ -964,7 +966,7 @@ protected function fillRouteParams(string $from, array $params = null): string
 
 		if (empty($matches[0]))
 		{
-			return $from;
+			return '/'.ltrim($from, '/');
 		}
 
 		// Build our resulting string, inserting the $params in
@@ -983,7 +985,7 @@ protected function fillRouteParams(string $from, array $params = null): string
 			}
 		}
 
-		return $from;
+		return '/'.ltrim($from, '/');
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
@@ -542,6 +542,9 @@ public function testEnvironmentRestricts()
 
 	//--------------------------------------------------------------------
 
+    /**
+     * @group single
+     */
 	public function testReverseRoutingFindsSimpleMatch()
 	{
 		$routes = new RouteCollection();
@@ -550,7 +553,7 @@ public function testReverseRoutingFindsSimpleMatch()
 
 		$match = $routes->reverseRoute('myController::goto', 'string', 13);
 
-		$this->assertEquals('path/string/to/13', $match);
+		$this->assertEquals('/path/string/to/13', $match);
 	}
 
 	//--------------------------------------------------------------------
@@ -590,18 +593,18 @@ public function testReverseRoutingThrowsExceptionWithBadParamTypes()
 	}
 
 	//--------------------------------------------------------------------
-	
+
 	public function testNamedRoutes()
 	{
 		$routes = new RouteCollection();
 
 		$routes->add('users', 'Users::index', ['as' => 'namedRoute']);
 
-		$this->assertEquals('users', $routes->reverseRoute('namedRoute'));
+		$this->assertEquals('/users', $routes->reverseRoute('namedRoute'));
 	}
-	
+
 	//--------------------------------------------------------------------
-	
+
 	public function testNamedRoutesFillInParams()
 	{
 		$routes = new RouteCollection();
@@ -610,7 +613,7 @@ public function testNamedRoutesFillInParams()
 
 		$match = $routes->reverseRoute('namedRoute', 'string', 13);
 
-		$this->assertEquals('path/string/to/13', $match);
+		$this->assertEquals('/path/string/to/13', $match);
 	}
 
 	//--------------------------------------------------------------------

diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
@@ -180,9 +180,6 @@ public function testAutoRouteFindsControllerWithSubfolder()
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * @group single
-	 */
 	public function testDetectsLocales()
 	{
 	    $router = new Router($this->collection);