Merge pull request codeigniter4#8553 from ddevsr/perf-load-namespace

refactor: small improvement in `loadInNamespace` Autoloader
ddevsr · Feb 21, 2024 · cc9ce52 · cc9ce52
2 parents fcd8597 + 73e7503
commit cc9ce52
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -280,11 +280,13 @@ protected function loadInNamespace(string $class)
         }
 
         foreach ($this->prefixes as $namespace => $directories) {
-            foreach ($directories as $directory) {
-                $directory = rtrim($directory, '\\/');
+            if (strpos($class, $namespace) === 0) {
+                $relativeClassPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace)));
 
-                if (strpos($class, $namespace) === 0) {
-                    $filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
+                foreach ($directories as $directory) {
+                    $directory = rtrim($directory, '\\/');
+
+                    $filePath = $directory . $relativeClassPath . '.php';
                     $filename = $this->includeFile($filePath);
 
                     if ($filename) {