Merge pull request #2734 from samsonasik/ensure-fqcn-controllername

Fixes #2520 : ensure service(router)->controllername() returns fqcn

Author: MGatner

system/Router/Router.php

@@ -579,7 +579,7 @@ public function autoRoute(string $uri)
 		// We have to check for a length over 1, since by default it will be '\'
 		if (strpos($this->controller, '\\') === false && strlen($this->collection->getDefaultNamespace()) > 1)
 		{
-			$this->controller = str_replace('/', '\\', $this->collection->getDefaultNamespace() . $this->directory . $this->controllerName());
+			$this->controller = '\\' . ltrim(str_replace('/', '\\', $this->collection->getDefaultNamespace() . $this->directory . $this->controllerName()), '\\');
 		}
 	}
 

tests/system/Router/RouteCollectionTest.php

@@ -815,7 +815,6 @@ public function testReverseRoutingWithLocale()
 		$routes->add('{locale}/contact', 'myController::goto');
 
 		$this->assertEquals('/en/contact', $routes->reverseRoute('myController::goto'));
-
 	}
 
 	//--------------------------------------------------------------------
@@ -1475,4 +1474,43 @@ public function testZeroAsURIPath()
 		$this->assertEquals($expects, $router->handle('/0'));
 	}
 
+	public function provideRouteDefaultNamespace()
+	{
+		return [
+			'with \\ prefix'    => ['\App\Controllers'],
+			'without \\ prefix' => ['App\Controllers'],
+		];
+	}
+
+	/**
+	 * @dataProvider provideRouteDefaultNamespace
+	 */
+	public function testAutoRoutesControllerNameReturnsFQCN($namespace)
+	{
+		$routes = $this->getCollector();
+		$routes->setAutoRoute(true);
+		$routes->setDefaultNamespace($namespace);
+
+		$router = new Router($routes, Services::request());
+		$router->handle('/product');
+
+		$this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
+	}
+
+	/**
+	 * @dataProvider provideRouteDefaultNamespace
+	 */
+	public function testRoutesControllerNameReturnsFQCN($namespace)
+	{
+		$routes = $this->getCollector();
+		$routes->setAutoRoute(false);
+		$routes->setDefaultNamespace($namespace);
+		$routes->get('/product', 'Product');
+
+		$router = new Router($routes, Services::request());
+		$router->handle('/product');
+
+		$this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
+	}
+
 }