fix: directory is not correct

codeigniter4 · Apr 11, 2023 · 18b3db1 · 18b3db1
1 parent 283e744
commit 18b3db1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 6 deletions.
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
@@ -87,7 +87,7 @@ public function __construct(
         string $httpVerb
     ) {
         $this->protectedControllers = $protectedControllers;
-        $this->namespace            = rtrim($namespace, '\\') . '\\';
+        $this->namespace            = rtrim($namespace, '\\');
         $this->translateURIDashes   = $translateURIDashes;
         $this->httpVerb             = $httpVerb;
         $this->defaultController    = $defaultController;
@@ -118,7 +118,7 @@ private function createSegments(string $uri)
      */
     private function searchFirstController(array $segments): bool
     {
-        $controller = '\\' . trim($this->namespace, '\\');
+        $controller = '\\' . $this->namespace;
 
         while ($segments !== []) {
             $segment = array_shift($segments);
@@ -160,7 +160,7 @@ private function searchLastDefaultController(array $segments): bool
                 $segments
             );
 
-            $controller = '\\' . trim($this->namespace, '\\')
+            $controller = '\\' . $this->namespace
                 . '\\' . implode('\\', $namespaces)
                 . '\\' . $this->defaultController;
 
@@ -176,7 +176,7 @@ private function searchLastDefaultController(array $segments): bool
         }
 
         // Check for the default controller in Controllers directory.
-        $controller = '\\' . trim($this->namespace, '\\')
+        $controller = '\\' . $this->namespace
             . '\\' . $this->defaultController;
 
         if (class_exists($controller)) {
@@ -278,10 +278,14 @@ private function setDirectory()
 
         $namespaces = implode('\\', $segments);
 
-        $dir = substr($namespaces, strlen($this->namespace));
+        $dir = str_replace(
+            '\\',
+            '/',
+            ltrim(substr($namespaces, strlen($this->namespace)), '\\')
+        );
 
         if ($dir !== '') {
-            $this->directory = substr($namespaces, strlen($this->namespace)) . '/';
+            $this->directory = $dir . '/';
         }
     }
 

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
@@ -145,6 +145,19 @@ public function testAutoRouteFindsControllerWithSubfolder()
         $this->assertSame([], $params);
     }
 
+    public function testAutoRouteFindsControllerWithSubSubfolder()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('subfolder/sub/mycontroller/somemethod');
+
+        $this->assertSame('Subfolder/Sub/', $directory);
+        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
+        $this->assertSame('getSomemethod', $method);
+        $this->assertSame([], $params);
+    }
+
     public function testAutoRouteFindsDashedSubfolder()
     {
         $router = $this->createNewAutoRouter();

diff --git a/tests/system/Router/Controllers/Subfolder/Sub/Mycontroller.php b/tests/system/Router/Controllers/Subfolder/Sub/Mycontroller.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers\Subfolder\Sub;
+
+use CodeIgniter\Controller;
+
+class Mycontroller extends Controller
+{
+    public function getSomemethod()
+    {
+    }
+}