Merge pull request #940 from hydephp/create-configuration-service-provider

emmadesilva · web-flow · commit f9d3f01f9da3 · 2023-02-09T12:22:31.000+01:00
Create configuration service provider
diff --git a/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php b/packages/framework/src/Foundation/Providers/ConfigurationServiceProvider.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Providers;
+
+use Hyde\Framework\Services\YamlConfigurationService;
+use Illuminate\Support\ServiceProvider;
+
+class ConfigurationServiceProvider extends ServiceProvider
+{
+    /**
+     * Run any logic before the Hyde Service Provider is registered.
+     */
+    public function initialize(): void
+    {
+        if (YamlConfigurationService::hasFile()) {
+            YamlConfigurationService::boot();
+        }
+    }
+
+    public function register(): void
+    {
+        //
+    }
+
+    public function boot(): void
+    {
+        //
+    }
+}
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -7,9 +7,9 @@
 use Hyde\Console\HydeConsoleServiceProvider;
 use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Foundation\Providers\ConfigurationServiceProvider;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Hyde\Framework\Services\AssetService;
-use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
 use Hyde\Hyde;
 use Hyde\Markdown\MarkdownConverter;
@@ -112,9 +112,8 @@ public function boot(): void
 
     protected function initializeConfiguration(): void
     {
-        if (YamlConfigurationService::hasFile()) {
-            YamlConfigurationService::boot();
-        }
+        $this->app->register(ConfigurationServiceProvider::class);
+        $this->getConfigurationProvider()->initialize();
     }
 
     /**
@@ -152,4 +151,9 @@ protected function registerModuleServiceProviders(): void
     {
         $this->app->register(HydeConsoleServiceProvider::class);
     }
+
+    protected function getConfigurationProvider(): ServiceProvider|ConfigurationServiceProvider
+    {
+        return $this->app->getProvider(ConfigurationServiceProvider::class);
+    }
 }
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -33,6 +33,7 @@
 /**
  * @covers \Hyde\Framework\HydeServiceProvider
  * @covers \Hyde\Framework\Concerns\RegistersFileLocations
+ * @covers \Hyde\Foundation\Providers\ConfigurationServiceProvider
  */
 class HydeServiceProviderTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`use Hyde\Console\HydeConsoleServiceProvider;`
`8`	`8`	`use Hyde\Facades\Features;`
`9`	`9`	`use Hyde\Foundation\HydeKernel;`
	`10`	`+use Hyde\Foundation\Providers\ConfigurationServiceProvider;`
`10`	`11`	`use Hyde\Framework\Concerns\RegistersFileLocations;`
`11`	`12`	`use Hyde\Framework\Services\AssetService;`
`12`		`-use Hyde\Framework\Services\YamlConfigurationService;`
`13`	`13`	`use Hyde\Framework\Views\Components\LinkComponent;`
`14`	`14`	`use Hyde\Hyde;`
`15`	`15`	`use Hyde\Markdown\MarkdownConverter;`
`@@ -112,9 +112,8 @@ public function boot(): void`
`112`	`112`
`113`	`113`	`protected function initializeConfiguration(): void`
`114`	`114`	`{`
`115`		`- if (YamlConfigurationService::hasFile()) {`
`116`		`- YamlConfigurationService::boot();`
`117`		`- }`
	`115`	`+ $this->app->register(ConfigurationServiceProvider::class);`
	`116`	`+ $this->getConfigurationProvider()->initialize();`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`/**`
`@@ -152,4 +151,9 @@ protected function registerModuleServiceProviders(): void`
`152`	`151`	`{`
`153`	`152`	`$this->app->register(HydeConsoleServiceProvider::class);`
`154`	`153`	`}`
	`154`	`+`
	`155`	`+ protected function getConfigurationProvider(): ServiceProvider\|ConfigurationServiceProvider`
	`156`	`+ {`
	`157`	`+ return $this->app->getProvider(ConfigurationServiceProvider::class);`
	`158`	`+ }`
`155`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`/**`
`34`	`34`	`* @covers \Hyde\Framework\HydeServiceProvider`
`35`	`35`	`* @covers \Hyde\Framework\Concerns\RegistersFileLocations`
	`36`	`+ * @covers \Hyde\Foundation\Providers\ConfigurationServiceProvider`
`36`	`37`	`*/`
`37`	`38`	`class HydeServiceProviderTest extends TestCase`
`38`	`39`	`{`