fix: FileLocator::locateFile() bug with a similar namespace name

Author: michalsn

system/Autoloader/FileLocator.php

@@ -72,12 +72,16 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
 
         foreach (array_keys($namespaces) as $namespace) {
             if (substr($file, 0, strlen($namespace)) === $namespace) {
+                $fileWithoutNamespace = substr($file, strlen($namespace));
+                // Check if this is really another sub-namespace,
+                // or just a namespace with a very similar name.
+                if ($fileWithoutNamespace[0] !== '\\') {
+                    continue;
+                }
                 // There may be sub-namespaces of the same vendor,
                 // so overwrite them with namespaces found later.
-                $paths = $namespaces[$namespace];
-
-                $fileWithoutNamespace = substr($file, strlen($namespace));
-                $filename             = ltrim(str_replace('\\', '/', $fileWithoutNamespace), '/');
+                $paths    = $namespaces[$namespace];
+                $filename = ltrim(str_replace('\\', '/', $fileWithoutNamespace), '/');
             }
         }
 

tests/system/Autoloader/FileLocatorTest.php

@@ -44,6 +44,8 @@ protected function setUp(): void
             'CodeIgniter\\Devkit' => [
                 TESTPATH . '_support/',
             ],
+            'Acme\SampleProject' => TESTPATH . '_support',
+            'Acme\Sample'        => TESTPATH . '_support/does/not/exists',
         ]);
 
         $this->locator = new FileLocator($autoloader);
@@ -151,6 +153,15 @@ public function testLocateFileNotFoundWithBadNamespace()
         $this->assertFalse($this->locator->locateFile($file, 'Views'));
     }
 
+    public function testLocateFileWithProperNamespace()
+    {
+        $file = 'Acme\SampleProject\View\Views\simple';
+
+        $expected = ROOTPATH . 'tests/_support/View/Views/simple.php';
+
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
+
     public function testSearchSimple()
     {
         $expected = APPPATH . 'Config/App.php';