Merge pull request #2089 from tareq-alqadi/master

Ensure modules are registered in register phase

Author: dcblogdev

src/FileRepository.php

@@ -3,7 +3,6 @@
 namespace Nwidart\Modules;
 
 use Countable;
-use Illuminate\Cache\CacheManager;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Illuminate\Contracts\Routing\UrlGenerator;
@@ -59,11 +58,6 @@ abstract class FileRepository implements Countable, RepositoryInterface
      */
     private Filesystem $files;
 
-    /**
-     * Cache Manager
-     */
-    private CacheManager $cache;
-
     private static $modules = [];
 
     /**
@@ -76,7 +70,6 @@ public function __construct(Container $app, ?string $path = null)
         $this->url = $app['url'];
         $this->config = $app['config'];
         $this->files = $app['files'];
-        $this->cache = $app['cache'];
     }
 
     /**

src/LaravelModulesServiceProvider.php

@@ -23,18 +23,6 @@ public function boot()
     {
         $this->registerNamespaces();
 
-        $this->app->singleton(
-            ModuleManifest::class,
-            fn () => new ModuleManifest(
-                new Filesystem,
-                app(Contracts\RepositoryInterface::class)->getScanPaths(),
-                $this->getCachedModulePath(),
-                app(ActivatorInterface::class)
-            )
-        );
-
-        $this->registerModules();
-
         AboutCommand::add('Laravel-Modules', [
             'Version' => fn () => InstalledVersions::getPrettyVersion('nwidart/laravel-modules'),
         ]);
@@ -58,6 +46,8 @@ public function register()
         $this->registerTranslations();
 
         $this->mergeConfigFrom(__DIR__.'/../config/config.php', 'modules');
+
+        $this->registerModules();
     }
 
     /**
@@ -98,6 +88,17 @@ protected function registerServices()
             return new $class($app);
         });
         $this->app->alias(Contracts\RepositoryInterface::class, 'modules');
+        
+        $this->app->singleton(
+            ModuleManifest::class,
+            fn() => new ModuleManifest(
+                new Filesystem,
+                app(Contracts\RepositoryInterface::class)->getScanPaths(),
+                $this->getCachedModulePath(),
+                app(ActivatorInterface::class)
+            )
+        );
+
     }
 
     protected function registerMigrations(): void