fix: $routes->setDefaultMethod() does not work

The default method may be not `index`, and it is set in the constructor.
codeigniter4 · Feb 12, 2022 · f6cce24 · f6cce24
1 parent d76e2a2
commit f6cce24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/system/Router/Router.php b/system/Router/Router.php
@@ -675,10 +675,7 @@ protected function setDefaultController()
  throw RouterException::forMissingDefaultRoute();
  }
 
- // Is the method being specified?
- if (sscanf($this->controller, '%[^/]/%s', $class, $this->method) !== 2) {
- $this->method = 'index';
- }
+ sscanf($this->controller, '%[^/]/%s', $class, $this->method);
 
  if (! is_file(APPPATH . 'Controllers/' . $this->directory . ucfirst($class) . '.php')) {
  return;

diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
@@ -199,6 +199,18 @@ public function testClosures()
  $this->assertSame($expects, '123-alpha');
  }
 
+ public function testAutoRouteFindsDefaultControllerAndMethod()
+ {
+ $this->collection->setDefaultController('Test');
+ $this->collection->setDefaultMethod('test');
+ $router = new Router($this->collection, $this->request);
+
+ $router->autoRoute('/');
+
+ $this->assertSame('Test', $router->controllerName());
+ $this->assertSame('test', $router->methodName());
+ }
+
  public function testAutoRouteFindsControllerWithFileAndMethod()
  {
  $router = new Router($this->collection, $this->request);