TranslateURIDashes fix. See #1564

Author: lonnieezell

system/Router/Router.php

@@ -160,6 +160,7 @@ public function __construct(RouteCollectionInterface $routes)
 	 * @param string $uri
 	 *
 	 * @return mixed
+	 * @throws \CodeIgniter\Router\RedirectException
 	 */
 	public function handle(string $uri = null)
 	{
@@ -192,7 +193,7 @@ public function handle(string $uri = null)
 
 		$this->autoRoute($uri);
 
-		return $this->controller;
+		return $this->controllerName();
 	}
 
 	//--------------------------------------------------------------------
@@ -216,7 +217,9 @@ public function getFilter()
 	 */
 	public function controllerName()
 	{
-		return $this->controller;
+		return $this->translateURIDashes
+			? str_replace('-', '_', $this->controller)
+			: $this->controller;
 	}
 
 	//--------------------------------------------------------------------
@@ -229,7 +232,9 @@ public function controllerName()
 	 */
 	public function methodName(): string
 	{
-		return $this->method;
+		return $this->translateURIDashes
+			? str_replace('-', '_', $this->method)
+			: $this->method;
 	}
 
 	//--------------------------------------------------------------------
@@ -529,7 +534,7 @@ public function autoRoute(string $uri)
 		}
 
 		// Load the file so that it's available for CodeIgniter.
-		$file = APPPATH . 'Controllers/' . $this->directory . $this->controller . '.php';
+		$file = APPPATH . 'Controllers/' . $this->directory . $this->controllerName() . '.php';
 		if (is_file($file))
 		{
 			include_once $file;
@@ -539,7 +544,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->controller);
+			$this->controller = str_replace('/', '\\', $this->collection->getDefaultNamespace() . $this->directory . $this->controllerName());
 		}
 	}
 
@@ -620,15 +625,6 @@ protected function setRequest(array $segments = [])
 			return;
 		}
 
-		if ($this->translateURIDashes === true)
-		{
-			$segments[0] = str_replace('-', '_', $segments[0]);
-			if (isset($segments[1]))
-			{
-				$segments[1] = str_replace('-', '_', $segments[1]);
-			}
-		}
-
 		list($controller, $method) = array_pad(explode('::', $segments[0]), 2, null);
 
 		$this->controller = $controller;

tests/system/Router/RouterTest.php

@@ -28,6 +28,8 @@ protected function setUp()
 
 		$routes = [
 			'users'                                           => 'Users::index',
+			'user-setting/show-list'                          => 'User_setting::show_list',
+			'user-setting/(:segment)'                         => 'User_setting::detail/$1',
 			'posts'                                           => 'Blog::posts',
 			'pages'                                           => 'App\Pages::list_all',
 			'posts/(:num)'                                    => 'Blog::show/$1',
@@ -439,4 +441,53 @@ public function testRouteOrder()
 		$this->assertEquals('auth_post', $router->methodName());
 	}
 
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+	 */
+	public function testTranslateURIDashes()
+	{
+		$router = new Router($this->collection);
+
+		$router->handle('user-setting/show-list');
+
+		$router->setTranslateURIDashes(true);
+
+		$this->assertEquals('\User_setting', $router->controllerName());
+		$this->assertEquals('show_list', $router->methodName());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+	 */
+	public function testTranslateURIDashesForParams()
+	{
+		$router = new Router($this->collection);
+		$router->setTranslateURIDashes(true);
+
+		$router->handle('user-setting/2018-12-02');
+
+		$this->assertEquals('\User_setting', $router->controllerName());
+		$this->assertEquals('detail', $router->methodName());
+		$this->assertEquals(['2018-12-02'], $router->params());
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+	 */
+	public function testTranslateURIDashesForAutoRoute()
+	{
+		$router = new Router($this->collection);
+		$router->setTranslateURIDashes(true);
+
+		$router->autoRoute('admin-user/show-list');
+
+		$this->assertEquals('Admin_user', $router->controllerName());
+		$this->assertEquals('show_list', $router->methodName());
+	}
+
+	//--------------------------------------------------------------------
 }