From be6d082662a281b887b4317fa373f1e5b6dbf8ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 13:57:07 +0200
Subject: [PATCH 01/23] Check feature states using the feature enum

---
 .../views/components/navigation/theme-toggle-button.blade.php  | 2 +-
 packages/framework/resources/views/layouts/head.blade.php      | 2 +-
 .../framework/tests/Feature/Views/SidebarBrandViewTest.php     | 3 ++-
 packages/framework/tests/Unit/HydeHelperFacadeTest.php         | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
index 28433f21c9b..38fe3eb24fc 100644
--- a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
+++ b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
@@ -1,4 +1,4 @@
-@if(Hyde::hasFeature('darkmode'))
+@if(Hyde::hasFeature(\Hyde\Enums\Feature::Darkmode))
     <button @click="toggleTheme" {{ $attributes->merge(['class' => 'theme-toggle-button flex items-center px-2 py-1 hover:text-gray-700 dark:text-gray-200']) }} title="Toggle theme">
         <span class="sr-only">Toggle dark theme</span>
         <svg width="1.25rem" height="1.25rem" class="w-5 h-5 hidden dark:block" fill="#FFFFFF" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 20f002ebc62..5c1dc456b08 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -12,7 +12,7 @@
 {{-- App Stylesheets --}}
 @include('hyde::layouts.styles')
 
-@if(Hyde::hasFeature('darkmode'))
+@if(Hyde::hasFeature(\Hyde\Enums\Feature::Darkmode))
     {{-- Check the local storage for theme preference to avoid FOUC --}}
     <meta id="meta-color-scheme" name="color-scheme" content="{{ config('hyde.default_color_scheme', 'light') }}">
     <script>if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) { document.documentElement.classList.add('dark'); document.getElementById('meta-color-scheme').setAttribute('content', 'dark');} else { document.documentElement.classList.remove('dark') } </script>
diff --git a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
index 03670822588..48968444f07 100644
--- a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature\Views;
 
 use Hyde\Hyde;
+use Hyde\Enums\Feature;
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Testing\TestsBladeViews;
@@ -60,7 +61,7 @@ public function testSidebarBrandViewWithDefaultHeaderTextAndHomeRoute()
     public function testSidebarBrandViewWithoutDarkmodeFeature()
     {
         $mock = $this->mock(HydeKernel::class)->makePartial();
-        $mock->shouldReceive('hasFeature')->with('darkmode')->andReturn(false);
+        $mock->shouldReceive('hasFeature')->with(Feature::Darkmode)->andReturn(false);
         HydeKernel::setInstance($mock);
 
         $view = $this->view(view('hyde::components.docs.sidebar-brand'));
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeTest.php b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
index d4780b1f412..d6a3aef3a23 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Enums\Feature;
 use Hyde\Facades\Features;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -31,7 +32,7 @@ public function testFeaturesFacadeCanBeUsedToCallStaticMethodsOnFeaturesClass()
     public function testHydeHasFeatureShorthandCallsStaticMethodOnFeaturesClass()
     {
         $this->assertTrue(
-            Hyde::hasFeature('markdown-posts')
+            Hyde::hasFeature(Feature::MarkdownPosts)
         );
     }
 }

From 3ad20db1a17ea9144d6d8dd6da5d4bcfb50b24e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 14:28:51 +0200
Subject: [PATCH 02/23] Register the feature enum as a class alias

---
 app/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/config.php b/app/config.php
index 9af0e0cdf05..79c7e5e871a 100644
--- a/app/config.php
+++ b/app/config.php
@@ -104,6 +104,7 @@
         'DocumentationPage' => \Hyde\Pages\DocumentationPage::class,
         'DataCollections' => \Hyde\Support\DataCollections::class,
         'Includes' => \Hyde\Support\Includes::class,
+        'Feature' => \Hyde\Enums\Feature::class,
     ],
 
 ];

From 59907ad724326d4aad697600672fd94f0ac87669 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 14:35:32 +0200
Subject: [PATCH 03/23] Use aliased enum class

---
 .../views/components/navigation/theme-toggle-button.blade.php   | 2 +-
 packages/framework/resources/views/layouts/head.blade.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
