Skip to content

Commit 73e7503

Browse files
committed
refactor: make effective loop directory if exists
1 parent d2d927e commit 73e7503

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

system/Autoloader/Autoloader.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,13 @@ protected function loadInNamespace(string $class)
280280
}
281281

282282
foreach ($this->prefixes as $namespace => $directories) {
283-
$classNamespaceFind = strpos($class, $namespace);
284-
$fileNamespace = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace)));
283+
if (strpos($class, $namespace) === 0) {
284+
$relativeClassPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace)));
285285

286-
foreach ($directories as $directory) {
287-
$directory = rtrim($directory, '\\/');
286+
foreach ($directories as $directory) {
287+
$directory = rtrim($directory, '\\/');
288288

289-
if ($classNamespaceFind === 0) {
290-
$filePath = $directory . $fileNamespace . '.php';
289+
$filePath = $directory . $relativeClassPath . '.php';
291290
$filename = $this->includeFile($filePath);
292291

293292
if ($filename) {

0 commit comments

Comments
 (0)