Replace deprecated method usages with feature enum cases

hydephp · Apr 9, 2024 · 99e503c · 99e503c
1 parent 2df16f7
commit 99e503c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 44 deletions.
diff --git a/config/hyde.php b/config/hyde.php
@@ -23,7 +23,7 @@
 */
 
 use Hyde\Facades\Author;
-use Hyde\Facades\Features;
+use Hyde\Enums\Feature;
 use Hyde\Facades\Meta;
 
 return [
@@ -254,18 +254,18 @@
 
     'features' => [
         // Page Modules
-        Features::htmlPages(),
-        Features::markdownPosts(),
-        Features::bladePages(),
-        Features::markdownPages(),
-        Features::documentationPages(),
+        Feature::HtmlPages,
+        Feature::MarkdownPosts,
+        Feature::BladePages,
+        Feature::MarkdownPages,
+        Feature::DocumentationPages,
 
         // Frontend Features
-        Features::darkmode(),
-        Features::documentationSearch(),
+        Feature::Darkmode,
+        Feature::DocumentationSearch,
 
         // Integrations
-        Features::torchlight(),
+        Feature::Torchlight,
     ],
 
     /*

diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
@@ -23,7 +23,7 @@
 */
 
 use Hyde\Facades\Author;
-use Hyde\Facades\Features;
+use Hyde\Enums\Feature;
 use Hyde\Facades\Meta;
 
 return [
@@ -254,18 +254,18 @@
 
     'features' => [
         // Page Modules
-        Features::htmlPages(),
-        Features::markdownPosts(),
-        Features::bladePages(),
-        Features::markdownPages(),
-        Features::documentationPages(),
+        Feature::HtmlPages,
+        Feature::MarkdownPosts,
+        Feature::BladePages,
+        Feature::MarkdownPages,
+        Feature::DocumentationPages,
 
         // Frontend Features
-        Features::darkmode(),
-        Features::documentationSearch(),
+        Feature::Darkmode,
+        Feature::DocumentationSearch,
 
         // Integrations
-        Features::torchlight(),
+        Feature::Torchlight,
     ],
 
     /*

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
@@ -54,39 +54,39 @@ public static function enabled(Feature $feature): bool
 
     public static function hasHtmlPages(): bool
     {
-        return static::enabled(static::htmlPages());
+        return static::enabled(Feature::HtmlPages);
     }
 
     public static function hasBladePages(): bool
     {
-        return static::enabled(static::bladePages());
+        return static::enabled(Feature::BladePages);
     }
 
     public static function hasMarkdownPages(): bool
     {
-        return static::enabled(static::markdownPages());
+        return static::enabled(Feature::MarkdownPages);
     }
 
     public static function hasMarkdownPosts(): bool
     {
-        return static::enabled(static::markdownPosts());
+        return static::enabled(Feature::MarkdownPosts);
     }
 
     public static function hasDocumentationPages(): bool
     {
-        return static::enabled(static::documentationPages());
+        return static::enabled(Feature::DocumentationPages);
     }
 
     public static function hasDocumentationSearch(): bool
     {
-        return static::enabled(static::documentationSearch())
+        return static::enabled(Feature::DocumentationSearch)
             && static::hasDocumentationPages()
             && count(DocumentationPage::files()) > 0;
     }
 
     public static function hasDarkmode(): bool
     {
-        return static::enabled(static::darkmode());
+        return static::enabled(Feature::Darkmode);
     }
 
     /**
@@ -95,7 +95,7 @@ public static function hasDarkmode(): bool
      */
     public static function hasTorchlight(): bool
     {
-        return static::enabled(static::torchlight())
+        return static::enabled(Feature::Torchlight)
             && (Config::getNullableString('torchlight.token') !== null)
             && (app('env') !== 'testing');
     }
@@ -203,18 +203,18 @@ protected static function getDefaultOptions(): array
     {
         return [
             // Page Modules
-            static::htmlPages(),
-            static::markdownPosts(),
-            static::bladePages(),
-            static::markdownPages(),
-            static::documentationPages(),
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
+            Feature::MarkdownPages,
+            Feature::DocumentationPages,
 
             // Frontend Features
-            static::darkmode(),
-            static::documentationSearch(),
+            Feature::Darkmode,
+            Feature::DocumentationSearch,
 
             // Integrations
-            static::torchlight(),
+            Feature::Torchlight,
         ];
     }
 }
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Hyde;
+use Hyde\Enums\Feature;
 use Hyde\Facades\Config;
 use Hyde\Facades\Features;
 use Hyde\Pages\BladePage;
@@ -121,7 +122,7 @@ public function check_site_has_a_base_url_set(Result $result): Result
 
     public function check_a_torchlight_api_token_is_set(Result $result): Result
     {
-        if (! Features::enabled(Features::torchlight())) {
+        if (! Features::enabled(Feature::Torchlight)) {
             return $result->skip('Check a Torchlight API token is set')
                 ->withTip('Torchlight is an API for code syntax highlighting. You can enable it in the Hyde config.');
         }

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Enums\Feature;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
@@ -30,7 +31,7 @@ public function testHasDarkmode()
         $this->assertFalse(Features::hasDarkmode());
 
         Config::set('hyde.features', [
-            Features::darkmode(),
+            Feature::Darkmode,
         ]);
 
         $this->assertTrue(Features::hasDarkmode());
@@ -39,9 +40,9 @@ public function testHasDarkmode()
     public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     {
         Config::set('hyde.features', [
-            Features::markdownPages(),
-            Features::bladePages(),
-            Features::darkmode(),
+            Feature::MarkdownPages,
+            Feature::BladePages,
+            Feature::Darkmode,
         ]);
 
         $view = view('hyde::layouts/page')->with([
@@ -57,8 +58,8 @@ public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
     {
         Config::set('hyde.features', [
-            Features::documentationPages(),
-            Features::darkmode(),
+            Feature::DocumentationPages,
+            Feature::Darkmode,
         ]);
 
         view()->share('page', new DocumentationPage());
@@ -76,8 +77,8 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
         Config::set('hyde.features', [
-            Features::markdownPages(),
-            Features::bladePages(),
+            Feature::MarkdownPages,
+            Feature::BladePages,
         ]);
 
         $view = view('hyde::layouts/page')->with([
@@ -93,7 +94,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     public function testDarkModeThemeButtonIsHiddenInDocumentationPagesWhenDisabled()
     {
         Config::set('hyde.features', [
-            Features::documentationPages(),
+            Feature::DocumentationPages,
         ]);
 
         view()->share('page', new DocumentationPage());