index 38fe3eb24fc..0c97fd9878d 100644
--- a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
+++ b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
@@ -1,4 +1,4 @@
-@if(Hyde::hasFeature(\Hyde\Enums\Feature::Darkmode))
+@if(Hyde::hasFeature(Feature::Darkmode))
     <button @click="toggleTheme" {{ $attributes->merge(['class' => 'theme-toggle-button flex items-center px-2 py-1 hover:text-gray-700 dark:text-gray-200']) }} title="Toggle theme">
         <span class="sr-only">Toggle dark theme</span>
         <svg width="1.25rem" height="1.25rem" class="w-5 h-5 hidden dark:block" fill="#FFFFFF" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 5c1dc456b08..0bc02207ee8 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -12,7 +12,7 @@
 {{-- App Stylesheets --}}
 @include('hyde::layouts.styles')
 
-@if(Hyde::hasFeature(\Hyde\Enums\Feature::Darkmode))
+@if(Hyde::hasFeature(Feature::Darkmode))
     {{-- Check the local storage for theme preference to avoid FOUC --}}
     <meta id="meta-color-scheme" name="color-scheme" content="{{ config('hyde.default_color_scheme', 'light') }}">
     <script>if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) { document.documentElement.classList.add('dark'); document.getElementById('meta-color-scheme').setAttribute('content', 'dark');} else { document.documentElement.classList.remove('dark') } </script>

From 5a747ada16c45d886bca52212364224ba7c11244 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 16:17:34 +0200
Subject: [PATCH 04/23] Use facade method shorthand

---
 .../views/components/navigation/theme-toggle-button.blade.php   | 2 +-
 packages/framework/resources/views/layouts/head.blade.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
index 0c97fd9878d..d5732f996ad 100644
--- a/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
+++ b/packages/framework/resources/views/components/navigation/theme-toggle-button.blade.php
@@ -1,4 +1,4 @@
-@if(Hyde::hasFeature(Feature::Darkmode))
+@if(Features::hasDarkmode()))
     <button @click="toggleTheme" {{ $attributes->merge(['class' => 'theme-toggle-button flex items-center px-2 py-1 hover:text-gray-700 dark:text-gray-200']) }} title="Toggle theme">
         <span class="sr-only">Toggle dark theme</span>
         <svg width="1.25rem" height="1.25rem" class="w-5 h-5 hidden dark:block" fill="#FFFFFF" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
diff --git a/packages/framework/resources/views/layouts/head.blade.php b/packages/framework/resources/views/layouts/head.blade.php
index 0bc02207ee8..4b3a8d5d515 100644
--- a/packages/framework/resources/views/layouts/head.blade.php
+++ b/packages/framework/resources/views/layouts/head.blade.php
@@ -12,7 +12,7 @@
 {{-- App Stylesheets --}}
 @include('hyde::layouts.styles')
 
