Update Kernel::load() to use same classFromFile logic as events

laravel · Jun 2, 2023 · 1a68b63 · 1a68b63
1 parent 838bb1b
commit 1a68b63
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/Console/Kernel.php b/src/Illuminate/Foundation/Console/Kernel.php
@@ -332,12 +332,15 @@ protected function load($paths)
         }
 
         $namespace = $this->app->getNamespace();
+        $basePath = $this->app->basePath();
 
-        foreach ((new Finder)->in($paths)->files() as $command) {
-            $command = $namespace.str_replace(
-                ['/', '.php'],
-                ['\\', ''],
-                Str::after($command->getRealPath(), realpath(app_path()).DIRECTORY_SEPARATOR)
+        foreach ((new Finder())->in($paths)->files() as $file) {
+            $class = trim(Str::replaceFirst($basePath, '', $file->getRealPath()), DIRECTORY_SEPARATOR);
+
+            $command = str_replace(
+                [DIRECTORY_SEPARATOR, ucfirst(basename(app()->path())).'\\'],
+                ['\\', $namespace],
+                ucfirst(Str::replaceLast('.php', '', $class)),
             );
 
             if (is_subclass_of($command, Command::class) &&