Merge pull request #953 from hydephp/cleanup-HydeServiceProvider-class-internals

emmadesilva · web-flow · commit 19290e9ddd42 · 2023-02-09T19:56:53.000+01:00
Cleanup HydeServiceProvider class internals
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -11,7 +11,6 @@
 use Hyde\Foundation\Providers\ViewServiceProvider;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Hyde\Framework\Services\AssetService;
-use Hyde\Hyde;
 use Hyde\Markdown\MarkdownConverter;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
@@ -27,20 +26,22 @@ class HydeServiceProvider extends ServiceProvider
 {
     use RegistersFileLocations;
 
+    protected HydeKernel $kernel;
+
     /**
      * Register any application services.
      */
     public function register(): void
     {
         $this->initializeConfiguration();
 
+        $this->kernel = HydeKernel::getInstance();
+
         $this->app->singleton(AssetService::class, AssetService::class);
 
-        $this->app->singleton(MarkdownConverter::class, function (): MarkdownConverter {
-            return new MarkdownConverter();
-        });
+        $this->app->singleton(MarkdownConverter::class, fn (): MarkdownConverter => new MarkdownConverter());
 
-        Hyde::setSourceRoot(config('hyde.source_root', ''));
+        $this->kernel->setSourceRoot(config('hyde.source_root', ''));
 
         $this->registerPageModels();
 
@@ -74,7 +75,7 @@ public function register(): void
      */
     public function boot(): void
     {
-        HydeKernel::getInstance()->readyToBoot();
+        $this->kernel->readyToBoot();
     }
 
     protected function initializeConfiguration(): void
@@ -90,23 +91,23 @@ protected function registerPageModels(): void
         // TODO use the hyde facade once it gets the method annotations
 
         if (Features::hasHtmlPages()) {
-            HydeKernel::getInstance()->registerPageClass(HtmlPage::class);
+            $this->kernel->registerPageClass(HtmlPage::class);
         }
 
         if (Features::hasBladePages()) {
-            HydeKernel::getInstance()->registerPageClass(BladePage::class);
+            $this->kernel->registerPageClass(BladePage::class);
         }
 
         if (Features::hasMarkdownPages()) {
-            HydeKernel::getInstance()->registerPageClass(MarkdownPage::class);
+            $this->kernel->registerPageClass(MarkdownPage::class);
         }
 
         if (Features::hasMarkdownPosts()) {
-            HydeKernel::getInstance()->registerPageClass(MarkdownPost::class);
+            $this->kernel->registerPageClass(MarkdownPost::class);
         }
 
         if (Features::hasDocumentationPages()) {
-            HydeKernel::getInstance()->registerPageClass(DocumentationPage::class);
+            $this->kernel->registerPageClass(DocumentationPage::class);
         }
     }
 
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -25,6 +25,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use Hyde\Markdown\MarkdownConverter;
 use Illuminate\Support\Facades\Artisan;
 use function is_subclass_of;
 use function method_exists;
@@ -74,7 +75,12 @@ public function test_provider_registers_asset_service_contract()
     {
         $this->assertTrue($this->app->bound(AssetService::class));
         $this->assertInstanceOf(AssetService::class, $this->app->make(AssetService::class));
-        $this->assertInstanceOf(AssetService::class, $this->app->make(AssetService::class));
+    }
+
+    public function test_provider_registers_markdown_converter_singleton()
+    {
+        $this->assertTrue($this->app->bound(MarkdownConverter::class));
+        $this->assertInstanceOf(MarkdownConverter::class, $this->app->make(MarkdownConverter::class));
     }
 
     public function test_provider_registers_source_directories()