-@if(Hyde::hasFeature(Feature::Darkmode))
+@if(Features::hasDarkmode()))
     {{-- Check the local storage for theme preference to avoid FOUC --}}
     <meta id="meta-color-scheme" name="color-scheme" content="{{ config('hyde.default_color_scheme', 'light') }}">
     <script>if (localStorage.getItem('color-theme') === 'dark' || (!('color-theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) { document.documentElement.classList.add('dark'); document.getElementById('meta-color-scheme').setAttribute('content', 'dark');} else { document.documentElement.classList.remove('dark') } </script>

From 085cc1df9ff4429e588c3ca865862e4b00d698c7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 16:25:08 +0200
Subject: [PATCH 05/23] Use proper helper to mock feature state instead of
 mocking kernel

---
 .../framework/tests/Feature/Views/SidebarBrandViewTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
index 48968444f07..331f285e517 100644
--- a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
@@ -5,9 +5,8 @@
 namespace Hyde\Framework\Testing\Feature\Views;
 
 use Hyde\Hyde;
-use Hyde\Enums\Feature;
+use Hyde\Facades\Features;
 use Hyde\Testing\TestCase;
-use Hyde\Foundation\HydeKernel;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Pages\DocumentationPage;
 
@@ -60,9 +59,7 @@ public function testSidebarBrandViewWithDefaultHeaderTextAndHomeRoute()
 
     public function testSidebarBrandViewWithoutDarkmodeFeature()
     {
-        $mock = $this->mock(HydeKernel::class)->makePartial();
-        $mock->shouldReceive('hasFeature')->with(Feature::Darkmode)->andReturn(false);
-        HydeKernel::setInstance($mock);
+        Features::mock('darkmode', false);
 
         $view = $this->view(view('hyde::components.docs.sidebar-brand'));
 

From a930cfa8e1435739b2b7a4eae5924069f5d138a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 17:45:27 +0200
Subject: [PATCH 06/23] Trigger a deprecation when passing a string to feature
 state helper

---
 packages/framework/src/Foundation/HydeKernel.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index f880c5f98ce..2ac96221005 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -15,6 +15,8 @@
 use Hyde\Support\Concerns\Serializable;
 use Illuminate\Support\Traits\Macroable;
 
+use function trigger_deprecation;
+
 /**
  * Encapsulates a HydePHP project, providing helpful methods for interacting with it.
  *
@@ -92,6 +94,10 @@ public function features(): Features
 
     public function hasFeature(Feature|string $feature): bool
     {
+        if (is_string($feature)) {
+            trigger_deprecation('hydephp/hyde', '1.5.0', 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.');
+        }
+
         return Features::enabled(is_string($feature) ? Feature::from($feature) : $feature);
     }
 

From 990fb8615f5c548de79ece2ced24b39a024906a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 17:56:57 +0200
Subject: [PATCH 07/23] Report a build warning when triggering the deprecation

---
 .../framework/src/Foundation/HydeKernel.php    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 2ac96221005..cbfdb8b6fd8 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -6,6 +6,7 @@
 
 use Hyde\Enums\Feature;
 use Hyde\Facades\Features;
+use Hyde\Support\BuildWarnings;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Foundation\Kernel\FileCollection;
@@ -15,6 +16,12 @@
 use Hyde\Support\Concerns\Serializable;
 use Illuminate\Support\Traits\Macroable;
 
+use function str;
+use function getcwd;
+use function sprintf;
+use function is_string;
+use function var_export;
+use function debug_backtrace;
 use function trigger_deprecation;
 
 /**
@@ -95,7 +102,16 @@ public function features(): Features
     public function hasFeature(Feature|string $feature): bool
     {
         if (is_string($feature)) {
-            trigger_deprecation('hydephp/hyde', '1.5.0', 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.');
+            $message = 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.';
+            trigger_deprecation('hydephp/hyde', '1.5.0', $message);
+
+            BuildWarnings::report(sprintf("%s\n    <fg=gray>Replace </><fg=default>`%s`</><fg=gray> with </><fg=default>`%s`</><fg=gray> \n    in file %s:%s</>",
+                $message,
+                'HydeKernel::hasFeature('.var_export($feature, true).')',
+                'HydeKernel::hasFeature(Feature::'.str($feature)->camel()->ucfirst()->toString().')',
+                debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['file'],
+                debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
+            ));
         }
 
         return Features::enabled(is_string($feature) ? Feature::from($feature) : $feature);

From 21822b2bbe77c852c3c78e12c20df8b3cacfac6c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 17:59:14 +0200
Subject: [PATCH 08/23] Codecoverage ignore deprecated block

---
 packages/framework/src/Foundation/HydeKernel.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index cbfdb8b6fd8..0aab07a4427 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -102,6 +102,8 @@ public function features(): Features
     public function hasFeature(Feature|string $feature): bool
     {
         if (is_string($feature)) {
+            // @codeCoverageIgnoreStart
+
             $message = 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.';
             trigger_deprecation('hydephp/hyde', '1.5.0', $message);
 
@@ -112,6 +114,8 @@ public function hasFeature(Feature|string $feature): bool
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['file'],
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));
+
+            // @codeCoverageIgnoreEnd
         }
 
         return Features::enabled(is_string($feature) ? Feature::from($feature) : $feature);

From 3e7e127211c45050a469b0448b136fed8e973a2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 18:00:22 +0200
Subject: [PATCH 09/23] Link to associated pull request

---
 packages/framework/src/Foundation/HydeKernel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 0aab07a4427..8ad2ea2b2fe 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -102,6 +102,8 @@ public function features(): Features
     public function hasFeature(Feature|string $feature): bool
     {
         if (is_string($feature)) {
+            /** @see https://github.com/hydephp/develop/pull/1650 */
+
             // @codeCoverageIgnoreStart
 
             $message = 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.';

From e6ece92cfb83e9dc3485a2d385f0c6b01329e948 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 18:01:03 +0200
Subject: [PATCH 10/23] Cleanup string assembly

---
 packages/framework/src/Foundation/HydeKernel.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 8ad2ea2b2fe..fbbab3c0503 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -109,10 +109,9 @@ public function hasFeature(Feature|string $feature): bool
             $message = 'Passing a string to HydeKernel::hasFeature() is deprecated. Use a Feature enum case instead.';
             trigger_deprecation('hydephp/hyde', '1.5.0', $message);
 
-            BuildWarnings::report(sprintf("%s\n    <fg=gray>Replace </><fg=default>`%s`</><fg=gray> with </><fg=default>`%s`</><fg=gray> \n    in file %s:%s</>",
-                $message,
-                'HydeKernel::hasFeature('.var_export($feature, true).')',
-                'HydeKernel::hasFeature(Feature::'.str($feature)->camel()->ucfirst()->toString().')',
+            BuildWarnings::report(sprintf("$message\n    <fg=gray>Replace </><fg=default>`%s`</><fg=gray> with </><fg=default>`%s`</><fg=gray> \n    in file %s:%s</>",
+                sprintf('HydeKernel::hasFeature(%s)', var_export($feature, true)),
+                sprintf('HydeKernel::hasFeature(Feature::%s)', str($feature)->camel()->ucfirst()->toString()),
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['file'],
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));

From 321f8cc8c7dfe2e352f9468f6f83f12163ffb5b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 18:45:01 +0200
Subject: [PATCH 11/23] Remove deprecated string type from method annotation

---
 packages/framework/src/Hyde.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index c41b4d1415d..a526cb0dd9d 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -59,7 +59,7 @@
  * @method static HydeKernel getInstance()
  * @method static Filesystem filesystem()
  * @method static array getRegisteredExtensions()
- * @method static bool hasFeature(Feature|string $feature)
+ * @method static bool hasFeature(Feature $feature)
  * @method static bool hasSiteUrl()
  * @method static void setInstance(HydeKernel $instance)
  * @method static void setBasePath(string $basePath)

From f1c79e05d499adfaab1f71e605c919d6542614fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 18:48:26 +0200
Subject: [PATCH 12/23] Extract ternary path into if block

---
 packages/framework/src/Foundation/HydeKernel.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index fbbab3c0503..dd292ecdeb7 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -116,10 +116,12 @@ public function hasFeature(Feature|string $feature): bool
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));
 
+            $feature = Feature::from($feature);
+
             // @codeCoverageIgnoreEnd
         }
 
-        return Features::enabled(is_string($feature) ? Feature::from($feature) : $feature);
+        return Features::enabled($feature);
     }
 
     /** @inheritDoc */

From b7ae50356310467096696d0cc22199ebfc4b314b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 18:50:55 +0200
Subject: [PATCH 13/23] Create deprecated method to ease refactors

---
 packages/framework/src/Enums/Feature.php         | 15 +++++++++++++++
 packages/framework/src/Foundation/HydeKernel.php |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 073ef90f2f8..063297ad1c8 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -24,4 +24,19 @@ enum Feature: string
 
     // Integrations
     case Torchlight = 'torchlight';
+
+    /** @deprecated This method will be removed in HydePHP v2.0 */
+    public static function match(string $name): self
+    {
+        return match ($name) {
+            'html-pages' => self::HtmlPages,
+            'markdown-posts' => self::MarkdownPosts,
+            'blade-pages' => self::BladePages,
+            'markdown-pages' => self::MarkdownPages,
+            'documentation-pages' => self::DocumentationPages,
+            'darkmode' => self::Darkmode,
+            'documentation-search' => self::DocumentationSearch,
+            'torchlight' => self::Torchlight,
+        };
+    }
 }
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index dd292ecdeb7..5e28d6b3f52 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -116,7 +116,7 @@ public function hasFeature(Feature|string $feature): bool
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));
 
