Merge pull request #215 from hypervel/hotfix/fix-config-provider-load

fix: fix registration of provider config in service providers

Author: albertcht

src/config/src/ProviderConfig.php

@@ -7,6 +7,7 @@
 use Hyperf\Collection\Arr;
 use Hyperf\Config\ProviderConfig as HyperfProviderConfig;
 use Hyperf\Support\Composer;
+use Hypervel\Support\ServiceProvider;
 use Throwable;
 
 /**
@@ -51,6 +52,27 @@ public static function load(): array
         );
     }
 
+    protected static function loadProviders(array $providers): array
+    {
+        $providerConfigs = [];
+        foreach ($providers as $provider) {
+            if (! is_string($provider) || ! class_exists($provider)) {
+                continue;
+            }
+            if (is_subclass_of($provider, ServiceProvider::class)
+                && $providerConfig = $provider::getProviderConfig()
+            ) {
+                $providerConfigs[] = $providerConfig;
+                continue;
+            }
+            if (method_exists($provider, '__invoke')) {
+                $providerConfigs[] = (new $provider())();
+            }
+        }
+
+        return static::merge(...$providerConfigs);
+    }
+
     protected static function packagesToIgnore(): array
     {
         $packages = Composer::getMergedExtra('hypervel')['dont-discover'] ?? [];

src/support/src/ServiceProvider.php

@@ -322,4 +322,12 @@ public static function defaultProviders(): DefaultProviders
     {
         return new DefaultProviders();
     }
+
+    /**
+     * Get the provider config for Hyperf framework.
+     */
+    public static function getProviderConfig(): array
+    {
+        return [];
+    }
 }