Merge pull request #1959 from MGatner/route-search-exempt-closures

Prevent reverseRoute from searching closures
codeigniter4 · May 14, 2019 · 2133346 · 2133346
2 parents e1b64da + 92ee0ca
commit 2133346
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -1115,6 +1115,12 @@ public function reverseRoute(string $search, ...$params)
 			{
 				$from = key($route['route']);
 				$to   = $route['route'][$from];
+
+				// ignore closures
+				if (! is_string($to))
+				{
+					continue;
+				}
 
 				// Lose any namespace slash at beginning of strings
 				// to ensure more consistent match.

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
@@ -947,15 +947,21 @@ public function testReverseRoutingWithClosure()
 	{
 		$routes = $this->getCollector();
 
-		$routes->add(
-				'login', function () {
-				}
-		);
+		$routes->add('login', function() { });
 
 		$match = $routes->reverseRoute('login');
 
 		$this->assertEquals('/login', $match);
 	}
+
+	public function testReverseRoutingWithClosureNoMatch()
+	{
+		$routes = $this->getCollector();
+
+		$routes->add('login', function() { });
+
+		$this->assertFalse($routes->reverseRoute('foobar'));
+	}
 
 	//--------------------------------------------------------------------