-            $feature = Feature::from($feature);
+            $feature = Feature::match($feature);
 
             // @codeCoverageIgnoreEnd
         }

From 4dfba164d7002e08b5e9aa06fcb88d65caecbf14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 19:01:23 +0200
Subject: [PATCH 14/23] Use the proper pascal case helper

---
 packages/framework/src/Foundation/HydeKernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 5e28d6b3f52..2d7df4ed2aa 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -15,8 +15,8 @@
 use Hyde\Support\Contracts\SerializableContract;
 use Hyde\Support\Concerns\Serializable;
 use Illuminate\Support\Traits\Macroable;
+use Illuminate\Support\Str;
 
-use function str;
 use function getcwd;
 use function sprintf;
 use function is_string;
@@ -111,7 +111,7 @@ public function hasFeature(Feature|string $feature): bool
 
             BuildWarnings::report(sprintf("$message\n    <fg=gray>Replace </><fg=default>`%s`</><fg=gray> with </><fg=default>`%s`</><fg=gray> \n    in file %s:%s</>",
                 sprintf('HydeKernel::hasFeature(%s)', var_export($feature, true)),
-                sprintf('HydeKernel::hasFeature(Feature::%s)', str($feature)->camel()->ucfirst()->toString()),
+                sprintf('HydeKernel::hasFeature(Feature::%s)', Str::studly($feature)),
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['file'],
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));

