fix service provider auto loading

norbybaru · Nov 23, 2024 · d974ad4 · d974ad4
1 parent 78d1851
commit d974ad4
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/ModularizeServiceProvider.php b/src/ModularizeServiceProvider.php
@@ -182,10 +182,21 @@ private function autoloadConfig(string $moduleRootPath, string $module)
      */
     private function autoloadServiceProvider(string $moduleRootPath, string $module)
     {
-        $provider = "{$moduleRootPath}/{$module}/Providers/{$module}ServiceProvider.php";
+        $provider = "{$module}/Providers/{$module}ServiceProvider.php";
+        $file = "{$moduleRootPath}/$provider";
+        if ($this->files->exists($file)) {
+            $providerNamespace = $this->rootNamespace.str_replace(
+                ['/', '.php'],
+                ['\\', ''],
+                $provider
+            );
 
-        if ($this->files->exists($provider)) {
-            $this->app->register($provider);
+            if (
+                is_subclass_of($providerNamespace, ServiceProvider::class)
+                && ! (new ReflectionClass($providerNamespace))->isAbstract()
+            ) {
+                $this->app->register($providerNamespace);
+            }
         }
     }