add recursive to getFiles helper into Commands loading

Pharaonic · Jun 20, 2024 · e48b84d · e48b84d
1 parent 5f63028
commit e48b84d
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/Core/ServiceProvider.php b/src/Core/ServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
+use Symfony\Component\Finder\SplFileInfo;
 
 class ServiceProvider extends IlluminateServiceProvider
 {
@@ -87,12 +88,20 @@ protected function registerCommands()
 
         if ($this->app->runningInConsole()) {
             if (file_exists($commands = module_path(static::$module, 'Commands'))) {
-                $module = 'App\Modules\\' . str_replace('/', '\\', static::$module) . '\Commands\\';
-                $commands = array_map(function ($command) use ($module) {
-                    return $module . str_replace('.php', '', $command->getFileName());
-                }, getFiles($commands));
+                $commandsList = [];
 
-                $this->commands($commands);
+                foreach (getFiles($commands, true) as $file) {
+                    $ns = str_replace([$commands, DIRECTORY_SEPARATOR], ['', '\\'], $file->getPath());
+                    $module = 'App\Modules\\' . str_replace('/', '\\', static::$module) . '\Commands\\';
+
+                    if (!empty($ns)) {
+                        $module .= ltrim($ns, '\\') . '\\';
+                    }
+
+                    $commandsList[] = $module . str_replace('.php', '', $file->getFileName());
+                }
+
+                $this->commands($commandsList);
             }
 
             $console = module_path(static::$module, 'routes/console.php');