From 56c0b9480730762a8e08795a3507727704616200 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 19:04:06 +0200
Subject: [PATCH 15/23] Mock features using the enum names

---
 packages/framework/src/Facades/Features.php                | 2 +-
 .../src/Framework/Concerns/Internal/MockableFeatures.php   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 034108e5203..c16703d302d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,7 +43,7 @@ class Features implements SerializableContract
      */
     public static function enabled(Feature $feature): bool
     {
-        return static::resolveMockedInstance($feature->value) ?? in_array(
+        return static::resolveMockedInstance($feature->name) ?? in_array(
             $feature, Config::getArray('hyde.features', static::getDefaultOptions())
         );
     }
diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 13269050a4e..008a9e1ddf4 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Concerns\Internal;
 
 use Hyde\Enums\Feature;
+use Illuminate\Support\Str;
 
 use function is_array;
 
@@ -29,16 +30,16 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
             return;
         }
 
-        static::$mockedInstances[$feature] = $enabled;
+        static::$mockedInstances[Str::studly($feature)] = $enabled;
     }
 
     public static function resolveMockedInstance(Feature|string $feature): ?bool
     {
         if ($feature instanceof Feature) {
-            $feature = $feature->value;
+            $feature = $feature->name;
         }
 
-        return static::$mockedInstances[$feature] ?? null;
+        return static::$mockedInstances[Str::studly($feature)] ?? null;
     }
 
     public static function clearMockedInstances(): void

From 3ae0e24ddb89d13932af23450c44a33882328d27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:17:04 +0200
Subject: [PATCH 16/23] Simplify internal feature mocking to remove array
 support

We don't use this anywhere but a test, so no reason to have it. It also lets us remove the null type.
---
 .../Framework/Concerns/Internal/MockableFeatures.php | 12 +-----------
 .../tests/Feature/ConfigurableFeaturesTest.php       | 12 ++++--------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 008a9e1ddf4..0fb40d28f88 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -7,8 +7,6 @@
 use Hyde\Enums\Feature;
 use Illuminate\Support\Str;
 
-use function is_array;
-
 /**
  * Allows the Features class to be mocked.
  *
@@ -20,16 +18,8 @@ trait MockableFeatures
 {
     protected static array $mockedInstances = [];
 
-    public static function mock(string|array $feature, ?bool $enabled = null): void
+    public static function mock(string $feature, bool $enabled): void
     {
-        if (is_array($feature)) {
-            foreach ($feature as $key => $value) {
-                static::mock($key, $value);
-            }
-
-            return;
-        }
-
         static::$mockedInstances[Str::studly($feature)] = $enabled;
     }
 
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index a7ce65f0e84..d00e4ab79ed 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -106,18 +106,14 @@ public function testDynamicFeaturesCanBeMocked()
 
     public function testMultipleFeaturesCanBeMocked()
     {
-        Features::mock([
-            'rss' => true,
-            'darkmode' => true,
-        ]);
+        Features::mock('rss', true);
+        Features::mock('darkmode', true);
 
         $this->assertTrue(Features::rss());
         $this->assertTrue(Features::hasDarkmode());
 
-        Features::mock([
-            'rss' => false,
-            'darkmode' => false,
-        ]);
+        Features::mock('rss', false);
+        Features::mock('darkmode', false);
 
         $this->assertFalse(Features::rss());
         $this->assertFalse(Features::hasDarkmode());

From 83294005aaa4a7badfd56843807ef3a9e3f38164 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:31:34 +0200
Subject: [PATCH 17/23] Simplify method call

---
 packages/framework/src/Facades/Features.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index c16703d302d..bbb8d7326f6 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,7 +43,7 @@ class Features implements SerializableContract
      */
     public static function enabled(Feature $feature): bool
     {
-        return static::resolveMockedInstance($feature->name) ?? in_array(
+        return static::resolveMockedInstance($feature) ?? in_array(
             $feature, Config::getArray('hyde.features', static::getDefaultOptions())
         );
     }

From e30c3376a4e5e31e2a62c0f65674f74b3641067b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:32:44 +0200
Subject: [PATCH 18/23] Revert "Simplify method call"

This reverts commit 83294005aaa4a7badfd56843807ef3a9e3f38164.
---
 packages/framework/src/Facades/Features.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index bbb8d7326f6..c16703d302d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,7 +43,7 @@ class Features implements SerializableContract
      */
     public static function enabled(Feature $feature): bool
     {
-        return static::resolveMockedInstance($feature) ?? in_array(
+        return static::resolveMockedInstance($feature->name) ?? in_array(
             $feature, Config::getArray('hyde.features', static::getDefaultOptions())
         );
     }

From 88e98669be1b72a65ef4a07e2dfcb25eedc78c55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:32:58 +0200
Subject: [PATCH 19/23] Simplify method logic

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 0fb40d28f88..b00bcc53205 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
-use Hyde\Enums\Feature;
 use Illuminate\Support\Str;
 
 /**
@@ -23,12 +22,8 @@ public static function mock(string $feature, bool $enabled): void
         static::$mockedInstances[Str::studly($feature)] = $enabled;
     }
 
-    public static function resolveMockedInstance(Feature|string $feature): ?bool
+    public static function resolveMockedInstance(string $feature): ?bool
     {
-        if ($feature instanceof Feature) {
-            $feature = $feature->name;
-        }
-
         return static::$mockedInstances[Str::studly($feature)] ?? null;
     }
 

From df37cce2eac49a59f5ce9d319f8bfe2fa079834f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:40:48 +0200
Subject: [PATCH 20/23] Use camel case instead of kebab case to match current
 conventions

Update features toArray representation to use camelCase instead of kebab-case to match other arrayable formats, like in the HydeKernel.
---
 RELEASE_NOTES.md                            | 1 +
 packages/framework/src/Facades/Features.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index efadf4218a8..d8188589b95 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,6 +17,7 @@ This serves two purposes:
 
 ### Changed
 - The `features` array in the `config/hyde.php` configuration file is now an array of `Feature` enums in https://github.com/hydephp/develop/pull/1650
+- Internal: Updated the `Features::toArray` representation to use `camelCase` instead of `kebab-case` https://github.com/hydephp/develop/pull/1652 (the class is marked as internal, thus the change is not considered breaking)
 
 ### Deprecated
 - Deprecated the static `Features` flag methods used in the configuration files in https://github.com/hydephp/develop/pull/1650 and will be removed in HydePHP v2.0
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index c16703d302d..a445b405950 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -195,7 +195,7 @@ public function toArray(): array
         return collect(get_class_methods(static::class))
             ->filter(fn (string $method): bool => str_starts_with($method, 'has'))
             ->mapWithKeys(fn (string $method): array => [
-                Str::kebab(substr($method, 3)) => static::{$method}(),
+                Str::studly(substr($method, 3)) => static::{$method}(),
             ])->toArray();
     }
 

From b1b793440fb1830958d0fede4b45c79988727987 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:40:51 +0200
Subject: [PATCH 21/23] Revert "Use camel case instead of kebab case to match
 current conventions"

This reverts commit df37cce2eac49a59f5ce9d319f8bfe2fa079834f as it may be out of scope for this PR. Consider instead enforcing a common convention in v2.
---
 RELEASE_NOTES.md                            | 1 -
 packages/framework/src/Facades/Features.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d8188589b95..efadf4218a8 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,7 +17,6 @@ This serves two purposes:
 
 ### Changed
 - The `features` array in the `config/hyde.php` configuration file is now an array of `Feature` enums in https://github.com/hydephp/develop/pull/1650
-- Internal: Updated the `Features::toArray` representation to use `camelCase` instead of `kebab-case` https://github.com/hydephp/develop/pull/1652 (the class is marked as internal, thus the change is not considered breaking)
 
 ### Deprecated
 - Deprecated the static `Features` flag methods used in the configuration files in https://github.com/hydephp/develop/pull/1650 and will be removed in HydePHP v2.0
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index a445b405950..c16703d302d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -195,7 +195,7 @@ public function toArray(): array
         return collect(get_class_methods(static::class))
             ->filter(fn (string $method): bool => str_starts_with($method, 'has'))
             ->mapWithKeys(fn (string $method): array => [
-                Str::studly(substr($method, 3)) => static::{$method}(),
+                Str::kebab(substr($method, 3)) => static::{$method}(),
             ])->toArray();
     }
 

From 2a574082e9eced3246e578272079c9b0bb9f026c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:42:08 +0200
Subject: [PATCH 22/23] Remove string backing from feature enum

This does not add any new information
---
 packages/framework/src/Enums/Feature.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 063297ad1c8..05c11463124 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -9,21 +9,21 @@
  *
  * @see \Hyde\Facades\Features
  */
-enum Feature: string
+enum Feature
 {
     // Page Modules
-    case HtmlPages = 'html-pages';
-    case MarkdownPosts = 'markdown-posts';
-    case BladePages = 'blade-pages';
-    case MarkdownPages = 'markdown-pages';
-    case DocumentationPages = 'documentation-pages';
+    case HtmlPages;
+    case MarkdownPosts;
+    case BladePages;
+    case MarkdownPages;
+    case DocumentationPages;
 
     // Frontend Features
-    case Darkmode = 'darkmode';
-    case DocumentationSearch = 'documentation-search';
+    case Darkmode;
+    case DocumentationSearch;
 
     // Integrations
-    case Torchlight = 'torchlight';
+    case Torchlight;
 
     /** @deprecated This method will be removed in HydePHP v2.0 */
     public static function match(string $name): self

From d17713a508b3b90f47a495a865b96853e1f3b72b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Apr 2024 11:46:18 +0200
Subject: [PATCH 23/23] Inline temporary deprecated method

---
 packages/framework/src/Enums/Feature.php         | 15 ---------------
 packages/framework/src/Foundation/HydeKernel.php | 11 ++++++++++-
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 05c11463124..85694270e0c 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -24,19 +24,4 @@ enum Feature
 
     // Integrations
     case Torchlight;
-
-    /** @deprecated This method will be removed in HydePHP v2.0 */
-    public static function match(string $name): self
-    {
-        return match ($name) {
-            'html-pages' => self::HtmlPages,
-            'markdown-posts' => self::MarkdownPosts,
-            'blade-pages' => self::BladePages,
-            'markdown-pages' => self::MarkdownPages,
-            'documentation-pages' => self::DocumentationPages,
-            'darkmode' => self::Darkmode,
-            'documentation-search' => self::DocumentationSearch,
-            'torchlight' => self::Torchlight,
-        };
-    }
 }
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 2d7df4ed2aa..466a065bb85 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -116,7 +116,16 @@ public function hasFeature(Feature|string $feature): bool
                 debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1]['line']
             ));
 
-            $feature = Feature::match($feature);
+            $feature = match ($feature) {
+                'html-pages' => Feature::HtmlPages,
+                'markdown-posts' => Feature::MarkdownPosts,
+                'blade-pages' => Feature::BladePages,
+                'markdown-pages' => Feature::MarkdownPages,
+                'documentation-pages' => Feature::DocumentationPages,
+                'darkmode' => Feature::Darkmode,
+                'documentation-search' => Feature::DocumentationSearch,
+                'torchlight' => Feature::Torchlight,
+            };
 
             // @codeCoverageIgnoreEnd
         }