From d52c9966bcf67d985c77752cbec8b4872f1b31cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 15:50:10 +0100
Subject: [PATCH 0001/2811] [2.x] Set up HydePHP v2

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0624889cb02..1fd59536328 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-## [Unreleased] - YYYY-MM-DD
+## [v2-dev] - YYYY-MM-DD
 
 ### About
 

From cd0b22753dd991e1a6853355b1cfb682d8abdc25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:01:53 +0100
Subject: [PATCH 0002/2811] Reset release notes

---
 RELEASE_NOTES.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1fd59536328..3f1a32d1613 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,10 +10,10 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
-- Added info banners when dashboard content sections are empty in https://github.com/hydephp/develop/pull/1494
+- for new features.
 
 ### Changed
-- Shortened the path printed to console when using the dashboard to create a page in https://github.com/hydephp/develop/pull/1492
+- for changes in existing functionality.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -22,8 +22,7 @@ This serves two purposes:
 - for now removed features.
 
 ### Fixed
-- Improved support for running HydePHP through the Phar archive in https://github.com/hydephp/develop/pull/1491
-- Fixed wrong section title in the dashboard page in https://github.com/hydephp/develop/pull/1493
+- for any bug fixes.
 
 ### Security
 - in case of vulnerabilities.

From 4e3a0c2a1ea3924923b8e5c6b519647fee075130 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 15:57:53 +0100
Subject: [PATCH 0003/2811] Deprecate GenerateSearch.php

---
 RELEASE_NOTES.md                                                | 2 +-
 .../src/Framework/Actions/PostBuildTasks/GenerateSearch.php     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3f1a32d1613..9e868506daa 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -16,7 +16,7 @@ This serves two purposes:
 - for changes in existing functionality.
 
 ### Deprecated
-- for soon-to-be removed features.
+- \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
 
 ### Removed
 - for now removed features.
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
index 991190ff4b2..a2d115a6e96 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
@@ -9,6 +9,7 @@
 use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
+/** @deprecated */
 class GenerateSearch extends PostBuildTask
 {
     use InteractsWithDirectories;

From d9eec2881648aab1742a18689257daf20668d79c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:11:45 +0100
Subject: [PATCH 0004/2811] Add new internal
 `GeneratesDocumentationSearchIndex::generate` method

---
 .../Actions/GeneratesDocumentationSearchIndex.php     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 1e0948e47cf..5e5882bf234 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -39,6 +39,17 @@ public static function handle(): string
         return $service->path;
     }
 
+    /**
+     * Generate the search index return it as a string.
+     */
+    public static function generate(): string
+    {
+        $service = new static();
+        $service->run();
+
+        return $service->index->toJson();
+    }
+
     protected function __construct()
     {
         $this->index = new Collection();

From feb99e9d681f802554e38a9235f856cdc651de63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 15:59:24 +0100
Subject: [PATCH 0005/2811] Deprecate internal
 `GeneratesDocumentationSearchIndex::handle` method

---
 .../src/Framework/Actions/GeneratesDocumentationSearchIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 5e5882bf234..85e17aa1448 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -26,7 +26,7 @@ class GeneratesDocumentationSearchIndex
     protected string $path;
 
     /**
-     * Generate the search index and save it to disk.
+     * @deprecated Generate the search index and save it to disk.
      *
      * @return string The path to the generated file.
      */

From 697e016fb300334e602576084775d28fd5b81d59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:10:43 +0100
Subject: [PATCH 0006/2811] Add experimental `InMemoryPage::getOutputPath`
 overload support

---
 RELEASE_NOTES.md                              |  2 +-
 packages/framework/src/Pages/InMemoryPage.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9e868506daa..18fd270e216 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,7 +10,7 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
-- for new features.
+- Add experimental InMemoryPage::getOutputPath overload support
 
 ### Changed
 - for changes in existing functionality.
diff --git a/packages/framework/src/Pages/InMemoryPage.php b/packages/framework/src/Pages/InMemoryPage.php
index 541e9356ec9..56a429344e2 100644
--- a/packages/framework/src/Pages/InMemoryPage.php
+++ b/packages/framework/src/Pages/InMemoryPage.php
@@ -82,6 +82,16 @@ public function getBladeView(): string
         return $this->view;
     }
 
+    /** @experimental Get the path to the output file for the page. */
+    public function getOutputPath(): string
+    {
+        if ($this->hasMacro('getOutputPath')) {
+            return $this->__call('getOutputPath', []);
+        }
+
+        return parent::getOutputPath();
+    }
+
     /**
      * Get the contents that will be saved to disk for this page.
      *

From d48918410f17c4ab6ede24d254d94fb58f228912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:22:32 +0100
Subject: [PATCH 0007/2811] Add upgrade guide section

---
 RELEASE_NOTES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3f1a32d1613..f5a0bd794e1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -26,3 +26,7 @@ This serves two purposes:
 
 ### Security
 - in case of vulnerabilities.
+
+### Upgrade Guide
+
+If there are any breaking changes, include an upgrade guide here.

From 9bee9cd05ac3b1efb8eef8236b51804a5c6c5413 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:23:19 +0100
Subject: [PATCH 0008/2811] Update build task service to not call deprecated
 search generator

---
 .../framework/src/Framework/Services/BuildTaskService.php  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index a976526e214..d2eb432a015 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -11,7 +11,6 @@
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 use Hyde\Framework\Features\BuildTasks\PostBuildTask;
 use Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
@@ -136,7 +135,6 @@ private function registerFrameworkTasks(): void
         $this->registerIf(GenerateBuildManifest::class, $this->canGenerateManifest());
         $this->registerIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $this->registerIf(GenerateRssFeed::class, $this->canGenerateFeed());
-        $this->registerIf(GenerateSearch::class, $this->canGenerateSearch());
     }
 
     private function canCleanSiteDirectory(): bool
@@ -158,9 +156,4 @@ private function canGenerateFeed(): bool
     {
         return Features::rss();
     }
-
-    private function canGenerateSearch(): bool
-    {
-        return Features::hasDocumentationSearch();
-    }
 }

From c8937ad292344fc3bbb68adb9793627dbf343918 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:38:24 +0100
Subject: [PATCH 0009/2811] Update core extension to add search index as an in
 memory page

---
 .../src/Foundation/HydeCoreExtension.php        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 6c48936a370..95f1963bfad 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -8,9 +8,12 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Concerns\HydeExtension;
 use Hyde\Facades\Features;
+use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
 use function array_filter;
 use function array_keys;
@@ -28,4 +31,18 @@ public static function getPageClasses(): array
             DocumentationPage::class => Features::hasDocumentationPages(),
         ], fn (bool $value): bool => $value));
     }
+
+    public function discoverPages(PageCollection $collection): void
+    {
+        if (Features::hasDocumentationSearch()) {
+            $collection->addPage(tap(new InMemoryPage('search.json'), function (InMemoryPage $page): void {
+                $page->macro('compile', function (): string {
+                    return GeneratesDocumentationSearchIndex::generate();
+                });
+                $page->macro('getOutputPath', function (): string {
+                    return DocumentationPage::outputDirectory().'/search.json';
+                });
+            }));
+        }
+    }
 }

From 30f3ce6b809ede0b93b4007af67a6dc219eea681 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 17:00:56 +0100
Subject: [PATCH 0010/2811] Update core extension to inject search page during
 discovery

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

diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 95f1963bfad..4f1784d1b8a 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -14,6 +14,7 @@
 use Hyde\Foundation\Concerns\HydeExtension;
 use Hyde\Facades\Features;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
+use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 
 use function array_filter;
 use function array_keys;
@@ -43,6 +44,10 @@ public function discoverPages(PageCollection $collection): void
                     return DocumentationPage::outputDirectory().'/search.json';
                 });
             }));
+
+            if (DocumentationSearchPage::enabled()) {
+                $collection->addPage(new DocumentationSearchPage());
+            }
         }
     }
 }

From 733b95f5995d43c5e01c5fda97019d29b6474df5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 17:06:34 +0100
Subject: [PATCH 0011/2811] Hide dynamic search pages from navigation

---
 packages/framework/src/Foundation/HydeCoreExtension.php         | 2 +-
 .../Features/Documentation/DocumentationSearchPage.php          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 4f1784d1b8a..27c0706a93c 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -36,7 +36,7 @@ public static function getPageClasses(): array
     public function discoverPages(PageCollection $collection): void
     {
         if (Features::hasDocumentationSearch()) {
-            $collection->addPage(tap(new InMemoryPage('search.json'), function (InMemoryPage $page): void {
+            $collection->addPage(tap(new InMemoryPage('search.json', ['navigation' => ['hidden' => true]]), function (InMemoryPage $page): void {
                 $page->macro('compile', function (): string {
                     return GeneratesDocumentationSearchIndex::generate();
                 });
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 4563eb45337..f58ff0b83ca 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -36,6 +36,7 @@ public function __construct()
     {
         parent::__construct('search', [
             'title' => 'Search',
+            'navigation' => ['hidden' => true],
         ]);
     }
 

From 8bfe35ea59f0463ed0d585d77c0d74d13ac3a177 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 17:54:55 +0100
Subject: [PATCH 0012/2811] Run tests without documentation search feature

---
 .../tests/Feature/PageCollectionTest.php      | 10 +++++++++
 .../tests/Feature/RouteCollectionTest.php     |  4 ++++
 .../Unit/Pages/PageModelGetHelperTest.php     |  4 ++++
 packages/testing/src/ResetsApplication.php    | 22 +++++++++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/packages/framework/tests/Feature/PageCollectionTest.php b/packages/framework/tests/Feature/PageCollectionTest.php
index 19a961b761d..f055ae3bf24 100644
--- a/packages/framework/tests/Feature/PageCollectionTest.php
+++ b/packages/framework/tests/Feature/PageCollectionTest.php
@@ -80,6 +80,7 @@ public function test_get_page_returns_parsed_page_object_for_given_source_path()
     public function test_get_pages_returns_collection_of_pages_of_given_class()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/foo.blade.php');
         $this->file('_pages/foo.md');
@@ -103,11 +104,13 @@ public function test_get_pages_returns_collection_of_pages_of_given_class()
         $this->assertEquals(new HtmlPage('foo'), Pages::getPages(HtmlPage::class)->first());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_pages_returns_all_pages_when_not_supplied_with_class_string()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/foo.blade.php');
         $this->file('_pages/foo.md');
@@ -125,13 +128,16 @@ public function test_get_pages_returns_all_pages_when_not_supplied_with_class_st
         $this->assertEquals(new HtmlPage('foo'), $collection->get('_pages/foo.html'));
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_pages_returns_empty_collection_when_no_pages_are_discovered()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
         $this->assertEmpty(Pages::getPages());
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_pages_are_not_discovered_for_disabled_features()
@@ -155,6 +161,8 @@ public function test_pages_are_not_discovered_for_disabled_features()
 
     public function test_pages_with_custom_source_directories_are_discovered_properly()
     {
+        $this->withoutDocumentationSearch();
+
         BladePage::setSourceDirectory('.source/pages');
         MarkdownPage::setSourceDirectory('.source/pages');
         MarkdownPost::setSourceDirectory('.source/posts');
@@ -177,6 +185,8 @@ public function test_pages_with_custom_source_directories_are_discovered_properl
         $this->assertEquals(new MarkdownPage('foo'), $collection->get('.source/pages/foo.md'));
         $this->assertEquals(new MarkdownPost('foo'), $collection->get('.source/posts/foo.md'));
         $this->assertEquals(new DocumentationPage('foo'), $collection->get('.source/docs/foo.md'));
+
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_file_throws_exception_when_file_is_not_found()
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 383ef835a47..e1b8c74a0dd 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -40,6 +40,7 @@ public function test_boot_method_discovers_all_pages()
     public function test_boot_method_discovers_all_page_types()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/blade.blade.php');
         $this->file('_pages/markdown.md');
@@ -61,6 +62,7 @@ public function test_boot_method_discovers_all_page_types()
         ], $collection->all());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_routes_returns_all_routes()
@@ -77,6 +79,7 @@ public function test_get_routes_returns_all_routes()
     public function test_get_routes_for_model_returns_collection_of_routes_of_given_class()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/blade.blade.php');
         $this->file('_pages/markdown.md');
@@ -94,6 +97,7 @@ public function test_get_routes_for_model_returns_collection_of_routes_of_given_
         $this->assertEquals(new Route(new HtmlPage('html')), Routes::getRoutes(HtmlPage::class)->first());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_add_route_adds_new_route()
diff --git a/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php b/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
index fea50135306..f8727b4caed 100644
--- a/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
+++ b/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
@@ -51,6 +51,8 @@ public function test_markdown_post_get_helper_returns_markdown_post_collection()
 
     public function test_documentation_page_get_helper_returns_documentation_page_collection()
     {
+        $this->withoutDocumentationSearch();
+
         Filesystem::touch('_docs/test-page.md');
 
         $collection = DocumentationPage::all();
@@ -59,5 +61,7 @@ public function test_documentation_page_get_helper_returns_documentation_page_co
         $this->assertContainsOnlyInstancesOf(DocumentationPage::class, $collection);
 
         Filesystem::unlink('_docs/test-page.md');
+
+        $this->restoreDocumentationSearch();
     }
 }
diff --git a/packages/testing/src/ResetsApplication.php b/packages/testing/src/ResetsApplication.php
index f5db985f41f..96729828402 100644
--- a/packages/testing/src/ResetsApplication.php
+++ b/packages/testing/src/ResetsApplication.php
@@ -50,6 +50,28 @@ protected function restoreDefaultPages(): void
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
     }
 
+    /** @experimental We may want to make this a part of {@see static::withoutDefaultPages()} */
+    protected function withoutDocumentationSearch(): void
+    {
+        $features = config('hyde.features');
+
+        $flipped = array_flip($features);
+        unset($flipped['documentation-search']);
+        $features = array_flip($flipped);
+
+        config(['hyde.features' => $features]);
+    }
+
+    /** @experimental We may want to make this a part of {@see static::restoreDefaultPages()} */
+    protected function restoreDocumentationSearch(): void
+    {
+        $features = config('hyde.features');
+
+        $features[] = 'documentation-search';
+
+        config(['hyde.features' => $features]);
+    }
+
     protected static function unlinkUnlessDefault(string $filepath): void
     {
         $protected = [

From f55ad51f56a502619e95a96996157ddf9dd590d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 18:06:56 +0100
Subject: [PATCH 0013/2811] Hide the search page from sidebar generation

Could cause issues if the user wants to document their search page, maybe we tie it into the create_search_page config option? Because if they have a custom search page, they would want to disable that feature, and then this should also be disabled.
---
 .../src/Framework/Actions/GeneratesDocumentationSearchIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 85e17aa1448..368895b599d 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -59,7 +59,7 @@ protected function __construct()
     protected function run(): void
     {
         DocumentationPage::all()->each(function (DocumentationPage $page): void {
-            if (! in_array($page->identifier, Config::getArray('docs.exclude_from_search', []))) {
+            if (! in_array($page->identifier, array_merge(Config::getArray('docs.exclude_from_search', []), ['search']))) {
                 $this->index->push($this->generatePageEntry($page));
             }
         });

From ba44d871ba03516d4ea0c0a5b06ac58397f7bcb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 20:12:16 +0100
Subject: [PATCH 0014/2811] Test documentation search sitemap integration

---
 .../Feature/Services/SitemapServiceTest.php     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index e82342eb974..0c735f08819 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -67,6 +67,7 @@ public function test_generate_adds_markdown_posts_to_xml()
 
     public function test_generate_adds_documentation_pages_to_xml()
     {
+        $this->withoutDocumentationSearch();
         Filesystem::touch('_docs/foo.md');
 
         $service = new SitemapGenerator();
@@ -74,6 +75,19 @@ public function test_generate_adds_documentation_pages_to_xml()
 
         $this->assertCount(3, $service->getXmlElement()->url);
 
+        Filesystem::unlink('_docs/foo.md');
+        $this->restoreDocumentationSearch();
+    }
+
+    public function test_generate_adds_documentation_search_pages_to_xml()
+    {
+        Filesystem::touch('_docs/foo.md');
+
+        $service = new SitemapGenerator();
+        $service->generate();
+
+        $this->assertCount(5, $service->getXmlElement()->url);
+
         Filesystem::unlink('_docs/foo.md');
     }
 
@@ -131,6 +145,7 @@ public function test_all_route_types_are_discovered()
     {
         config(['hyde.url' => 'foo']);
         Filesystem::unlink(['_pages/index.blade.php', '_pages/404.blade.php']);
+        $this->withoutDocumentationSearch();
 
         $files = [
             '_pages/blade.blade.php',
@@ -157,6 +172,8 @@ public function test_all_route_types_are_discovered()
 
         copy(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'), Hyde::path('_pages/index.blade.php'));
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
+
+        $this->restoreDocumentationSearch();
     }
 
     public function testLinksFallbackToRelativeLinksWhenASiteUrlIsNotSet()

From c45a64e6aabd3a037b028da05e39593c0cf9a963 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 20:29:02 +0100
Subject: [PATCH 0015/2811] Remove blanket assertion

Was probably added as a blanket to include build task output. Can't find any info in the Git log. Since it's unclear, and removing it makes the test pass, that's exactly what I'm going to do.
---
 packages/framework/tests/Feature/StaticSiteServiceTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index c4bc8d35dbf..165a11ad07b 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -83,7 +83,6 @@ public function test_all_page_types_can_be_compiled()
             ->expectsOutput('Creating Markdown Pages...')
             ->expectsOutput('Creating Markdown Posts...')
             ->expectsOutput('Creating Documentation Pages...')
-            ->doesntExpectOutputToContain('Creating')
             ->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/html.html'));

From 49de93d20f9d1f3594b889fecf7b378b1b3d3e73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Dec 2023 16:58:36 +0100
Subject: [PATCH 0016/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c5a5421e35c..afe7ac9692f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,7 +13,7 @@ This serves two purposes:
 - Add experimental InMemoryPage::getOutputPath overload support
 
 ### Changed
-- for changes in existing functionality.
+- Changed how the documentation search is generated, to be an InMemoryPage instead of a post-build task.
 
 ### Deprecated
 - \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
@@ -30,3 +30,11 @@ This serves two purposes:
 ### Upgrade Guide
 
 If there are any breaking changes, include an upgrade guide here.
+
+#### Documentation search changes
+
+The documentation search page and search index have been changed to be generated as InMemoryPages instead of a post-build task.
+
+In case you have customized the GenerateSearch post-build task, you will need to adapt your code to the new InMemoryPage, which is generated in the HydeCoreExtension class.
+
+For more information, see https://github.com/hydephp/develop/pull/1498.

From 5728f7ad29a4295d3fb003cdb533feaf6f199f17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 10:38:23 +0100
Subject: [PATCH 0017/2811] Extract helper method

---
 .../Actions/GeneratesDocumentationSearchIndex.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 368895b599d..dfc7c4f95d8 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -59,7 +59,7 @@ protected function __construct()
     protected function run(): void
     {
         DocumentationPage::all()->each(function (DocumentationPage $page): void {
-            if (! in_array($page->identifier, array_merge(Config::getArray('docs.exclude_from_search', []), ['search']))) {
+            if (! in_array($page->identifier, $this->getPagesToExcludeFromSearch())) {
                 $this->index->push($this->generatePageEntry($page));
             }
         });
@@ -103,4 +103,9 @@ protected function getPath(): string
     {
         return Hyde::sitePath(DocumentationPage::outputDirectory().'/search.json');
     }
+
+    protected function getPagesToExcludeFromSearch(): array
+    {
+        return array_merge(Config::getArray('docs.exclude_from_search', []), ['search']);
+    }
 }

From 3cb7f404f0b03f05b9ad6b02a14e959552741325 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 10:40:11 +0100
Subject: [PATCH 0018/2811] Make search index page exclusion dependent on
 config setting

> Because if they have a custom search page, they would want to disable that feature, and then this should also be disabled.

See https://github.com/hydephp/develop/pull/1498#discussion_r1425650912
---
 .../src/Framework/Actions/GeneratesDocumentationSearchIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index dfc7c4f95d8..64bbb7d8e67 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -106,6 +106,6 @@ protected function getPath(): string
 
     protected function getPagesToExcludeFromSearch(): array
     {
-        return array_merge(Config::getArray('docs.exclude_from_search', []), ['search']);
+        return array_merge(Config::getArray('docs.exclude_from_search', []), Config::getBool('docs.create_search_page', true) ? ['search'] : []);
     }
 }

From bd140499e0d7850ca3e333eaddb9c9d45ba79a59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 12:22:23 +0100
Subject: [PATCH 0019/2811] Extract experimental helper method

Decoupling it from the extension cleans up the code, and allows us to use it in the build search command, even if it's not injected due to the search feature being disabled (then we still allow the user to force it like before)
---
 .../src/Foundation/HydeCoreExtension.php          | 10 +---------
 .../Actions/GeneratesDocumentationSearchIndex.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 27c0706a93c..50d5d40a0ed 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Concerns\HydeExtension;
@@ -36,14 +35,7 @@ public static function getPageClasses(): array
     public function discoverPages(PageCollection $collection): void
     {
         if (Features::hasDocumentationSearch()) {
-            $collection->addPage(tap(new InMemoryPage('search.json', ['navigation' => ['hidden' => true]]), function (InMemoryPage $page): void {
-                $page->macro('compile', function (): string {
-                    return GeneratesDocumentationSearchIndex::generate();
-                });
-                $page->macro('getOutputPath', function (): string {
-                    return DocumentationPage::outputDirectory().'/search.json';
-                });
-            }));
+            $collection->addPage(GeneratesDocumentationSearchIndex::makePage());
 
             if (DocumentationSearchPage::enabled()) {
                 $collection->addPage(new DocumentationSearchPage());
diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 64bbb7d8e67..125f6098316 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -7,10 +7,12 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 
+use function tap;
 use function basename;
 use function in_array;
 use function trim;
@@ -50,6 +52,19 @@ public static function generate(): string
         return $service->index->toJson();
     }
 
+    /** @experimental May be moved to a DocumentationSearch class */
+    public static function makePage(): InMemoryPage
+    {
+        return tap(new InMemoryPage('search.json', ['navigation' => ['hidden' => true]]), function (InMemoryPage $page): void {
+            $page->macro('compile', function (): string {
+                return GeneratesDocumentationSearchIndex::generate();
+            });
+            $page->macro('getOutputPath', function (): string {
+                return DocumentationPage::outputDirectory().'/search.json';
+            });
+        });
+    }
+
     protected function __construct()
     {
         $this->index = new Collection();

From 158c6f223d736ee2af2b26afb22614bd5fb30485 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 15:51:35 +0100
Subject: [PATCH 0020/2811] Update build search command to use new search page
 system

---
 .../src/Console/Commands/BuildSearchCommand.php      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 03cf8f95934..594fc5c3917 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -4,8 +4,10 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use LaravelZero\Framework\Commands\Command;
+use Hyde\Framework\Actions\StaticPageBuilder;
+use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
+use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 
 /**
  * Run the build process for the documentation search index.
@@ -20,6 +22,12 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        return (new GenerateSearch())->run($this->output);
+        StaticPageBuilder::handle(GeneratesDocumentationSearchIndex::makePage());
+
+        if (DocumentationSearchPage::enabled()) {
+            DocumentationSearchPage::generate();
+        }
+
+        return Command::SUCCESS;
     }
 }

From 873b928714cb3b123df794a40c2ee9300f264355 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 15:52:46 +0100
Subject: [PATCH 0021/2811] Support getting the search page from the kernel

In case it's been modified or injected somehow, this is a nicety to have
---
 .../src/Console/Commands/BuildSearchCommand.php  | 16 ++++++++++++++--
 .../Feature/Commands/BuildSearchCommandTest.php  | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 594fc5c3917..225980b2689 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Console\Commands;
 
-use LaravelZero\Framework\Commands\Command;
+use Hyde\Pages\Concerns\HydePage;
+use Hyde\Foundation\Facades\Pages;
 use Hyde\Framework\Actions\StaticPageBuilder;
+use Hyde\Framework\Exceptions\FileNotFoundException;
+use LaravelZero\Framework\Commands\Command;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 
@@ -22,7 +25,7 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        StaticPageBuilder::handle(GeneratesDocumentationSearchIndex::makePage());
+        StaticPageBuilder::handle($this->getPageFromKernel() ?? GeneratesDocumentationSearchIndex::makePage());
 
         if (DocumentationSearchPage::enabled()) {
             DocumentationSearchPage::generate();
@@ -30,4 +33,13 @@ public function handle(): int
 
         return Command::SUCCESS;
     }
+
+    protected function getPageFromKernel(): ?HydePage
+    {
+        try {
+            return Pages::getPage('search.json');
+        } catch (FileNotFoundException) {
+            return null;
+        }
+    }
 }
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index d8dc55a2826..bd25e01bd78 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -6,8 +6,10 @@
 
 use Hyde\Facades\Filesystem;
 use Hyde\Hyde;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
@@ -103,4 +105,18 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
 
         Filesystem::deleteDirectory('foo');
     }
+
+    public function test_command_uses_page_from_kernel_when_present()
+    {
+        Hyde::pages()->addPage(tap(GeneratesDocumentationSearchIndex::makePage(), function (InMemoryPage $page): void {
+            $page->macro('compile', fn () => '{"foo":"bar"}');
+        }));
+
+        $this->artisan('build:search')->assertExitCode(0);
+        $this->assertFileExists(Hyde::path('_site/docs/search.json'));
+        $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
+
+        Filesystem::unlink('_site/docs/search.json');
+        Filesystem::unlink('_site/docs/search.html');
+    }
 }

From 4f91f82c9a841889039ad2f5638610348ca2b644 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 17:11:10 +0100
Subject: [PATCH 0022/2811] Simplify logic to use nullable helper

---
 .../framework/src/Console/Commands/BuildSearchCommand.php  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 225980b2689..21992b51668 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -7,7 +7,6 @@
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Foundation\Facades\Pages;
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Exceptions\FileNotFoundException;
 use LaravelZero\Framework\Commands\Command;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
@@ -36,10 +35,6 @@ public function handle(): int
 
     protected function getPageFromKernel(): ?HydePage
     {
-        try {
-            return Pages::getPage('search.json');
-        } catch (FileNotFoundException) {
-            return null;
-        }
+        return Pages::get('search.json');
     }
 }

From e80cbb2f495dabf51435edfb3bf962b997c37a54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 17:11:26 +0100
Subject: [PATCH 0023/2811] Inline simplified helper method

---
 .../framework/src/Console/Commands/BuildSearchCommand.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 21992b51668..a0248172a17 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Pages\Concerns\HydePage;
 use Hyde\Foundation\Facades\Pages;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use LaravelZero\Framework\Commands\Command;
@@ -24,7 +23,7 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        StaticPageBuilder::handle($this->getPageFromKernel() ?? GeneratesDocumentationSearchIndex::makePage());
+        StaticPageBuilder::handle(Pages::get('search.json') ?? GeneratesDocumentationSearchIndex::makePage());
 
         if (DocumentationSearchPage::enabled()) {
             DocumentationSearchPage::generate();
@@ -32,9 +31,4 @@ public function handle(): int
 
         return Command::SUCCESS;
     }
-
-    protected function getPageFromKernel(): ?HydePage
-    {
-        return Pages::get('search.json');
-    }
 }

From 03f7fd897735c097bffb7b3cd27da505059c8680 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 17:15:54 +0100
Subject: [PATCH 0024/2811] Get the search page from the kernel as well

---
 .../framework/src/Console/Commands/BuildSearchCommand.php | 2 +-
 .../tests/Feature/Commands/BuildSearchCommandTest.php     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index a0248172a17..563778da0b1 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -26,7 +26,7 @@ public function handle(): int
         StaticPageBuilder::handle(Pages::get('search.json') ?? GeneratesDocumentationSearchIndex::makePage());
 
         if (DocumentationSearchPage::enabled()) {
-            DocumentationSearchPage::generate();
+            StaticPageBuilder::handle(Pages::get('docs/search') ?? new DocumentationSearchPage());
         }
 
         return Command::SUCCESS;
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index bd25e01bd78..72a5f591930 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -106,15 +106,21 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
         Filesystem::deleteDirectory('foo');
     }
 
-    public function test_command_uses_page_from_kernel_when_present()
+    public function test_command_uses_search_pages_from_kernel_when_present()
     {
         Hyde::pages()->addPage(tap(GeneratesDocumentationSearchIndex::makePage(), function (InMemoryPage $page): void {
             $page->macro('compile', fn () => '{"foo":"bar"}');
         }));
 
+        Hyde::pages()->addPage(tap(new InMemoryPage('docs/search'), function (InMemoryPage $page): void {
+            $page->macro('compile', fn () => 'Foo');
+        }));
+
         $this->artisan('build:search')->assertExitCode(0);
         $this->assertFileExists(Hyde::path('_site/docs/search.json'));
+        $this->assertFileExists(Hyde::path('_site/docs/search.html'));
         $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
+        $this->assertSame('Foo', Filesystem::getContents('_site/docs/search.html'));
 
         Filesystem::unlink('_site/docs/search.json');
         Filesystem::unlink('_site/docs/search.html');

From b021766d2f16be15a6c988e8b2b17e45384f2a22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 17:17:42 +0100
Subject: [PATCH 0025/2811] Clean up test method

---
 .../framework/tests/Feature/Commands/BuildSearchCommandTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 72a5f591930..2c289a5b4f9 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -117,8 +117,10 @@ public function test_command_uses_search_pages_from_kernel_when_present()
         }));
 
         $this->artisan('build:search')->assertExitCode(0);
+
         $this->assertFileExists(Hyde::path('_site/docs/search.json'));
         $this->assertFileExists(Hyde::path('_site/docs/search.html'));
+
         $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
         $this->assertSame('Foo', Filesystem::getContents('_site/docs/search.html'));
 

From 799d51f4a9b164ff5f3bdd6d64559d7b2d6ae034 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 18:17:06 +0100
Subject: [PATCH 0026/2811] Extract a model class for the documentation search
 index

---
 .../GeneratesDocumentationSearchIndex.php     | 11 +----
 .../DocumentationSearchIndex.php              | 46 +++++++++++++++++++
 .../Commands/BuildSearchCommandTest.php       |  4 +-
 3 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 125f6098316..e76c20496dd 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -11,8 +11,8 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
-use function tap;
 use function basename;
 use function in_array;
 use function trim;
@@ -55,14 +55,7 @@ public static function generate(): string
     /** @experimental May be moved to a DocumentationSearch class */
     public static function makePage(): InMemoryPage
     {
-        return tap(new InMemoryPage('search.json', ['navigation' => ['hidden' => true]]), function (InMemoryPage $page): void {
-            $page->macro('compile', function (): string {
-                return GeneratesDocumentationSearchIndex::generate();
-            });
-            $page->macro('getOutputPath', function (): string {
-                return DocumentationPage::outputDirectory().'/search.json';
-            });
-        });
+        return DocumentationSearchIndex::make();
     }
 
     protected function __construct()
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
new file mode 100644
index 00000000000..b5b650c722f
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Documentation;
+
+use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Framework\Actions\StaticPageBuilder;
+use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
+
+/**
+ * @internal This page is used to render the search index for the documentation.
+ */
+class DocumentationSearchIndex extends InMemoryPage
+{
+    /**
+     * Generate the search page and save it to disk.
+     *
+     * @return string The path to the generated file.
+     */
+    public static function generate(): string
+    {
+        return StaticPageBuilder::handle(new static());
+    }
+
+    /**
+     * Create a new DocumentationSearchPage instance.
+     */
+    public function __construct()
+    {
+        parent::__construct('search.json', [
+            'navigation' => ['hidden' => true],
+        ]);
+    }
+
+    public function compile(): string
+    {
+        return GeneratesDocumentationSearchIndex::generate();
+    }
+
+    public function getOutputPath(): string
+    {
+        return DocumentationPage::outputDirectory().'/search.json';
+    }
+}
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 2c289a5b4f9..454b63196d3 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -9,7 +9,6 @@
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
@@ -108,8 +107,9 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
 
     public function test_command_uses_search_pages_from_kernel_when_present()
     {
-        Hyde::pages()->addPage(tap(GeneratesDocumentationSearchIndex::makePage(), function (InMemoryPage $page): void {
+        Hyde::pages()->addPage(tap(new InMemoryPage('search.json'), function (InMemoryPage $page): void {
             $page->macro('compile', fn () => '{"foo":"bar"}');
+            $page->macro('getOutputPath', fn () => 'docs/search.json');
         }));
 
         Hyde::pages()->addPage(tap(new InMemoryPage('docs/search'), function (InMemoryPage $page): void {

From 76c1c3ef2911ae5959ceb6eb71021cb3cfdadbda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 18:44:28 +0100
Subject: [PATCH 0027/2811] Remove unused method

---
 .../Documentation/DocumentationSearchIndex.php        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index b5b650c722f..b33845960a5 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -6,7 +6,6 @@
 
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
 /**
@@ -14,16 +13,6 @@
  */
 class DocumentationSearchIndex extends InMemoryPage
 {
-    /**
-     * Generate the search page and save it to disk.
-     *
-     * @return string The path to the generated file.
-     */
-    public static function generate(): string
-    {
-        return StaticPageBuilder::handle(new static());
-    }
-
     /**
      * Create a new DocumentationSearchPage instance.
      */

From 44e97cd41508eccf6ce57142e2141fd14e0ee97b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 18:48:24 +0100
Subject: [PATCH 0028/2811] Merge in source directory prefix for search index
 identifier

---
 .../Features/Documentation/DocumentationSearchIndex.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index b33845960a5..f1dcaaa1acb 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -18,7 +18,7 @@ class DocumentationSearchIndex extends InMemoryPage
      */
     public function __construct()
     {
-        parent::__construct('search.json', [
+        parent::__construct(DocumentationPage::sourceDirectory().'/search.json', [
             'navigation' => ['hidden' => true],
         ]);
     }

From 01cba90c8a9ac168e57f4f5001039bef0f3b9fd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 19:46:01 +0100
Subject: [PATCH 0029/2811] Trim leading slashes from assembled paths

---
 .../Features/Documentation/DocumentationSearchIndex.php       | 4 ++--
 .../Features/Documentation/DocumentationSearchPage.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index f1dcaaa1acb..4ad3e5deb30 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -18,7 +18,7 @@ class DocumentationSearchIndex extends InMemoryPage
      */
     public function __construct()
     {
-        parent::__construct(DocumentationPage::sourceDirectory().'/search.json', [
+        parent::__construct(ltrim(DocumentationPage::sourceDirectory().'/search.json', '/'), [
             'navigation' => ['hidden' => true],
         ]);
     }
@@ -30,6 +30,6 @@ public function compile(): string
 
     public function getOutputPath(): string
     {
-        return DocumentationPage::outputDirectory().'/search.json';
+        return ltrim(DocumentationPage::outputDirectory().'/search.json', '/');
     }
 }
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index f58ff0b83ca..b582111b529 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -52,6 +52,6 @@ public static function enabled(): bool
 
     public static function routeKey(): string
     {
-        return parent::outputDirectory().'/search';
+        return ltrim(parent::outputDirectory().'/search');
     }
 }

From 57bdecb2bc2c593c9cf5ed129953f559a3fe115d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 19:50:38 +0100
Subject: [PATCH 0030/2811] Inline added simplified experimental method

---
 .../framework/src/Console/Commands/BuildSearchCommand.php | 4 ++--
 packages/framework/src/Foundation/HydeCoreExtension.php   | 4 ++--
 .../Actions/GeneratesDocumentationSearchIndex.php         | 8 --------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 563778da0b1..814f69ed751 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -7,8 +7,8 @@
 use Hyde\Foundation\Facades\Pages;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use LaravelZero\Framework\Commands\Command;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 /**
  * Run the build process for the documentation search index.
@@ -23,7 +23,7 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        StaticPageBuilder::handle(Pages::get('search.json') ?? GeneratesDocumentationSearchIndex::makePage());
+        StaticPageBuilder::handle(Pages::get('search.json') ?? DocumentationSearchIndex::make());
 
         if (DocumentationSearchPage::enabled()) {
             StaticPageBuilder::handle(Pages::get('docs/search') ?? new DocumentationSearchPage());
diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 50d5d40a0ed..5ecf1e90ef2 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -12,8 +12,8 @@
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Concerns\HydeExtension;
 use Hyde\Facades\Features;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 use function array_filter;
 use function array_keys;
@@ -35,7 +35,7 @@ public static function getPageClasses(): array
     public function discoverPages(PageCollection $collection): void
     {
         if (Features::hasDocumentationSearch()) {
-            $collection->addPage(GeneratesDocumentationSearchIndex::makePage());
+            $collection->addPage(DocumentationSearchIndex::make());
 
             if (DocumentationSearchPage::enabled()) {
                 $collection->addPage(new DocumentationSearchPage());
diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index e76c20496dd..64bbb7d8e67 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -7,11 +7,9 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
-use Hyde\Pages\InMemoryPage;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
-use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 use function basename;
 use function in_array;
@@ -52,12 +50,6 @@ public static function generate(): string
         return $service->index->toJson();
     }
 
-    /** @experimental May be moved to a DocumentationSearch class */
-    public static function makePage(): InMemoryPage
-    {
-        return DocumentationSearchIndex::make();
-    }
-
     protected function __construct()
     {
         $this->index = new Collection();

From cca3610b786864df861a769c744a4d8db9793fc1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 19:52:21 +0100
Subject: [PATCH 0031/2811] Change constructor style

Just makes it visually consistent
---
 packages/framework/src/Console/Commands/BuildSearchCommand.php | 2 +-
 packages/framework/src/Foundation/HydeCoreExtension.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 814f69ed751..d73a9112500 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -23,7 +23,7 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        StaticPageBuilder::handle(Pages::get('search.json') ?? DocumentationSearchIndex::make());
+        StaticPageBuilder::handle(Pages::get('search.json') ?? new DocumentationSearchIndex());
 
         if (DocumentationSearchPage::enabled()) {
             StaticPageBuilder::handle(Pages::get('docs/search') ?? new DocumentationSearchPage());
diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 5ecf1e90ef2..38772c55871 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -35,7 +35,7 @@ public static function getPageClasses(): array
     public function discoverPages(PageCollection $collection): void
     {
         if (Features::hasDocumentationSearch()) {
-            $collection->addPage(DocumentationSearchIndex::make());
+            $collection->addPage(new DocumentationSearchIndex());
 
             if (DocumentationSearchPage::enabled()) {
                 $collection->addPage(new DocumentationSearchPage());

From 37f7046251b8c0514b8d8ef821de4ef3d35bbac8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Dec 2023 20:05:28 +0100
Subject: [PATCH 0032/2811] Refractor internal search page to extend in memory
 page

I think this is more semantic
---
 .../Documentation/DocumentationSearchPage.php     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index b582111b529..0bf7f8ad8c6 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Features\Documentation;
 
 use Hyde\Hyde;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
-use Illuminate\Support\Facades\View;
 
 /**
  * @internal This page is used to render the search page for the documentation.
@@ -17,7 +17,7 @@
  * If you want to override this page, you can create a page with the route key "docs/search",
  * then this class will not be applied. For example, `_pages/docs/search.blade.php`.
  */
-class DocumentationSearchPage extends DocumentationPage
+class DocumentationSearchPage extends InMemoryPage
 {
     /**
      * Generate the search page and save it to disk.
@@ -34,15 +34,10 @@ public static function generate(): string
      */
     public function __construct()
     {
-        parent::__construct('search', [
+        parent::__construct(ltrim(DocumentationPage::outputDirectory().'/search', '/'), [
             'title' => 'Search',
             'navigation' => ['hidden' => true],
-        ]);
-    }
-
-    public function compile(): string
-    {
-        return View::make('hyde::pages.documentation-search')->render();
+        ], view: 'hyde::pages.documentation-search');
     }
 
     public static function enabled(): bool
@@ -52,6 +47,6 @@ public static function enabled(): bool
 
     public static function routeKey(): string
     {
-        return ltrim(parent::outputDirectory().'/search');
+        return ltrim(DocumentationPage::outputDirectory().'/search');
     }
 }

From 34ba8552a08210b82e597ede3472a534c62f1aeb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 11:12:57 +0100
Subject: [PATCH 0033/2811] Update documentation article component to support
 existing variables

Allows for them to be passed from a model class, for example.
---
 RELEASE_NOTES.md                                                | 1 +
 .../views/components/docs/documentation-article.blade.php       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index afe7ac9692f..d1ba26e97a6 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -14,6 +14,7 @@ This serves two purposes:
 
 ### Changed
 - Changed how the documentation search is generated, to be an InMemoryPage instead of a post-build task.
+- Updated the documentation article component to support existing $document instance.
 
 ### Deprecated
 - \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
diff --git a/packages/framework/resources/views/components/docs/documentation-article.blade.php b/packages/framework/resources/views/components/docs/documentation-article.blade.php
index 1bacc9e5c42..4565069d6a0 100644
--- a/packages/framework/resources/views/components/docs/documentation-article.blade.php
+++ b/packages/framework/resources/views/components/docs/documentation-article.blade.php
@@ -1,5 +1,5 @@
 @php
-    $document = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::make($page);
+    $document ??= \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::make($page);
 @endphp
 
 <article id="document" itemscope itemtype="https://schema.org/Article" @class([

From e6f6a98b1fced5f1428ad39be2ff7422f95bbdc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 11:13:37 +0100
Subject: [PATCH 0034/2811] Update search page to mock document

See https://github.com/hydephp/develop/commit/37f7046251b8c0514b8d8ef821de4ef3d35bbac8#commitcomment-135026537
---
 .../Features/Documentation/DocumentationSearchPage.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 0bf7f8ad8c6..af1c39b5892 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -37,6 +37,7 @@ public function __construct()
         parent::__construct(ltrim(DocumentationPage::outputDirectory().'/search', '/'), [
             'title' => 'Search',
             'navigation' => ['hidden' => true],
+            'document' => $this->makeDocument(),
         ], view: 'hyde::pages.documentation-search');
     }
 
@@ -49,4 +50,10 @@ public static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search');
     }
+
+    /** @experimental Fixes type issue {@see https://github.com/hydephp/develop/commit/37f7046251b8c0514b8d8ef821de4ef3d35bbac8#commitcomment-135026537} */
+    protected function makeDocument(): SemanticDocumentationArticle
+    {
+        return SemanticDocumentationArticle::make(new DocumentationPage());
+    }
 }

From b6eca700b4bb96037e55f7fe12071306fad2e074 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 11:36:00 +0100
Subject: [PATCH 0035/2811] Fix added search index page should include docs
 prefix

These in-memory page identifiers should include the route key prefix they would get if they were documentation pages
---
 packages/framework/src/Console/Commands/BuildSearchCommand.php  | 2 +-
 .../framework/tests/Feature/Commands/BuildSearchCommandTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index d73a9112500..4388c64cb68 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -23,7 +23,7 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        StaticPageBuilder::handle(Pages::get('search.json') ?? new DocumentationSearchIndex());
+        StaticPageBuilder::handle(Pages::get('docs/search.json') ?? new DocumentationSearchIndex());
 
         if (DocumentationSearchPage::enabled()) {
             StaticPageBuilder::handle(Pages::get('docs/search') ?? new DocumentationSearchPage());
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 454b63196d3..9dcdc335552 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -107,7 +107,7 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
 
     public function test_command_uses_search_pages_from_kernel_when_present()
     {
-        Hyde::pages()->addPage(tap(new InMemoryPage('search.json'), function (InMemoryPage $page): void {
+        Hyde::pages()->addPage(tap(new InMemoryPage('docs/search.json'), function (InMemoryPage $page): void {
             $page->macro('compile', fn () => '{"foo":"bar"}');
             $page->macro('getOutputPath', fn () => 'docs/search.json');
         }));

From 6c932a1bf49cce15e0214a063532c85ca50d7306 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 11:38:23 +0100
Subject: [PATCH 0036/2811] Deprecate internal logic to be removed within
 refactor

---
 .../Framework/Features/Documentation/DocumentationSearchPage.php | 1 +
 packages/realtime-compiler/src/Routing/PageRouter.php            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index af1c39b5892..06530bb84a9 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -46,6 +46,7 @@ public static function enabled(): bool
         return Config::getBool('docs.create_search_page', true) && ! Hyde::routes()->has(self::routeKey());
     }
 
+    /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
     public static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search');
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 1e41b531bd4..3d29cc7d18c 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -90,6 +90,7 @@ public static function handle(Request $request): Response
 
     protected function getPageFromRoute(): HydePage
     {
+        /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
         if (unslash($this->request->path) === DocumentationSearchPage::routeKey() && DocumentationSearchPage::enabled()) {
             // Since this page is not present within the search index (as it's normally generated by a build task)
             // we instantiate and return it here.

From 4556eed47894c9d5e5bd85aa85559445b9300cec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 12:56:30 +0100
Subject: [PATCH 0037/2811] Fix wrong method used to emulate route key

---
 .../Features/Documentation/DocumentationSearchIndex.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 4ad3e5deb30..2cb5aab6298 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -18,7 +18,7 @@ class DocumentationSearchIndex extends InMemoryPage
      */
     public function __construct()
     {
-        parent::__construct(ltrim(DocumentationPage::sourceDirectory().'/search.json', '/'), [
+        parent::__construct(ltrim(DocumentationPage::outputDirectory().'/search.json', '/'), [
             'navigation' => ['hidden' => true],
         ]);
     }

From 790689e0bfa3960e0585319801c299c6f2fa4bf0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 12:57:57 +0100
Subject: [PATCH 0038/2811] Create DocumentationSearchIndexTest.php

---
 .../Feature/DocumentationSearchIndexTest.php  | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 packages/framework/tests/Feature/DocumentationSearchIndexTest.php

diff --git a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
new file mode 100644
index 00000000000..58de0d066dd
--- /dev/null
+++ b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
+
+/**
+ * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchIndex
+ *
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildSearchCommandTest
+ */
+class DocumentationSearchIndexTest extends TestCase
+{
+    public function testCanCreateDocumentationSearchIndexInstance()
+    {
+        $this->assertInstanceOf(DocumentationSearchIndex::class, new DocumentationSearchIndex());
+    }
+
+    public function testRouteKeyIsSetToDocumentationOutputDirectory()
+    {
+        $page = new DocumentationSearchIndex();
+        $this->assertSame('docs/search.json', $page->routeKey);
+    }
+
+    public function testRouteKeyIsSetToConfiguredDocumentationOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('foo');
+
+        $page = new DocumentationSearchIndex();
+        $this->assertSame('foo/search.json', $page->routeKey);
+    }
+}

From 37c2dde6b063579dbdb3ad4444c9ae27b3ef27bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 12:58:05 +0100
Subject: [PATCH 0039/2811] Add coverage annotation

---
 .../framework/tests/Feature/Commands/BuildSearchCommandTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 9dcdc335552..faa5f89b75a 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -14,6 +14,7 @@
  * @covers \Hyde\Console\Commands\BuildSearchCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchPage
+ * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchIndex
  */
 class BuildSearchCommandTest extends TestCase
 {

From 38608b81dde77497e6a1283f0f3b9e81432ed039 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 13:32:59 +0100
Subject: [PATCH 0040/2811] Remove hacky route injection in favour of new
 search page implementation

Targets the realtime compiler v4 as it's a breaking change that requires Hyde v2. See https://github.com/hydephp/develop/pull/1498
---
 packages/realtime-compiler/src/Routing/PageRouter.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 3d29cc7d18c..a3a3876203a 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\RealtimeCompiler\Http\LiveEditController;
-use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
@@ -90,13 +89,6 @@ public static function handle(Request $request): Response
 
     protected function getPageFromRoute(): HydePage
     {
-        /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
-        if (unslash($this->request->path) === DocumentationSearchPage::routeKey() && DocumentationSearchPage::enabled()) {
-            // Since this page is not present within the search index (as it's normally generated by a build task)
-            // we instantiate and return it here.
-            return new DocumentationSearchPage();
-        }
-
         return Routes::getOrFail($this->normalizePath($this->request->path))->getPage();
     }
 }

From 9c100594e1292ebee8ab2c2329199fc71398fad3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 13:42:25 +0100
Subject: [PATCH 0041/2811] Update test to use new search page implementation

---
 packages/realtime-compiler/tests/RealtimeCompilerTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/realtime-compiler/tests/RealtimeCompilerTest.php b/packages/realtime-compiler/tests/RealtimeCompilerTest.php
index 9f48e9467a9..5c2cec606c3 100644
--- a/packages/realtime-compiler/tests/RealtimeCompilerTest.php
+++ b/packages/realtime-compiler/tests/RealtimeCompilerTest.php
@@ -164,6 +164,8 @@
 });
 
 test('docs/search renders search page', function () {
+    Filesystem::put('_docs/index.md', '# Hello World!');
+
     mockRoute('docs/search');
 
     $kernel = new HttpKernel();
@@ -175,6 +177,7 @@
 
     expect($response->body)->toContain('Search the documentation site');
 
+    Filesystem::unlink('_docs/index.md');
     Filesystem::unlink('_site/docs/search.html');
 });
 

From 0838ab4f25f75299f28495dcb9191e03a1ea0f3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 15:10:29 +0100
Subject: [PATCH 0042/2811] Remove internal
 `DocumentationSearchPage::routeKey()` method

This is now no longer needed thanks to https://github.com/hydephp/develop/pull/1498, but is kept as protected so the `enabled` method can use it
---
 .../Documentation/DocumentationSearchPage.php         |  3 +--
 .../tests/Feature/DocumentationSearchPageTest.php     | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 06530bb84a9..a27408c92fd 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -46,8 +46,7 @@ public static function enabled(): bool
         return Config::getBool('docs.create_search_page', true) && ! Hyde::routes()->has(self::routeKey());
     }
 
-    /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
-    public static function routeKey(): string
+    protected static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search');
     }
diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index 22a9b53ed1c..ec91f318044 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -59,15 +59,4 @@ public function testEnabledIsFalseWhenDisabledAndRouteExists()
         Hyde::routes()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
-
-    public function testStaticRouteKeyHelper()
-    {
-        $this->assertSame('docs/search', DocumentationSearchPage::routeKey());
-    }
-
-    public function testStaticRouteKeyHelperWithCustomOutputDirectory()
-    {
-        DocumentationPage::setOutputDirectory('foo');
-        $this->assertSame('foo/search', DocumentationSearchPage::routeKey());
-    }
 }

From 82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Dec 2023 15:50:21 +0100
Subject: [PATCH 0043/2811] Add improved conditional to fix override priority

As part of the v2 refactors, since routes aren't discovered yet, we need to check the pages directly.

This also means that custom search pages are now not built by the build:search command. We could change it so that it is, but we don't know if the custom page is a custom search feature, or a page that documents a search feature. So we don't know if this is what the user would want/expect.

Additionally, the kernel API changes to needing to put the overrides in the pages collection instead of the route collection. This is also a very very minor implementation change with minimal impact.
---
 .../Features/Documentation/DocumentationSearchPage.php   | 9 ++++++++-
 .../tests/Feature/Commands/BuildSearchCommandTest.php    | 6 +++---
 .../tests/Feature/DocumentationSearchPageTest.php        | 4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index a27408c92fd..a352a250358 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
 
@@ -43,7 +44,13 @@ public function __construct()
 
     public static function enabled(): bool
     {
-        return Config::getBool('docs.create_search_page', true) && ! Hyde::routes()->has(self::routeKey());
+        return Config::getBool('docs.create_search_page', true) && ! static::anotherSearchPageExists();
+    }
+
+    protected static function anotherSearchPageExists(): bool
+    {
+        // Since routes aren't discovered yet, we need to check the pages directly
+        return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
 
     protected static function routeKey(): string
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index faa5f89b75a..dfcf392d5bf 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -120,12 +120,12 @@ public function test_command_uses_search_pages_from_kernel_when_present()
         $this->artisan('build:search')->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/docs/search.json'));
-        $this->assertFileExists(Hyde::path('_site/docs/search.html'));
+//        $this->assertFileExists(Hyde::path('_site/docs/search.html'));
 
         $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
-        $this->assertSame('Foo', Filesystem::getContents('_site/docs/search.html'));
+//        $this->assertSame('Foo', Filesystem::getContents('_site/docs/search.html'));
 
         Filesystem::unlink('_site/docs/search.json');
-        Filesystem::unlink('_site/docs/search.html');
+//        Filesystem::unlink('_site/docs/search.html');
     }
 }
diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index ec91f318044..9f1d2546bec 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -49,14 +49,14 @@ public function testEnabledIsFalseWhenDisabled()
 
     public function testEnabledIsFalseWhenRouteExists()
     {
-        Hyde::routes()->put('docs/search', new InMemoryPage('docs/search'));
+        Hyde::pages()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
 
     public function testEnabledIsFalseWhenDisabledAndRouteExists()
     {
         config(['docs.create_search_page' => false]);
-        Hyde::routes()->put('docs/search', new InMemoryPage('docs/search'));
+        Hyde::pages()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
 }

From 53d41b81c8e916f0fcc4246b2fa05f51b9079d59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Dec 2023 16:40:15 +0100
Subject: [PATCH 0044/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d1ba26e97a6..31f6df9770b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -39,3 +39,16 @@ The documentation search page and search index have been changed to be generated
 In case you have customized the GenerateSearch post-build task, you will need to adapt your code to the new InMemoryPage, which is generated in the HydeCoreExtension class.
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
+
+### Breaking changes
+
+#### Low impact
+- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
+  you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,
+  as the search pages are now added to the kernel page and route collection. (https://github.com/hydephp/develop/pull/1498)
+- If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
+  that page will no longer be build when using the specific `build:search` command. It will, of course, 
+  be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
+- In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
+  you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
+  https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced

From 3bad9138c1e785f3b2a28c7c0530e1fc93bcc14f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 17 Dec 2023 19:59:55 +0100
Subject: [PATCH 0045/2811] Breaking: Remove the GenerateSearch build task

---
 .../Actions/PostBuildTasks/GenerateSearch.php | 34 -------------------
 .../Commands/BuildSearchCommandTest.php       |  1 -
 .../Feature/Services/BuildTaskServiceTest.php |  1 -
 .../tests/Unit/BuildTaskServiceUnitTest.php   |  6 ----
 4 files changed, 42 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php

diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
deleted file mode 100644
index a2d115a6e96..00000000000
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions\PostBuildTasks;
-
-use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Features\BuildTasks\PostBuildTask;
-use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
-
-/** @deprecated */
-class GenerateSearch extends PostBuildTask
-{
-    use InteractsWithDirectories;
-
-    public static string $message = 'Generating search index';
-
-    protected string $path;
-
-    public function handle(): void
-    {
-        $this->path = GeneratesDocumentationSearchIndex::handle();
-
-        if (DocumentationSearchPage::enabled()) {
-            $this->createdSiteFile(DocumentationSearchPage::generate());
-        }
-    }
-
-    public function printFinishMessage(): void
-    {
-        $this->createdSiteFile($this->path)->withExecutionTime();
-    }
-}
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index dfcf392d5bf..9562ae12512 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -12,7 +12,6 @@
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchPage
  * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchIndex
  */
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index 0260d37a8f6..347f83530ca 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -19,7 +19,6 @@
  * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTask
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  *
  * @see \Hyde\Framework\Testing\Unit\BuildTaskServiceUnitTest
  */
diff --git a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
index 1b08979d54f..bcf14ff42a2 100644
--- a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
@@ -8,7 +8,6 @@
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap as FrameworkGenerateSitemap;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Features\BuildTasks\PostBuildTask;
@@ -167,11 +166,6 @@ public function testGenerateRssFeedExtendsPostBuildTask()
         $this->assertInstanceOf(PostBuildTask::class, new GenerateRssFeed());
     }
 
-    public function testGenerateSearchExtendsPostBuildTask()
-    {
-        $this->assertInstanceOf(PostBuildTask::class, new GenerateSearch());
-    }
-
     public function testGenerateSitemapExtendsPostBuildTask()
     {
         $this->assertInstanceOf(PostBuildTask::class, new FrameworkGenerateSitemap());

From aeeed9f4fab5edab6513ef1c5210e9a1a4e349e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 17 Dec 2023 20:26:26 +0100
Subject: [PATCH 0046/2811] Cleanup and improve release notes

---
 RELEASE_NOTES.md | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 31f6df9770b..599dcd1e614 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,17 +10,17 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
-- Add experimental InMemoryPage::getOutputPath overload support
+- Add experimental `InMemoryPage::getOutputPath` overload support
 
 ### Changed
-- Changed how the documentation search is generated, to be an InMemoryPage instead of a post-build task.
-- Updated the documentation article component to support existing $document instance.
+- Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
+- Updated the documentation article component to support existing `$document` instance.
 
 ### Deprecated
-- \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
+- for soon-to-be removed features.
 
 ### Removed
-- for now removed features.
+- Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 
 ### Fixed
 - for any bug fixes.
@@ -32,23 +32,29 @@ This serves two purposes:
 
 If there are any breaking changes, include an upgrade guide here.
 
-#### Documentation search changes
+#### Documentation search page changes
 
-The documentation search page and search index have been changed to be generated as InMemoryPages instead of a post-build task.
+The documentation search page and search index have been changed to be generated as `InMemoryPages` instead of a post-build task.
 
-In case you have customized the GenerateSearch post-build task, you will need to adapt your code to the new InMemoryPage, which is generated in the HydeCoreExtension class.
+The main impact noticeable to most users by this is the implicit changes, like the pages showing up in the dashboard and route list command.
+
+In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do, 
+want to adapt your code to interact with the new `InMemoryPage`, which is generated in the `HydeCoreExtension` class.
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ### Breaking changes
 
 #### Low impact
+
 - The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
   you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,
   as the search pages are now added to the kernel page and route collection. (https://github.com/hydephp/develop/pull/1498)
+
 - If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
-  that page will no longer be build when using the specific `build:search` command. It will, of course, 
+  that page will no longer be built when using the specific `build:search` command. It will, of course, 
   be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
+- 
 - In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced

From e43d6e829ce914422cf927c21bbc0575b105b145 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 10:47:03 +0100
Subject: [PATCH 0047/2811] Improve code comment

---
 .../Features/Documentation/DocumentationSearchPage.php         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index a352a250358..27150145f3d 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -49,7 +49,8 @@ public static function enabled(): bool
 
     protected static function anotherSearchPageExists(): bool
     {
-        // Since routes aren't discovered yet, we need to check the pages directly
+        // Since routes aren't discovered yet due to this page being added in the core extension,
+        // we need to check the page collection directly, instead of the route collection.
         return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
 

From 32a1ee5e085bf367d96a6546acfa2d05672c26f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 10:46:00 +0100
Subject: [PATCH 0048/2811] Use helper method with same code

---
 .../Features/Documentation/DocumentationSearchPage.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 27150145f3d..e3070f59897 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -35,7 +35,7 @@ public static function generate(): string
      */
     public function __construct()
     {
-        parent::__construct(ltrim(DocumentationPage::outputDirectory().'/search', '/'), [
+        parent::__construct(static::routeKey(), [
             'title' => 'Search',
             'navigation' => ['hidden' => true],
             'document' => $this->makeDocument(),

From eb07152ae1cdece442145fd5f44808d74234e912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:12:23 +0100
Subject: [PATCH 0049/2811] Revert "Remove internal
 `DocumentationSearchPage::routeKey()` method"

This reverts commit 0838ab4f25f75299f28495dcb9191e03a1ea0f3a as the class is internal it doesn't bog up the public API, but we can still use it to reduce overlapping logic in our codebase.
---
 .../Documentation/DocumentationSearchPage.php         |  3 ++-
 .../tests/Feature/DocumentationSearchPageTest.php     | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index e3070f59897..d5d90690c25 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -54,7 +54,8 @@ protected static function anotherSearchPageExists(): bool
         return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
 
-    protected static function routeKey(): string
+    /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
+    public static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search');
     }
diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index 9f1d2546bec..cfb45b76a0c 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -59,4 +59,15 @@ public function testEnabledIsFalseWhenDisabledAndRouteExists()
         Hyde::pages()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
+
+    public function testStaticRouteKeyHelper()
+    {
+        $this->assertSame('docs/search', DocumentationSearchPage::routeKey());
+    }
+
+    public function testStaticRouteKeyHelperWithCustomOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('foo');
+        $this->assertSame('foo/search', DocumentationSearchPage::routeKey());
+    }
 }

From ef0fa703c47ec82f9218bb8eab1b325efefc6deb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:13:49 +0100
Subject: [PATCH 0050/2811] Revert internal deprecation

This partially reverts commit 6c932a1bf49cce15e0214a063532c85ca50d7306.
---
 .../Framework/Features/Documentation/DocumentationSearchPage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index d5d90690c25..d61a24b8105 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -54,7 +54,6 @@ protected static function anotherSearchPageExists(): bool
         return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
 
-    /** @deprecated Can be removed by https://github.com/hydephp/develop/pull/1498 */
     public static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search');

From 883c09d9474ac9d003fede67f9f21e6ad2131186 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:21:48 +0100
Subject: [PATCH 0051/2811] Move up public method

---
 .../Features/Documentation/DocumentationSearchPage.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index d61a24b8105..f9d92c1556e 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -47,6 +47,11 @@ public static function enabled(): bool
         return Config::getBool('docs.create_search_page', true) && ! static::anotherSearchPageExists();
     }
 
+    public static function routeKey(): string
+    {
+        return ltrim(DocumentationPage::outputDirectory().'/search');
+    }
+
     protected static function anotherSearchPageExists(): bool
     {
         // Since routes aren't discovered yet due to this page being added in the core extension,
@@ -54,11 +59,6 @@ protected static function anotherSearchPageExists(): bool
         return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
 
-    public static function routeKey(): string
-    {
-        return ltrim(DocumentationPage::outputDirectory().'/search');
-    }
-
     /** @experimental Fixes type issue {@see https://github.com/hydephp/develop/commit/37f7046251b8c0514b8d8ef821de4ef3d35bbac8#commitcomment-135026537} */
     protected function makeDocument(): SemanticDocumentationArticle
     {

From 89c63523196e5816938b3a9eecb957041faffaad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:21:59 +0100
Subject: [PATCH 0052/2811] Import used function

---
 .../Features/Documentation/DocumentationSearchPage.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index f9d92c1556e..4e6c1778678 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -11,6 +11,8 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
 
+use function ltrim;
+
 /**
  * @internal This page is used to render the search page for the documentation.
  *

From 0f8fe02c68cace2d5ab9567195d8f6d7e6ce243c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:35:38 +0100
Subject: [PATCH 0053/2811] Fix missing trim argument

Required in case of root outputs so that the route key is relative
---
 .../Features/Documentation/DocumentationSearchPage.php      | 2 +-
 .../framework/tests/Feature/DocumentationSearchPageTest.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 4e6c1778678..e16fe950279 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -51,7 +51,7 @@ public static function enabled(): bool
 
     public static function routeKey(): string
     {
-        return ltrim(DocumentationPage::outputDirectory().'/search');
+        return ltrim(DocumentationPage::outputDirectory().'/search', '/');
     }
 
     protected static function anotherSearchPageExists(): bool
diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index cfb45b76a0c..e7a2adc4dc3 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -70,4 +70,10 @@ public function testStaticRouteKeyHelperWithCustomOutputDirectory()
         DocumentationPage::setOutputDirectory('foo');
         $this->assertSame('foo/search', DocumentationSearchPage::routeKey());
     }
+
+    public function testStaticRouteKeyHelperWithRootOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('');
+        $this->assertSame('search', DocumentationSearchPage::routeKey());
+    }
 }

From b7a253777b8c0caca3d697f679fba3bb30450810 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 11:43:30 +0100
Subject: [PATCH 0054/2811] Extract internal route key helper

Reduces the amount of times and places we call the exact same logic
---
 .../components/docs/search-scripts.blade.php    |  2 +-
 .../GeneratesDocumentationSearchIndex.php       |  3 ++-
 .../Documentation/DocumentationSearchIndex.php  |  9 ++++++++-
 .../Feature/DocumentationSearchIndexTest.php    | 17 +++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/search-scripts.blade.php b/packages/framework/resources/views/components/docs/search-scripts.blade.php
index 0d381221c29..f2561c84b61 100644
--- a/packages/framework/resources/views/components/docs/search-scripts.blade.php
+++ b/packages/framework/resources/views/components/docs/search-scripts.blade.php
@@ -1,7 +1,7 @@
 <script src="https://cdn.jsdelivr.net/npm/hydesearch@0.2.1/dist/HydeSearch.min.js" defer></script>
 <script>
     window.addEventListener('load', function () {
-        const searchIndexLocation = '{{ Hyde::relativeLink(ltrim(DocumentationPage::outputDirectory().'/search.json', '/')) }}';
+        const searchIndexLocation = '{{ Hyde::relativeLink(\Hyde\Framework\Features\Documentation\DocumentationSearchIndex::routeKey()) }}';
         const Search = new HydeSearch(searchIndexLocation);
 
         Search.init();
diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 64bbb7d8e67..cf55338757c 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -10,6 +10,7 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 use function basename;
 use function in_array;
@@ -101,7 +102,7 @@ protected function formatDestination(string $slug): string
 
     protected function getPath(): string
     {
-        return Hyde::sitePath(DocumentationPage::outputDirectory().'/search.json');
+        return Hyde::sitePath(DocumentationSearchIndex::routeKey());
     }
 
     protected function getPagesToExcludeFromSearch(): array
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 2cb5aab6298..5d88dbc7a41 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -8,6 +8,8 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
+use function ltrim;
+
 /**
  * @internal This page is used to render the search index for the documentation.
  */
@@ -18,7 +20,7 @@ class DocumentationSearchIndex extends InMemoryPage
      */
     public function __construct()
     {
-        parent::__construct(ltrim(DocumentationPage::outputDirectory().'/search.json', '/'), [
+        parent::__construct(static::routeKey(), [
             'navigation' => ['hidden' => true],
         ]);
     }
@@ -29,6 +31,11 @@ public function compile(): string
     }
 
     public function getOutputPath(): string
+    {
+        return static::routeKey();
+    }
+
+    public static function routeKey(): string
     {
         return ltrim(DocumentationPage::outputDirectory().'/search.json', '/');
     }
diff --git a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
index 58de0d066dd..77c51e57052 100644
--- a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
@@ -33,4 +33,21 @@ public function testRouteKeyIsSetToConfiguredDocumentationOutputDirectory()
         $page = new DocumentationSearchIndex();
         $this->assertSame('foo/search.json', $page->routeKey);
     }
+
+    public function testStaticRouteKeyHelper()
+    {
+        $this->assertSame('docs/search.json', DocumentationSearchIndex::routeKey());
+    }
+
+    public function testStaticRouteKeyHelperWithCustomOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('foo');
+        $this->assertSame('foo/search.json', DocumentationSearchIndex::routeKey());
+    }
+
+    public function testStaticRouteKeyHelperWithRootOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('');
+        $this->assertSame('search.json', DocumentationSearchIndex::routeKey());
+    }
 }

From 2d46f6bbd1707f149473218fcc43946e24d69443 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 12:01:00 +0100
Subject: [PATCH 0055/2811] Revert "Add experimental
 `InMemoryPage::getOutputPath` overload support"

This reverts commit 697e016fb300334e602576084775d28fd5b81d59. See https://github.com/hydephp/develop/pull/1498/files#r1429894023

Also updates a test to use a test class instead of using the macro (which was it's only current usage)
---
 RELEASE_NOTES.md                              |  2 +-
 packages/framework/src/Pages/InMemoryPage.php | 10 ----------
 .../Commands/BuildSearchCommandTest.php       | 19 +++++++++++++++----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 599dcd1e614..011f4567940 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,7 +10,7 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
-- Add experimental `InMemoryPage::getOutputPath` overload support
+- for new features.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
diff --git a/packages/framework/src/Pages/InMemoryPage.php b/packages/framework/src/Pages/InMemoryPage.php
index 56a429344e2..541e9356ec9 100644
--- a/packages/framework/src/Pages/InMemoryPage.php
+++ b/packages/framework/src/Pages/InMemoryPage.php
@@ -82,16 +82,6 @@ public function getBladeView(): string
         return $this->view;
     }
 
-    /** @experimental Get the path to the output file for the page. */
-    public function getOutputPath(): string
-    {
-        if ($this->hasMacro('getOutputPath')) {
-            return $this->__call('getOutputPath', []);
-        }
-
-        return parent::getOutputPath();
-    }
-
     /**
      * Get the contents that will be saved to disk for this page.
      *
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 9562ae12512..2ba0891886e 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -9,6 +9,7 @@
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
@@ -107,10 +108,7 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
 
     public function test_command_uses_search_pages_from_kernel_when_present()
     {
-        Hyde::pages()->addPage(tap(new InMemoryPage('docs/search.json'), function (InMemoryPage $page): void {
-            $page->macro('compile', fn () => '{"foo":"bar"}');
-            $page->macro('getOutputPath', fn () => 'docs/search.json');
-        }));
+        Hyde::pages()->addPage(new SearchIndexOverrideTestPage());
 
         Hyde::pages()->addPage(tap(new InMemoryPage('docs/search'), function (InMemoryPage $page): void {
             $page->macro('compile', fn () => 'Foo');
@@ -128,3 +126,16 @@ public function test_command_uses_search_pages_from_kernel_when_present()
 //        Filesystem::unlink('_site/docs/search.html');
     }
 }
+
+class SearchIndexOverrideTestPage extends DocumentationSearchIndex
+{
+    public function compile(): string
+    {
+        return '{"foo":"bar"}';
+    }
+
+    public function getOutputPath(): string
+    {
+        return 'docs/search.json';
+    }
+}

From d86f5433365c540bf9a14c4f97e3b937711db353 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 15:40:04 +0100
Subject: [PATCH 0056/2811] Replace instance override with static

Same semantics, just cleaner
---
 .../Features/Documentation/DocumentationSearchIndex.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 5d88dbc7a41..c7b5ea94ec1 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -30,7 +30,7 @@ public function compile(): string
         return GeneratesDocumentationSearchIndex::generate();
     }
 
-    public function getOutputPath(): string
+    public static function outputPath(string $identifier): string
     {
         return static::routeKey();
     }

From a33a3f57dc8cfc98436606032da80255c35b58a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 15:47:35 +0100
Subject: [PATCH 0057/2811] Refactor to use RouteKey helper

Now it uses the same code as the default parent outputPath helper but with a different extension
---
 .../Features/Documentation/DocumentationSearchIndex.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index c7b5ea94ec1..81f9ca514eb 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -6,10 +6,9 @@
 
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\RouteKey;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
-use function ltrim;
-
 /**
  * @internal This page is used to render the search index for the documentation.
  */
@@ -37,6 +36,6 @@ public static function outputPath(string $identifier): string
 
     public static function routeKey(): string
     {
-        return ltrim(DocumentationPage::outputDirectory().'/search.json', '/');
+        return RouteKey::fromPage(DocumentationPage::class, 'search').'.json';
     }
 }

From 076c39831b6e578940f659189c7d60991c21cb89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 15:50:57 +0100
Subject: [PATCH 0058/2811] Add default value to make parameter optional

Since it is ignored here it's weird to require it
---
 .../Features/Documentation/DocumentationSearchIndex.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 81f9ca514eb..d83de6d14dc 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -29,7 +29,7 @@ public function compile(): string
         return GeneratesDocumentationSearchIndex::generate();
     }
 
-    public static function outputPath(string $identifier): string
+    public static function outputPath(string $identifier = ''): string
     {
         return static::routeKey();
     }

From be553d7bb739c2ff504773fa21e008294598c88f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 15:51:07 +0100
Subject: [PATCH 0059/2811] Shift logic to different internal helper

---
 .../Features/Documentation/DocumentationSearchIndex.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index d83de6d14dc..68b927b45d7 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -31,11 +31,11 @@ public function compile(): string
 
     public static function outputPath(string $identifier = ''): string
     {
-        return static::routeKey();
+        return RouteKey::fromPage(DocumentationPage::class, 'search').'.json';
     }
 
     public static function routeKey(): string
     {
-        return RouteKey::fromPage(DocumentationPage::class, 'search').'.json';
+        return static::outputPath();
     }
 }

From 83cfa5abb76e0bae24bda7e977855d1e0202b4fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 15:52:35 +0100
Subject: [PATCH 0060/2811] Inline simplified helper

---
 .../views/components/docs/search-scripts.blade.php   |  2 +-
 .../Actions/GeneratesDocumentationSearchIndex.php    |  2 +-
 .../Documentation/DocumentationSearchIndex.php       |  7 +------
 .../tests/Feature/DocumentationSearchIndexTest.php   | 12 ++++++------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/search-scripts.blade.php b/packages/framework/resources/views/components/docs/search-scripts.blade.php
index f2561c84b61..6da5968e532 100644
--- a/packages/framework/resources/views/components/docs/search-scripts.blade.php
+++ b/packages/framework/resources/views/components/docs/search-scripts.blade.php
@@ -1,7 +1,7 @@
 <script src="https://cdn.jsdelivr.net/npm/hydesearch@0.2.1/dist/HydeSearch.min.js" defer></script>
 <script>
     window.addEventListener('load', function () {
-        const searchIndexLocation = '{{ Hyde::relativeLink(\Hyde\Framework\Features\Documentation\DocumentationSearchIndex::routeKey()) }}';
+        const searchIndexLocation = '{{ Hyde::relativeLink(\Hyde\Framework\Features\Documentation\DocumentationSearchIndex::outputPath()) }}';
         const Search = new HydeSearch(searchIndexLocation);
 
         Search.init();
diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index cf55338757c..45f7a24c5e9 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -102,7 +102,7 @@ protected function formatDestination(string $slug): string
 
     protected function getPath(): string
     {
-        return Hyde::sitePath(DocumentationSearchIndex::routeKey());
+        return Hyde::sitePath(DocumentationSearchIndex::outputPath());
     }
 
     protected function getPagesToExcludeFromSearch(): array
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 68b927b45d7..5ec5b32db00 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -19,7 +19,7 @@ class DocumentationSearchIndex extends InMemoryPage
      */
     public function __construct()
     {
-        parent::__construct(static::routeKey(), [
+        parent::__construct(DocumentationSearchIndex::outputPath(), [
             'navigation' => ['hidden' => true],
         ]);
     }
@@ -33,9 +33,4 @@ public static function outputPath(string $identifier = ''): string
     {
         return RouteKey::fromPage(DocumentationPage::class, 'search').'.json';
     }
-
-    public static function routeKey(): string
-    {
-        return static::outputPath();
-    }
 }
diff --git a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
index 77c51e57052..7cc9b8939d7 100644
--- a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
@@ -34,20 +34,20 @@ public function testRouteKeyIsSetToConfiguredDocumentationOutputDirectory()
         $this->assertSame('foo/search.json', $page->routeKey);
     }
 
-    public function testStaticRouteKeyHelper()
+    public function testStaticOutputPathHelper()
     {
-        $this->assertSame('docs/search.json', DocumentationSearchIndex::routeKey());
+        $this->assertSame('docs/search.json', DocumentationSearchIndex::outputPath());
     }
 
-    public function testStaticRouteKeyHelperWithCustomOutputDirectory()
+    public function testStaticOutputPathHelperWithCustomOutputDirectory()
     {
         DocumentationPage::setOutputDirectory('foo');
-        $this->assertSame('foo/search.json', DocumentationSearchIndex::routeKey());
+        $this->assertSame('foo/search.json', DocumentationSearchIndex::outputPath());
     }
 
-    public function testStaticRouteKeyHelperWithRootOutputDirectory()
+    public function testStaticOutputPathHelperWithRootOutputDirectory()
     {
         DocumentationPage::setOutputDirectory('');
-        $this->assertSame('search.json', DocumentationSearchIndex::routeKey());
+        $this->assertSame('search.json', DocumentationSearchIndex::outputPath());
     }
 }

From d81a2abed260bd693985910be5066ee142735e64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 19:19:52 +0100
Subject: [PATCH 0061/2811] Use the RouteKey helper

---
 .../Features/Documentation/DocumentationSearchPage.php       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index e16fe950279..ed91c2c87f1 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -8,11 +8,10 @@
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\Concerns\HydePage;
+use Hyde\Support\Models\RouteKey;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
 
-use function ltrim;
-
 /**
  * @internal This page is used to render the search page for the documentation.
  *
@@ -51,7 +50,7 @@ public static function enabled(): bool
 
     public static function routeKey(): string
     {
-        return ltrim(DocumentationPage::outputDirectory().'/search', '/');
+        return RouteKey::fromPage(DocumentationPage::class, 'search')->get();
     }
 
     protected static function anotherSearchPageExists(): bool

From aa625168be131ef5a341eeb672503a891f014a7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 22:35:40 +0100
Subject: [PATCH 0062/2811] Revert "Deprecate internal
 `GeneratesDocumentationSearchIndex::handle` method"

This reverts commit feb99e9d681f802554e38a9235f856cdc651de63.
---
 .../src/Framework/Actions/GeneratesDocumentationSearchIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 45f7a24c5e9..835084bfd39 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -27,7 +27,7 @@ class GeneratesDocumentationSearchIndex
     protected string $path;
 
     /**
-     * @deprecated Generate the search index and save it to disk.
+     * Generate the search index and save it to disk.
      *
      * @return string The path to the generated file.
      */

From 02ed17d00935f1e5a086605222a3a1fcee54b63b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 22:36:12 +0100
Subject: [PATCH 0063/2811] Revert "Add new internal
 `GeneratesDocumentationSearchIndex::generate` method"

This reverts commit d9eec2881648aab1742a18689257daf20668d79c.
---
 .../Actions/GeneratesDocumentationSearchIndex.php     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 835084bfd39..30aeecc0d7f 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -40,17 +40,6 @@ public static function handle(): string
         return $service->path;
     }
 
-    /**
-     * Generate the search index return it as a string.
-     */
-    public static function generate(): string
-    {
-        $service = new static();
-        $service->run();
-
-        return $service->index->toJson();
-    }
-
     protected function __construct()
     {
         $this->index = new Collection();

From 1c378515fe2d8f637e2b0f27a0d7b9059f69e222 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Dec 2023 22:35:19 +0100
Subject: [PATCH 0064/2811] Change internal search generator method to return
 JSON directly

Since saving to disk is handled by the build process, this class now just needs to be responsible for generating the JSON. See https://github.com/hydephp/develop/pull/1498
---
 .../GeneratesDocumentationSearchIndex.php     | 24 +++--------------
 .../DocumentationSearchIndex.php              |  2 +-
 .../DocumentationSearchServiceTest.php        | 26 +++----------------
 3 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 30aeecc0d7f..17f9a103474 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -4,30 +4,26 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
-use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 use function basename;
 use function in_array;
 use function trim;
 
 /**
- * @internal Generate a JSON file that can be used as a search index for documentation pages.
+ * @internal Generate a JSON string that can be used as a search index for documentation pages.
  */
 class GeneratesDocumentationSearchIndex
 {
     use InteractsWithDirectories;
 
     protected Collection $index;
-    protected string $path;
 
     /**
-     * Generate the search index and save it to disk.
+     * @since v2.x This method returns the JSON string instead of saving it to disk and returning the path.
      *
      * @return string The path to the generated file.
      */
@@ -35,15 +31,13 @@ public static function handle(): string
     {
         $service = new static();
         $service->run();
-        $service->save();
 
-        return $service->path;
+        return $service->index->toJson();
     }
 
     protected function __construct()
     {
         $this->index = new Collection();
-        $this->path = $this->getPath();
     }
 
     protected function run(): void
@@ -68,13 +62,6 @@ protected function generatePageEntry(DocumentationPage $page): array
         ];
     }
 
-    protected function save(): void
-    {
-        $this->needsParentDirectory($this->path);
-
-        Filesystem::putContents($this->path, $this->index->toJson());
-    }
-
     protected function getSearchContentForDocument(DocumentationPage $page): string
     {
         return (new ConvertsMarkdownToPlainText($page->markdown->body()))->execute();
@@ -89,11 +76,6 @@ protected function formatDestination(string $slug): string
         return "$slug.html";
     }
 
-    protected function getPath(): string
-    {
-        return Hyde::sitePath(DocumentationSearchIndex::outputPath());
-    }
-
     protected function getPagesToExcludeFromSearch(): array
     {
         return array_merge(Config::getArray('docs.exclude_from_search', []), Config::getBool('docs.create_search_page', true) ? ['search'] : []);
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
index 5ec5b32db00..ac14115b422 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -26,7 +26,7 @@ public function __construct()
 
     public function compile(): string
     {
-        return GeneratesDocumentationSearchIndex::generate();
+        return GeneratesDocumentationSearchIndex::handle();
     }
 
     public static function outputPath(string $identifier = ''): string
diff --git a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
index 0689b4665bb..f43165cdafa 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Hyde;
 use Hyde\Testing\CreatesTemporaryFiles;
@@ -32,14 +31,12 @@ public function test_it_generates_a_json_file_with_a_search_index()
     {
         $this->file('_docs/foo.md');
 
-        GeneratesDocumentationSearchIndex::handle();
-
         $this->assertSame(json_encode([[
             'slug' => 'foo',
             'title' => 'Foo',
             'content' => '',
             'destination' => 'foo.html',
-        ]]), file_get_contents('_site/docs/search.json'));
+        ]]), GeneratesDocumentationSearchIndex::handle());
     }
 
     public function test_it_adds_all_files_to_search_index()
@@ -53,20 +50,7 @@ public function test_it_adds_all_files_to_search_index()
 
     public function test_it_handles_generation_even_when_there_are_no_pages()
     {
-        GeneratesDocumentationSearchIndex::handle();
-
-        $this->assertSame('[]', file_get_contents('_site/docs/search.json'));
-
-        Filesystem::unlink('_site/docs/search.json');
-    }
-
-    public function test_save_method_saves_the_file_to_the_correct_location()
-    {
-        GeneratesDocumentationSearchIndex::handle();
-
-        $this->assertFileExists('_site/docs/search.json');
-
-        Filesystem::unlink('_site/docs/search.json');
+        $this->assertSame('[]', GeneratesDocumentationSearchIndex::handle());
     }
 
     public function test_it_generates_a_valid_JSON()
@@ -134,10 +118,6 @@ public function test_nested_source_files_do_not_retain_directory_name_in_search_
 
     protected function getArray(): array
     {
-        GeneratesDocumentationSearchIndex::handle();
-        $array = json_decode(file_get_contents('_site/docs/search.json'), true);
-        Filesystem::unlink('_site/docs/search.json');
-
-        return $array;
+        return json_decode(GeneratesDocumentationSearchIndex::handle(), true);
     }
 }

From b868613ff66502798a36f7ab34347f6831a84f21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Dec 2023 14:42:04 +0100
Subject: [PATCH 0065/2811] Format long line

---
 .../Framework/Actions/GeneratesDocumentationSearchIndex.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 17f9a103474..7cd75691d9d 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -78,6 +78,8 @@ protected function formatDestination(string $slug): string
 
     protected function getPagesToExcludeFromSearch(): array
     {
-        return array_merge(Config::getArray('docs.exclude_from_search', []), Config::getBool('docs.create_search_page', true) ? ['search'] : []);
+        return array_merge(Config::getArray('docs.exclude_from_search', []),
+            Config::getBool('docs.create_search_page', true) ? ['search'] : []
+        );
     }
 }

From f72e5038e4f5fcb5c4299a934d91f3ace15c3a5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Dec 2023 16:39:04 +0100
Subject: [PATCH 0066/2811] Remove legacy assertions

The change in behaviour has been documented, so we can remove the disabled legacy assertions
---
 .../tests/Feature/Commands/BuildSearchCommandTest.php          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 2ba0891886e..6accb4a1370 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -117,13 +117,10 @@ public function test_command_uses_search_pages_from_kernel_when_present()
         $this->artisan('build:search')->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/docs/search.json'));
-//        $this->assertFileExists(Hyde::path('_site/docs/search.html'));
 
         $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
-//        $this->assertSame('Foo', Filesystem::getContents('_site/docs/search.html'));
 
         Filesystem::unlink('_site/docs/search.json');
-//        Filesystem::unlink('_site/docs/search.html');
     }
 }
 

From ac269982ab9051b54822bbc14336a2d445739958 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:01:46 +0100
Subject: [PATCH 0067/2811] Create TransferMediaAssets.php

---
 .../Actions/PreBuildTasks/TransferMediaAssets.php    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
new file mode 100644
index 00000000000..a36d8ce9a72
--- /dev/null
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Actions\PreBuildTasks;
+
+use Hyde\Framework\Features\BuildTasks\PreBuildTask;
+
+class TransferMediaAssets extends PreBuildTask
+{
+    //
+}

From 6b67a3cce61b1591a234a44452066aa6f4b321f0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:03:04 +0100
Subject: [PATCH 0068/2811] Set message

---
 .../src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index a36d8ce9a72..657fa9ffac3 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -8,5 +8,5 @@
 
 class TransferMediaAssets extends PreBuildTask
 {
-    //
+    protected static string $message = 'Transferring Media Assets';
 }

From 2259a40b3fff6323aad2a63a32429c4599758fb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:03:08 +0100
Subject: [PATCH 0069/2811] Register task

---
 packages/framework/src/Framework/Services/BuildTaskService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index d2eb432a015..c65452ef09d 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -13,6 +13,7 @@
 use Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
+use Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Str;
@@ -132,6 +133,7 @@ protected function makeTaskIdentifier(BuildTask $class): string
     private function registerFrameworkTasks(): void
     {
         $this->registerIf(CleanSiteDirectory::class, $this->canCleanSiteDirectory());
+        $this->registerTask(TransferMediaAssets::class);
         $this->registerIf(GenerateBuildManifest::class, $this->canGenerateManifest());
         $this->registerIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $this->registerIf(GenerateRssFeed::class, $this->canGenerateFeed());

From cfb9148e8d5feefc97935b628e95f4cb16e3e714 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:06:57 +0100
Subject: [PATCH 0070/2811] Move media asset transfer logic to build task

---
 .../PreBuildTasks/TransferMediaAssets.php        | 16 ++++++++++++++++
 .../src/Framework/Services/BuildService.php      | 15 +--------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index 657fa9ffac3..025c0ee7bcc 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -4,9 +4,25 @@
 
 namespace Hyde\Framework\Actions\PreBuildTasks;
 
+use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
+use Hyde\Framework\Concerns\InteractsWithDirectories;
 
 class TransferMediaAssets extends PreBuildTask
 {
     protected static string $message = 'Transferring Media Assets';
+
+    use InteractsWithDirectories;
+
+    public function handle(): void
+    {
+        $this->needsDirectory(Hyde::siteMediaPath());
+
+        $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
+            $sitePath = Hyde::siteMediaPath($identifier);
+            $this->needsParentDirectory($sitePath);
+            copy(Hyde::mediaPath($identifier), $sitePath);
+        });
+    }
 }
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 83c2686e011..55a59ef4937 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -8,9 +8,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\Concerns\HydePage;
-use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Support\Models\Route;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
@@ -18,7 +16,6 @@
 use function class_basename;
 use function preg_replace;
 use function collect;
-use function copy;
 
 /**
  * Moves logic from the build command to a service.
@@ -30,7 +27,6 @@
 class BuildService
 {
     use InteractsWithIO;
-    use InteractsWithDirectories;
 
     protected RouteCollection $router;
 
@@ -50,16 +46,7 @@ public function compileStaticPages(): void
 
     public function transferMediaAssets(): void
     {
-        $this->needsDirectory(Hyde::siteMediaPath());
-
-        $this->comment('Transferring Media Assets...');
-        $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
-            $sitePath = Hyde::siteMediaPath($identifier);
-            $this->needsParentDirectory($sitePath);
-            copy(Hyde::mediaPath($identifier), $sitePath);
-        });
-
-        $this->newLine(2);
+        //
     }
 
     /**

From 4413fdf03e135c3e7c66ae098b3044dfb261cdaf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:19:27 +0100
Subject: [PATCH 0071/2811] Disable finishing message

---
 .../Framework/Actions/PreBuildTasks/TransferMediaAssets.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index 025c0ee7bcc..76117cc9375 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -25,4 +25,9 @@ public function handle(): void
             copy(Hyde::mediaPath($identifier), $sitePath);
         });
     }
+
+    public function printFinishMessage(): void
+    {
+        // We don't need a finish message for this task.
+    }
 }

From 2a5bd9df9b92d33aba09b3da265cd1d54679aa5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:23:54 +0100
Subject: [PATCH 0072/2811] Newline is required for progress bar not to clear
 message

For some reason the start message is stripped by the progress bar otherwise
---
 .../src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index 76117cc9375..c072f603045 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -19,6 +19,8 @@ public function handle(): void
     {
         $this->needsDirectory(Hyde::siteMediaPath());
 
+        $this->newLine();
+
         $this->withProgressBar(MediaFile::files(), function (string $identifier): void {
             $sitePath = Hyde::siteMediaPath($identifier);
             $this->needsParentDirectory($sitePath);

From 756bb7d4f11ee88944ad54c4c12b41db1333dcf5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:24:20 +0100
Subject: [PATCH 0073/2811] Add newline after progress bar

Just for style
---
 .../src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
index c072f603045..fdec03a75ff 100644
--- a/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
+++ b/packages/framework/src/Framework/Actions/PreBuildTasks/TransferMediaAssets.php
@@ -26,6 +26,8 @@ public function handle(): void
             $this->needsParentDirectory($sitePath);
             copy(Hyde::mediaPath($identifier), $sitePath);
         });
+
+        $this->newLine();
     }
 
     public function printFinishMessage(): void

From 2420e20e8ff29969280e971582bf01de7393805a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:31:28 +0100
Subject: [PATCH 0074/2811] Update command to use new build task

---
 .../framework/src/Console/Commands/RebuildPageCommand.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/RebuildPageCommand.php b/packages/framework/src/Console/Commands/RebuildPageCommand.php
index 1ac5e920fbb..715ac6a6696 100644
--- a/packages/framework/src/Console/Commands/RebuildPageCommand.php
+++ b/packages/framework/src/Console/Commands/RebuildPageCommand.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\Facades\Pages;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
-use Hyde\Framework\Services\BuildService;
+use Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
@@ -37,7 +37,7 @@ class RebuildPageCommand extends Command
     public function handle(): int
     {
         if ($this->argument('path') === Hyde::getMediaDirectory()) {
-            (new BuildService($this->getOutput()))->transferMediaAssets();
+            return (new TransferMediaAssets())->run($this->output);
 
             $this->info('All done!');
 

From fc4146de37d08b6958fafa86fd8ea27310cc3b37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:40:32 +0100
Subject: [PATCH 0075/2811] Update unit test to expect media transfer action

---
 .../tests/Unit/BuildTaskServiceUnitTest.php   | 70 +++++++++++++++----
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
index bcf14ff42a2..df6293de9ea 100644
--- a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Kernel\Filesystem;
+use Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap as FrameworkGenerateSitemap;
@@ -50,49 +51,75 @@ public function testConstruct()
 
     public function testGetTasks()
     {
-        $this->assertSame([], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testGetTasksWithTaskRegisteredInConfig()
     {
-        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [TestBuildTask::class]]));
-        $this->assertSame([TestBuildTask::class], $this->createService()->getRegisteredTasks());
+        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ]]));
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ], $this->createService()->getRegisteredTasks());
     }
 
     public function testRegisterTask()
     {
         $this->service->registerTask(TestBuildTask::class);
-        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterPreBuildTask()
     {
         $this->service->registerTask(TestPreBuildTask::class);
-        $this->assertSame([TestPreBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestPreBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterPostBuildTask()
     {
         $this->service->registerTask(TestPostBuildTask::class);
-        $this->assertSame([TestPostBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestPostBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedTask()
     {
         $this->service->registerTask(new TestBuildTask());
-        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedPreBuildTask()
     {
         $this->service->registerTask(new TestPreBuildTask());
-        $this->assertSame([TestPreBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestPreBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedPostBuildTask()
     {
         $this->service->registerTask(new TestPostBuildTask());
-        $this->assertSame([TestPostBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestPostBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterTaskWithInvalidClassTypeThrowsException()
@@ -118,22 +145,34 @@ public function testRegisterTaskWithAlreadyRegisteredTask()
         $this->service->registerTask(TestBuildTask::class);
         $this->service->registerTask(TestBuildTask::class);
 
-        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterTaskWithTaskAlreadyRegisteredInConfig()
     {
-        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [TestBuildTask::class]]));
+        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ]]));
         $this->createService();
 
         $this->service->registerTask(TestBuildTask::class);
-        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            TestBuildTask::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testCanRegisterFrameworkTasks()
     {
         $this->service->registerTask(FrameworkGenerateSitemap::class);
-        $this->assertSame([FrameworkGenerateSitemap::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            FrameworkGenerateSitemap::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testCanOverloadFrameworkTasks()
@@ -141,7 +180,10 @@ public function testCanOverloadFrameworkTasks()
         $this->service->registerTask(FrameworkGenerateSitemap::class);
         $this->service->registerTask(GenerateSitemap::class);
 
-        $this->assertSame([GenerateSitemap::class], $this->service->getRegisteredTasks());
+        $this->assertSame([
+            TransferMediaAssets::class,
+            GenerateSitemap::class
+        ], $this->service->getRegisteredTasks());
     }
 
     public function testSetOutputWithNull()

From ee94ef80e6ee2d0c5b0d047353dd3c28c664c76a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:41:20 +0100
Subject: [PATCH 0076/2811] Add "hidden" config option to disable the media
 asset transfer

Let's us skip it in tests
---
 .../framework/src/Framework/Services/BuildTaskService.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index c65452ef09d..78176329d89 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -133,7 +133,7 @@ protected function makeTaskIdentifier(BuildTask $class): string
     private function registerFrameworkTasks(): void
     {
         $this->registerIf(CleanSiteDirectory::class, $this->canCleanSiteDirectory());
-        $this->registerTask(TransferMediaAssets::class);
+        $this->registerIf(TransferMediaAssets::class, $this->canTransferMediaAssets());
         $this->registerIf(GenerateBuildManifest::class, $this->canGenerateManifest());
         $this->registerIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $this->registerIf(GenerateRssFeed::class, $this->canGenerateFeed());
@@ -144,6 +144,11 @@ private function canCleanSiteDirectory(): bool
         return Config::getBool('hyde.empty_output_directory', true);
     }
 
+    private function canTransferMediaAssets(): bool
+    {
+        return Config::getBool('hyde.transfer_media_assets', true);
+    }
+
     private function canGenerateManifest(): bool
     {
         return Config::getBool('hyde.generate_build_manifest', true);

From 5e8d7987c823b246a64215afff70f4c6ff2c627b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:41:26 +0100
Subject: [PATCH 0077/2811] Revert "Update unit test to expect media transfer
 action"

This reverts commit fc4146de37d08b6958fafa86fd8ea27310cc3b37.
---
 .../tests/Unit/BuildTaskServiceUnitTest.php   | 70 ++++---------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
index df6293de9ea..bcf14ff42a2 100644
--- a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Kernel\Filesystem;
-use Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap as FrameworkGenerateSitemap;
@@ -51,75 +50,49 @@ public function testConstruct()
 
     public function testGetTasks()
     {
-        $this->assertSame([
-            TransferMediaAssets::class,
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([], $this->service->getRegisteredTasks());
     }
 
     public function testGetTasksWithTaskRegisteredInConfig()
     {
-        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ]]));
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ], $this->createService()->getRegisteredTasks());
+        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [TestBuildTask::class]]));
+        $this->assertSame([TestBuildTask::class], $this->createService()->getRegisteredTasks());
     }
 
     public function testRegisterTask()
     {
         $this->service->registerTask(TestBuildTask::class);
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterPreBuildTask()
     {
         $this->service->registerTask(TestPreBuildTask::class);
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestPreBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestPreBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterPostBuildTask()
     {
         $this->service->registerTask(TestPostBuildTask::class);
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestPostBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestPostBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedTask()
     {
         $this->service->registerTask(new TestBuildTask());
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedPreBuildTask()
     {
         $this->service->registerTask(new TestPreBuildTask());
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestPreBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestPreBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterInstantiatedPostBuildTask()
     {
         $this->service->registerTask(new TestPostBuildTask());
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestPostBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestPostBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterTaskWithInvalidClassTypeThrowsException()
@@ -145,34 +118,22 @@ public function testRegisterTaskWithAlreadyRegisteredTask()
         $this->service->registerTask(TestBuildTask::class);
         $this->service->registerTask(TestBuildTask::class);
 
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testRegisterTaskWithTaskAlreadyRegisteredInConfig()
     {
-        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ]]));
+        self::mockConfig(array_merge(config()->all(), ['hyde.build_tasks' => [TestBuildTask::class]]));
         $this->createService();
 
         $this->service->registerTask(TestBuildTask::class);
-        $this->assertSame([
-            TransferMediaAssets::class,
-            TestBuildTask::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([TestBuildTask::class], $this->service->getRegisteredTasks());
     }
 
     public function testCanRegisterFrameworkTasks()
     {
         $this->service->registerTask(FrameworkGenerateSitemap::class);
-        $this->assertSame([
-            TransferMediaAssets::class,
-            FrameworkGenerateSitemap::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([FrameworkGenerateSitemap::class], $this->service->getRegisteredTasks());
     }
 
     public function testCanOverloadFrameworkTasks()
@@ -180,10 +141,7 @@ public function testCanOverloadFrameworkTasks()
         $this->service->registerTask(FrameworkGenerateSitemap::class);
         $this->service->registerTask(GenerateSitemap::class);
 
-        $this->assertSame([
-            TransferMediaAssets::class,
-            GenerateSitemap::class
-        ], $this->service->getRegisteredTasks());
+        $this->assertSame([GenerateSitemap::class], $this->service->getRegisteredTasks());
     }
 
     public function testSetOutputWithNull()

From fd9b173ab366a7c96c70153b7f0559eda7e748d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:42:00 +0100
Subject: [PATCH 0078/2811] Don't transfer media assets for unit test

---
 packages/framework/tests/Unit/BuildTaskServiceUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
index bcf14ff42a2..aea5acbc22b 100644
--- a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
@@ -39,6 +39,7 @@ protected function setUp(): void
         self::mockConfig(['hyde' => [
             'empty_output_directory' => false,
             'generate_build_manifest' => false,
+            'transfer_media_assets' => false,
         ]]);
         $this->createService();
     }

From 3fca01781a29d1977e27c9b0d03d1eb2c3f1b467 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 12:57:53 +0100
Subject: [PATCH 0079/2811] Remove method `BuildService::transferMediaAssets()`

Deprecated in https://github.com/hydephp/develop/pull/1533
---
 packages/framework/src/Console/Commands/BuildSiteCommand.php | 2 --
 packages/framework/src/Framework/Services/BuildService.php   | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 263ca07c495..cfa73df8a74 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -50,8 +50,6 @@ public function handle(): int
 
         $this->runPreBuildActions();
 
-        $this->service->transferMediaAssets();
-
         $this->service->compileStaticPages();
 
         $this->runPostBuildActions();
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 55a59ef4937..e275ed2dd39 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -44,11 +44,6 @@ public function compileStaticPages(): void
         });
     }
 
-    public function transferMediaAssets(): void
-    {
-        //
-    }
-
     /**
      * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $pageClass
      */

From cd0365ea98e554513a4061e28ab89c04dd52eeed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 13:05:27 +0100
Subject: [PATCH 0080/2811] Formatting

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1c266190574..6bd754eadc7 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -53,7 +53,7 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 - If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
   that page will no longer be built when using the specific `build:search` command. It will, of course, 
   be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
-- 
+ 
 - In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced

From 301f1035c4be358456795038e40dde89bc7b9c16 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 13:15:08 +0100
Subject: [PATCH 0081/2811] Improve upgrade guide

---
 RELEASE_NOTES.md | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6bd754eadc7..f043bf70b30 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -29,9 +29,17 @@ This serves two purposes:
 
 ### Upgrade Guide
 
-If there are any breaking changes, include an upgrade guide here.
+Please see the "Breaking changes & upgrade guide" section below for more information.
 
-#### Documentation search page changes
+## Breaking changes & upgrade guide
+
+<!-- Editors note: The following will be part of the documentation and not the changelog, which is why the heading levels are reset. -->
+
+Please read through this section to ensure your site upgrades smoothly.
+
+## General impact
+
+### Documentation search page changes
 
 The documentation search page and search index have been changed to be generated as `InMemoryPages` instead of a post-build task.
 
@@ -42,9 +50,12 @@ want to adapt your code to interact with the new `InMemoryPage`, which is genera
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
 
-### Breaking changes
+## Low impact
+
+### New documentation search implementation
 
-#### Low impact
+As the new documentation search implementation brings changes to their code API you may need to adapt your code
+according to the information below in case you wrote custom code that interacted with these parts of the codebase.
 
 - The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
   you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,

From a5d47507b7147c44f5f623de9d84f8734ea45834 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 13:56:45 +0100
Subject: [PATCH 0082/2811] Update test to use new build task

---
 .../Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index d02b3851b63..5dfec04d50f 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -9,6 +9,7 @@
 use Hyde\Framework\Services\BuildService;
 use Illuminate\Console\OutputStyle;
 use Mockery;
+use Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets;
 use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 use Symfony\Component\Console\Helper\ProgressBar;
 
@@ -92,7 +93,7 @@ public function test_relative_links_across_pages_retains_integrity()
             'write' => null,
         ]));
 
-        $service->transferMediaAssets();
+        (new TransferMediaAssets())->run();
         $service->compileStaticPages();
 
         $this->assertSee('root', [

From 27ef8fbcb6d33ae98c3f3bd9e7cbe0bd953724ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 14:03:49 +0100
Subject: [PATCH 0083/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f043bf70b30..c6a42fe904d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,16 +10,18 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
-- for new features.
+- Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
+- Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 
 ### Deprecated
 - for soon-to-be removed features.
 
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
+- Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
 
 ### Fixed
 - for any bug fixes.
@@ -68,3 +70,17 @@ according to the information below in case you wrote custom code that interacted
 - In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
+
+### Media asset transfers
+
+The internals of how media asset files are copied during the build process have been changed. For most users, this change
+has no impact. However, if you have previously extended this method, or called it directly from your custom code,
+you will need to adapt your code to use the new `TransferMediaAssets` build task.
+
+For example, if you triggered the media transfer with a build service method call, use the new build task instead:
+
+```php
+(new BuildService)->transferMediaAssets();
+
+(new TransferMediaAssets())->run();
+```

From 7e2d3d5c979f10f865639df46e5790ce72c6d19f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 14:04:05 +0100
Subject: [PATCH 0084/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c6a42fe904d..42b678e6888 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -71,7 +71,7 @@ according to the information below in case you wrote custom code that interacted
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
 
-### Media asset transfers
+### Media asset transfer implementation changes
 
 The internals of how media asset files are copied during the build process have been changed. For most users, this change
 has no impact. However, if you have previously extended this method, or called it directly from your custom code,

From 91829ea601a9e0ce550327da8321c842b0e5aec4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:11:49 +0100
Subject: [PATCH 0085/2811] Only render semantic documentation article markup
 when truthy

---
 .../docs/documentation-article.blade.php      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/documentation-article.blade.php b/packages/framework/resources/views/components/docs/documentation-article.blade.php
index 328f370982d..56c71641771 100644
--- a/packages/framework/resources/views/components/docs/documentation-article.blade.php
+++ b/packages/framework/resources/views/components/docs/documentation-article.blade.php
@@ -5,16 +5,18 @@
 <article id="document" itemscope itemtype="https://schema.org/Article" @class([
         'mx-auto lg:ml-8 max-w-3xl p-12 md:px-16 max-w-[1000px] min-h-[calc(100vh_-_4rem)]',
         config('markdown.prose_classes', 'prose dark:prose-invert'),
-        'torchlight-enabled' => $article->hasTorchlight()])>
+        'torchlight-enabled' => $article && $article->hasTorchlight()])>
     @yield('content')
 
-    <header id="document-header" class="flex items-center flex-wrap justify-between prose-h1:mb-3">
-        {{ $article->renderHeader() }}
-    </header>
-    <section id="document-main-content" itemprop="articleBody">
-        {{ $article->renderBody() }}
-    </section>
-    <footer id="document-footer" class="flex items-center flex-wrap mt-8 prose-p:my-3 justify-between text-[90%]">
-        {{ $article->renderFooter() }}
-    </footer>
+    @if ($article)
+        <header id="document-header" class="flex items-center flex-wrap justify-between prose-h1:mb-3">
+            {{ $article->renderHeader() }}
+        </header>
+        <section id="document-main-content" itemprop="articleBody">
+            {{ $article->renderBody() }}
+        </section>
+        <footer id="document-footer" class="flex items-center flex-wrap mt-8 prose-p:my-3 justify-between text-[90%]">
+            {{ $article->renderFooter() }}
+        </footer>
+    @endif
 </article>
\ No newline at end of file

From e1f010c129bf75f97d22754dbb124e138c5e7f37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:12:14 +0100
Subject: [PATCH 0086/2811] Update documentation search page to set article to
 false

---
 .../Features/Documentation/DocumentationSearchPage.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 7db4a83ca97..e31ae29d1a1 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -39,7 +39,7 @@ public function __construct()
         parent::__construct(static::routeKey(), [
             'title' => 'Search',
             'navigation' => ['hidden' => true],
-            'article' => $this->makeArticle(),
+            'article' => false,
         ], view: 'hyde::pages.documentation-search');
     }
 

From 7df529e085a02bce6b1425e3a5dc9c98c60177e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:12:24 +0100
Subject: [PATCH 0087/2811] Remove now unused internal experimental method

---
 .../Features/Documentation/DocumentationSearchPage.php      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index e31ae29d1a1..61f4b2e8930 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -59,10 +59,4 @@ protected static function anotherSearchPageExists(): bool
         // we need to check the page collection directly, instead of the route collection.
         return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
     }
-
-    /** @experimental Fixes type issue {@see https://github.com/hydephp/develop/commit/37f7046251b8c0514b8d8ef821de4ef3d35bbac8#commitcomment-135026537} */
-    protected function makeArticle(): SemanticDocumentationArticle
-    {
-        return SemanticDocumentationArticle::make(new DocumentationPage());
-    }
 }

From 9febd5dd0a12bf4b62873d36c0a16431711e0d76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:20:19 +0100
Subject: [PATCH 0088/2811] Update search page test to test the rendered HTML

---
 .../Feature/DocumentationSearchPageTest.php   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index e7a2adc4dc3..2a237064dbc 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -76,4 +76,34 @@ public function testStaticRouteKeyHelperWithRootOutputDirectory()
         DocumentationPage::setOutputDirectory('');
         $this->assertSame('search', DocumentationSearchPage::routeKey());
     }
+
+    public function testCanRenderSearchPage()
+    {
+        $page = new DocumentationSearchPage();
+
+        Hyde::shareViewData($page);
+        $this->assertStringContainsString('<h1>Search the documentation site</h1>', $page->compile());
+    }
+
+    public function testRenderedSearchPageUsesDocumentationPageLayout()
+    {
+        $page = new DocumentationSearchPage();
+
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $this->assertStringContainsString('<body id="hyde-docs"', $html);
+    }
+
+    public function testRenderedSearchPageDoesNotUseSemanticDocumentationMarkup()
+    {
+        $page = new DocumentationSearchPage();
+
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $this->assertStringNotContainsString('<header id="document-header"', $html);
+        $this->assertStringNotContainsString('<section id="document-main-content"', $html);
+        $this->assertStringNotContainsString('<footer id="document-footer"', $html);
+    }
 }

From 886c9c6a9ecb752acd90d1b5d6dadced985f0a36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:20:21 +0100
Subject: [PATCH 0089/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 42b678e6888..99512f0f661 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,6 +15,7 @@ This serves two purposes:
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
+- Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 
 ### Deprecated
 - for soon-to-be removed features.

From 193feff11a863ceed686e66b6a5e2ae74e845159 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:49:25 +0100
Subject: [PATCH 0090/2811] Create NavigationMenus.php

---
 .../Framework/Features/Navigation/NavigationMenus.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationMenus.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
new file mode 100644
index 00000000000..851e36bc5d6
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenus
+{
+    //
+}

From f7f96bada621e6ded9a64f3ca5c789f70d50b58c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:50:35 +0100
Subject: [PATCH 0091/2811] Create NavigationMenusTest.php

---
 .../tests/Feature/NavigationMenusTest.php         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationMenusTest.php

diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationMenusTest.php
new file mode 100644
index 00000000000..7ccd5d5973f
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationMenusTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenus
+ */
+class NavigationMenusTest extends TestCase
+{
+    //
+}

From 018aaa138fcb26c2a3e9b8c24375485186a6b1ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:49:44 +0100
Subject: [PATCH 0092/2811] Add PHPDoc

---
 .../src/Framework/Features/Navigation/NavigationMenus.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index 851e36bc5d6..a04ccafb587 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * Interact with the navigation menus for the project.
+ */
 class NavigationMenus
 {
     //

From 92f01418fb8cc3485cd302dfe46932414975a259 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 15:57:17 +0100
Subject: [PATCH 0093/2811] Remove unused internal generate method

---
 RELEASE_NOTES.md                                      |  1 +
 .../Documentation/DocumentationSearchPage.php         | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 99512f0f661..2cc8b136fc6 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,6 +23,7 @@ This serves two purposes:
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
+- Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed
 - for any bug fixes.
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 61f4b2e8930..21c440102e3 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -9,7 +9,6 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\RouteKey;
-use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
 
 /**
@@ -21,16 +20,6 @@
  */
 class DocumentationSearchPage extends InMemoryPage
 {
-    /**
-     * Generate the search page and save it to disk.
-     *
-     * @return string The path to the generated file.
-     */
-    public static function generate(): string
-    {
-        return StaticPageBuilder::handle(new static());
-    }
-
     /**
      * Create a new DocumentationSearchPage instance.
      */

From bd638057ab21f2b73f971ccf8eec6a91054d5213 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 16:00:58 +0100
Subject: [PATCH 0094/2811] Add menus array to the new navigation menus class

---
 .../src/Framework/Features/Navigation/NavigationMenus.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index a04ccafb587..53b36fceff1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -9,5 +9,10 @@
  */
 class NavigationMenus
 {
-    //
+    /**
+     * The menus that are available for the project, keyed by their name identifier.
+     *
+     * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
+     */
+    protected array $menus = [];
 }

From 6a318c3a6f0a8dfb5c9e8e28cc813477b37d9cf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 16:03:11 +0100
Subject: [PATCH 0095/2811] Sketch out base contract

---
 .../Features/Navigation/NavigationMenus.php      | 16 ++++++++++++++++
 .../tests/Feature/NavigationMenusTest.php        | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
index 53b36fceff1..31ffdb366d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
@@ -15,4 +15,20 @@ class NavigationMenus
      * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
      */
     protected array $menus = [];
+
+    /**
+     * Register a new menu for the project.
+     */
+    public function registerMenu(string $name, BaseNavigationMenu $menu): void
+    {
+        $this->menus[$name] = $menu;
+    }
+
+    /**
+     * Get a menu by its name.
+     */
+    public function getMenu(string $name): BaseNavigationMenu
+    {
+        return $this->menus[$name];
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationMenusTest.php
index 7ccd5d5973f..90612248389 100644
--- a/packages/framework/tests/Feature/NavigationMenusTest.php
+++ b/packages/framework/tests/Feature/NavigationMenusTest.php
@@ -11,5 +11,13 @@
  */
 class NavigationMenusTest extends TestCase
 {
-    //
+    public function testRegisterMenu()
+    {
+        // Todo
+    }
+
+    public function testGetMenu()
+    {
+        // Todo
+    }
 }

From 068df5fe966c231c4a5fc47da3884e71cc30ca6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:04:53 +0100
Subject: [PATCH 0096/2811] Rename class to NavigationManager

---
 .../Navigation/{NavigationMenus.php => NavigationManager.php} | 2 +-
 .../{NavigationMenusTest.php => NavigationManagerTest.php}    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavigationMenus.php => NavigationManager.php} (96%)
 rename packages/framework/tests/Feature/{NavigationMenusTest.php => NavigationManagerTest.php} (69%)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
similarity index 96%
rename from packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 31ffdb366d4..45485f32043 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenus.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -7,7 +7,7 @@
 /**
  * Interact with the navigation menus for the project.
  */
-class NavigationMenus
+class NavigationManager
 {
     /**
      * The menus that are available for the project, keyed by their name identifier.
diff --git a/packages/framework/tests/Feature/NavigationMenusTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
similarity index 69%
rename from packages/framework/tests/Feature/NavigationMenusTest.php
rename to packages/framework/tests/Feature/NavigationManagerTest.php
index 90612248389..09baf01df1e 100644
--- a/packages/framework/tests/Feature/NavigationMenusTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -7,9 +7,9 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenus
+ * @covers \Hyde\Framework\Features\Navigation\NavigationManager
  */
-class NavigationMenusTest extends TestCase
+class NavigationManagerTest extends TestCase
 {
     public function testRegisterMenu()
     {

From 6064b5ddb468f832d000a497974682368fae2365 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:05:13 +0100
Subject: [PATCH 0097/2811] Update PHPDoc for renamed class

---
 .../src/Framework/Features/Navigation/NavigationManager.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 45485f32043..677a9264082 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 /**
- * Interact with the navigation menus for the project.
+ * Manages the navigation menus for the project.
  */
 class NavigationManager
 {

From 79b82d506b129add9c28b36c96df48c950b8a499 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:20:53 +0100
Subject: [PATCH 0098/2811] Copilot generate tests

---
 .../tests/Feature/NavigationManagerTest.php   | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 09baf01df1e..9380eefd8f1 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -11,13 +13,45 @@
  */
 class NavigationManagerTest extends TestCase
 {
+    protected NavigationManager $navigationManager;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->navigationManager = new NavigationManager();
+    }
+
+    /** @author Copilot */
     public function testRegisterMenu()
     {
-        // Todo
+        $menu = $this->createMock(BaseNavigationMenu::class);
+        $this->navigationManager->registerMenu('test', $menu);
+
+        $reflection = new \ReflectionClass($this->navigationManager);
+        $property = $reflection->getProperty('menus');
+        $property->setAccessible(true);
+
+        $menus = $property->getValue($this->navigationManager);
+
+        $this->assertArrayHasKey('test', $menus);
+        $this->assertSame($menu, $menus['test']);
     }
 
+    /** @author Copilot */
     public function testGetMenu()
     {
-        // Todo
+        $menu = $this->createMock(BaseNavigationMenu::class);
+        $this->navigationManager->registerMenu('test', $menu);
+
+        $retrievedMenu = $this->navigationManager->getMenu('test');
+
+        $this->assertSame($menu, $retrievedMenu);
+    }
+
+    /** @author Copilot */
+    public function testGetMenuThrowsExceptionForNonExistentMenu()
+    {
+        $this->expectException(\Exception::class);
+        $this->navigationManager->getMenu('nonexistent');
     }
 }

From ae9859911e984bd28b30301481457bddd7dcdb3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 17:25:16 +0100
Subject: [PATCH 0099/2811] Clean up generated test

---
 .../tests/Feature/NavigationManagerTest.php   | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 9380eefd8f1..6b622349cb8 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -13,45 +13,39 @@
  */
 class NavigationManagerTest extends TestCase
 {
-    protected NavigationManager $navigationManager;
-
-    protected function setUp(): void
+    public function testCanRegisterMenu()
     {
-        parent::setUp();
-        $this->navigationManager = new NavigationManager();
-    }
+        $manager = new NavigationManager();
 
-    /** @author Copilot */
-    public function testRegisterMenu()
-    {
         $menu = $this->createMock(BaseNavigationMenu::class);
-        $this->navigationManager->registerMenu('test', $menu);
+        $manager->registerMenu('foo', $menu);
 
-        $reflection = new \ReflectionClass($this->navigationManager);
+        $reflection = new \ReflectionClass($manager);
         $property = $reflection->getProperty('menus');
-        $property->setAccessible(true);
 
-        $menus = $property->getValue($this->navigationManager);
+        $menus = $property->getValue($manager);
 
-        $this->assertArrayHasKey('test', $menus);
-        $this->assertSame($menu, $menus['test']);
+        $this->assertArrayHasKey('foo', $menus);
+        $this->assertSame($menu, $menus['foo']);
     }
 
-    /** @author Copilot */
-    public function testGetMenu()
+    public function testCanGetMenu()
     {
+        $manager = new NavigationManager();
+
         $menu = $this->createMock(BaseNavigationMenu::class);
-        $this->navigationManager->registerMenu('test', $menu);
+        $manager->registerMenu('foo', $menu);
 
-        $retrievedMenu = $this->navigationManager->getMenu('test');
+        $retrievedMenu = $manager->getMenu('foo');
 
         $this->assertSame($menu, $retrievedMenu);
     }
 
-    /** @author Copilot */
     public function testGetMenuThrowsExceptionForNonExistentMenu()
     {
+        $manager = new NavigationManager();
+
         $this->expectException(\Exception::class);
-        $this->navigationManager->getMenu('nonexistent');
+        $manager->getMenu('foo');
     }
 }

From 7edcb821aecdb44ca858320fc3383c131f9b073d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:42:22 +0100
Subject: [PATCH 0100/2811] Breaking: Rename class `NavigationMenu` to
 `MainNavigationMenu`

---
 docs/digging-deeper/navigation.md             |  4 +-
 .../views/layouts/navigation.blade.php        |  2 +-
 ...igationMenu.php => MainNavigationMenu.php} |  2 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 ...enuTest.php => MainNavigationMenuTest.php} | 64 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php |  2 +-
 .../Unit/Views/NavigationBrandViewTest.php    |  4 +-
 7 files changed, 40 insertions(+), 40 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavigationMenu.php => MainNavigationMenu.php} (97%)
 rename packages/framework/tests/Feature/{NavigationMenuTest.php => MainNavigationMenuTest.php} (86%)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a9d865d45df..10d3ba73c90 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -296,11 +296,11 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 While not required to know, you may find it interesting to learn more about how the navigation is handled internally.
 The best way to learn about this is to look at the source code, so here is a high-level overview with details on where to look in the source code.
 
-The main navigation menu is the `NavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
+The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
 Both extend the same `BaseNavigationMenu` class:
 
 ```php
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 ```
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 17707d5e10a..3324c3a79f2 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = \Hyde\Framework\Features\Navigation\NavigationMenu::create();
+    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
similarity index 97%
rename from packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
rename to packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index bcc844dca75..084cc2e19cd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -9,7 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
-class NavigationMenu extends BaseNavigationMenu
+class MainNavigationMenu extends BaseNavigationMenu
 {
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7a57b554282..d3b39db3dca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -11,7 +11,7 @@
 use Stringable;
 
 /**
- * Abstraction for a navigation menu item. Used by the NavigationMenu and DocumentationSidebar classes.
+ * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/MainNavigationMenuTest.php
similarity index 86%
rename from packages/framework/tests/Feature/NavigationMenuTest.php
rename to packages/framework/tests/Feature/MainNavigationMenuTest.php
index a6c2a18501b..c7bb9bd1826 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/MainNavigationMenuTest.php
@@ -12,7 +12,7 @@
 
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
@@ -21,24 +21,24 @@
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  */
-class NavigationMenuTest extends TestCase
+class MainNavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, NavigationMenu::create());
+        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, NavigationMenu::create()->items);
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(NavigationMenu::create()->items, NavigationMenu::create()->getItems());
+        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -47,7 +47,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], NavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -55,7 +55,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], NavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -63,7 +63,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -79,7 +79,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -92,14 +92,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, NavigationMenu::create()->items);
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -114,7 +114,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -132,7 +132,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -150,7 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -167,7 +167,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -183,7 +183,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->items);
@@ -212,7 +212,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(NavigationMenu::create()->hasDropdowns());
+        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -362,7 +362,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
 
         $this->assertCount(3, $menu->items);
         $this->assertEquals([
@@ -382,7 +382,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = NavigationMenu::create();
+        $menu = MainNavigationMenu::create();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 379fbf581eb..6ab0458ee1b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -17,7 +17,7 @@
 
 /**
  * This unit test covers the basics of the NavItem class.
- * For the full feature test, see the NavigationMenuTest class.
+ * For the full feature test, see the MainNavigationMenuTest class.
  *
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  *
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 577295f5cf0..b34478273d6 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => NavigationMenu::create(),
+            'navigation' => MainNavigationMenu::create(),
         ])->render();
     }
 

From 0873f53dc8e404984ae8c1ab7b476c2c2c9b6f8f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:43:38 +0100
Subject: [PATCH 0101/2811] Create NavigationMenu.php

---
 .../Framework/Features/Navigation/NavigationMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
new file mode 100644
index 00000000000..418a992bd4f
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenu
+{
+    //
+}

From 64e14590e83c0a74fbc0a6cc76297dea44ce9b93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:45:21 +0100
Subject: [PATCH 0102/2811] Create NavigationMenuTest.php

---
 .../tests/Feature/NavigationMenuTest.php          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationMenuTest.php

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
new file mode 100644
index 00000000000..b75fa735190
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ */
+class NavigationMenuTest extends TestCase
+{
+    //
+}

From e658b6383eaf4535c17a9dd9fbe6973f9a9f453a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 18:47:47 +0100
Subject: [PATCH 0103/2811] Add protected items collection

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 418a992bd4f..2667031b7a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,10 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 class NavigationMenu
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
 }

From 5f6458fcd05fb8eb344e22540d049cd8f3f20288 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:37 +0100
Subject: [PATCH 0104/2811] Deprecate class `BaseNavigationMenu`

---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d802662c974..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -11,6 +11,7 @@
 
 use function collect;
 
+/** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */

From ce71cab4e303ffea2714cf07a939a00c7f872def Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:18 +0100
Subject: [PATCH 0105/2811] Deprecate class `MainNavigationMenu`

---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 084cc2e19cd..db72a3569bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -9,6 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
+/** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
     protected function generate(): void

From a1ba9c2b85d25184c5f0a6a1a244029d39c95854 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:07:32 +0100
Subject: [PATCH 0106/2811] Deprecate class `DocumentationSidebar`

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 919b93434a6..ccfaacafbf9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,6 +15,7 @@
 
 use function collect;
 
+/** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
     protected function generate(): void

From d3868f5931af9cd7cd6335a4c7b3359a31a3db3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:12:46 +0100
Subject: [PATCH 0107/2811] Scaffold new generation method

---
 .../Features/Navigation/NavigationManager.php         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 677a9264082..359de3f2830 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -31,4 +31,15 @@ public function getMenu(string $name): BaseNavigationMenu
     {
         return $this->menus[$name];
     }
+
+    /**
+     * Temporary logic moved from MainNavigationMenu.php
+     *
+     * @internal
+     * @experimental
+     */
+    public static function generateMainMenu(): NavigationMenu
+    {
+        //
+    }
 }

From 32b6b8a15f95021a73f03cc1d76e45bdeec5250c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:12:49 +0100
Subject: [PATCH 0108/2811] Revert "Scaffold new generation method"

This reverts commit d3868f5931af9cd7cd6335a4c7b3359a31a3db3a.
---
 .../Features/Navigation/NavigationManager.php         | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 359de3f2830..677a9264082 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -31,15 +31,4 @@ public function getMenu(string $name): BaseNavigationMenu
     {
         return $this->menus[$name];
     }
-
-    /**
-     * Temporary logic moved from MainNavigationMenu.php
-     *
-     * @internal
-     * @experimental
-     */
-    public static function generateMainMenu(): NavigationMenu
-    {
-        //
-    }
 }

From fdf4f3ac00853374ebe9a2d3e270324c932fe232 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:15:37 +0100
Subject: [PATCH 0109/2811] Create NavigationServiceProvider.php

---
 .../Foundation/Providers/NavigationServiceProvider.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Foundation/Providers/NavigationServiceProvider.php

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
new file mode 100644
index 00000000000..40801e73cbb
--- /dev/null
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Providers;
+
+class NavigationServiceProvider
+{
+    //
+}

From 765223e1c616808fc0c7aa067f39ba402960e4b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:17:46 +0100
Subject: [PATCH 0110/2811] Register NavigationServiceProvider

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

diff --git a/app/config.php b/app/config.php
index 9af0e0cdf05..627c80c2d13 100644
--- a/app/config.php
+++ b/app/config.php
@@ -73,6 +73,7 @@
         Hyde\Foundation\Providers\ConfigurationServiceProvider::class,
         Hyde\Framework\HydeServiceProvider::class,
         Hyde\Foundation\Providers\ViewServiceProvider::class,
+        Hyde\Foundation\Providers\NavigationServiceProvider::class,
         Hyde\Console\ConsoleServiceProvider::class,
     ],
 

From f433a7d4a27471ebc9eb5414bb31923dcab0a0bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:17:50 +0100
Subject: [PATCH 0111/2811] Cover NavigationServiceProvider

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index e350de913c2..83e437c4acc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -31,6 +31,7 @@
  * @covers \Hyde\Framework\HydeServiceProvider
  * @covers \Hyde\Framework\Concerns\RegistersFileLocations
  * @covers \Hyde\Foundation\Providers\ConfigurationServiceProvider
+ * @covers \Hyde\Foundation\Providers\NavigationServiceProvider
  * @covers \Hyde\Foundation\Providers\ViewServiceProvider
  */
 class HydeServiceProviderTest extends TestCase

From 233ecae531a3906c26d9ac31ee2a87f4928ac29e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:18:31 +0100
Subject: [PATCH 0112/2811] Extend ServiceProvider

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 40801e73cbb..b6676237253 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Foundation\Providers;
 
-class NavigationServiceProvider
+use Illuminate\Support\ServiceProvider;
+
+class NavigationServiceProvider extends ServiceProvider
 {
     //
 }

From 786bdf68203340e588f6b6bcf4da3ed7e7930fa8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:21:01 +0100
Subject: [PATCH 0113/2811] Register NavigationManager as a singleton

---
 .../Foundation/Providers/NavigationServiceProvider.php   | 8 +++++++-
 .../framework/tests/Feature/HydeServiceProviderTest.php  | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index b6676237253..c23e3762da8 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -5,8 +5,14 @@
 namespace Hyde\Foundation\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationManager;
 
 class NavigationServiceProvider extends ServiceProvider
 {
-    //
+    public function register(): void
+    {
+        $this->app->singleton(NavigationManager::class, function ($app) {
+            return new NavigationManager();
+        });
+    }
 }
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 83e437c4acc..69f5b525ccc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\NavigationManager;
+
 use function app;
 use function array_map;
 use function basename;
@@ -327,4 +329,11 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
+
+    public function testNavigationManagerIsRegisteredAsSingleton()
+    {
+        $this->assertTrue($this->app->bound(NavigationManager::class));
+        $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
+        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
+    }
 }

From 4089cb568093f118f3196b66eca03d7065aa95cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:23:37 +0100
Subject: [PATCH 0114/2811] Register navigation manager alias in container

---
 .../src/Foundation/Providers/NavigationServiceProvider.php | 2 ++
 .../framework/tests/Feature/HydeServiceProviderTest.php    | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index c23e3762da8..849317ef3d4 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -14,5 +14,7 @@ public function register(): void
         $this->app->singleton(NavigationManager::class, function ($app) {
             return new NavigationManager();
         });
+
+        $this->app->alias(NavigationManager::class, 'navigation');
     }
 }
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 69f5b525ccc..6ad340537de 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -336,4 +336,11 @@ public function testNavigationManagerIsRegisteredAsSingleton()
         $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
         $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
     }
+
+    public function testProviderRegistersNavigationManagerAlias()
+    {
+        $this->assertTrue($this->app->bound('navigation'));
+        $this->assertInstanceOf(NavigationManager::class, $this->app->make('navigation'));
+        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make('navigation'));
+    }
 }

From c511af840ad2de40255f2b5f2c6faf64c991fe70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:26:11 +0100
Subject: [PATCH 0115/2811] Remove unused parameter

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 849317ef3d4..cd39be72fcc 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -11,7 +11,7 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(NavigationManager::class, function ($app) {
+        $this->app->singleton(NavigationManager::class, function () {
             return new NavigationManager();
         });
 

From 6565a2e7e96e8ad7d263a6851c2e936d324f695c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 19:26:54 +0100
Subject: [PATCH 0116/2811] Type hint new menu class

---
 .../src/Framework/Features/Navigation/NavigationManager.php | 6 +++---
 packages/framework/tests/Feature/NavigationManagerTest.php  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 677a9264082..3d65a8597f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -12,14 +12,14 @@ class NavigationManager
     /**
      * The menus that are available for the project, keyed by their name identifier.
      *
-     * @var array<string, \Hyde\Framework\Features\Navigation\BaseNavigationMenu>
+     * @var array<string, \Hyde\Framework\Features\Navigation\NavigationMenu>
      */
     protected array $menus = [];
 
     /**
      * Register a new menu for the project.
      */
-    public function registerMenu(string $name, BaseNavigationMenu $menu): void
+    public function registerMenu(string $name, NavigationMenu $menu): void
     {
         $this->menus[$name] = $menu;
     }
@@ -27,7 +27,7 @@ public function registerMenu(string $name, BaseNavigationMenu $menu): void
     /**
      * Get a menu by its name.
      */
-    public function getMenu(string $name): BaseNavigationMenu
+    public function getMenu(string $name): NavigationMenu
     {
         return $this->menus[$name];
     }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 6b622349cb8..97f2c1b83a9 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -17,7 +17,7 @@ public function testCanRegisterMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(BaseNavigationMenu::class);
+        $menu = $this->createMock(NavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $reflection = new \ReflectionClass($manager);
@@ -33,7 +33,7 @@ public function testCanGetMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(BaseNavigationMenu::class);
+        $menu = $this->createMock(NavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $retrievedMenu = $manager->getMenu('foo');

From 9997235617aaae1c1a8e6b6542c1a8294a1deb81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:02:00 +0100
Subject: [PATCH 0117/2811] Add booted callback to register the navigation menu

---
 .../src/Foundation/Providers/NavigationServiceProvider.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index cd39be72fcc..55b59aa704d 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Foundation\Providers;
 
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 
 class NavigationServiceProvider extends ServiceProvider
@@ -16,5 +18,9 @@ public function register(): void
         });
 
         $this->app->alias(NavigationManager::class, 'navigation');
+
+        $this->app->make(HydeKernel::class)->booted(function (HydeKernel $kernel) {
+            $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
+        });
     }
 }

From f007eb6d140e47662e97ebbe75012bbf9d84cd78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:03:18 +0100
Subject: [PATCH 0118/2811] Remove unused parameter

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 55b59aa704d..7eb3ada7949 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -19,7 +19,7 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
-        $this->app->make(HydeKernel::class)->booted(function (HydeKernel $kernel) {
+        $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
         });
     }

From 74e7901420cbbef24f407e515226bc411ab76889 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:04:32 +0100
Subject: [PATCH 0119/2811] Add navigation menu constructor

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2667031b7a6..77386e24cee 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -10,4 +10,9 @@ class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
+
+    public function __construct(Collection $items)
+    {
+        $this->items = $items;
+    }
 }

From ed6796411e3c39b0c0d837a4e4a0504ab533d8f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:06:35 +0100
Subject: [PATCH 0120/2811] Update constructor to support arrayables

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 77386e24cee..3bb7089c6fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -5,14 +5,15 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Support\Arrayable;
 
 class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    public function __construct(Collection $items)
+    public function __construct(Arrayable|array $items = [])
     {
-        $this->items = $items;
+        $this->items = new Collection($items);
     }
 }

From 7c0af951a78b6d7b5ad298258cf6f98931a3a046 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:07:30 +0100
Subject: [PATCH 0121/2811] Change return type to new menu class

Breaking: Change `BaseNavigationMenu::create()` return type to new NavigationMenu
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..a69842b8af7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): static
+    public static function create(): NavigationMenu
     {
         $menu = new static();
 
@@ -30,7 +30,7 @@ public static function create(): static
         $menu->sortByPriority();
         $menu->removeDuplicateItems();
 
-        return $menu;
+        return new NavigationMenu($menu->getItems());
     }
 
     protected function generate(): void

From 2683762b1a4d062efcde24e7596bd58caaca6c64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:08:04 +0100
Subject: [PATCH 0122/2811] Revert "Change return type to new menu class"

This reverts commit 7c0af951a78b6d7b5ad298258cf6f98931a3a046.
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index a69842b8af7..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): NavigationMenu
+    public static function create(): static
     {
         $menu = new static();
 
@@ -30,7 +30,7 @@ public static function create(): NavigationMenu
         $menu->sortByPriority();
         $menu->removeDuplicateItems();
 
-        return new NavigationMenu($menu->getItems());
+        return $menu;
     }
 
     protected function generate(): void

From 30e11f0fd4b0d896c0deef86e0e32d7ed628531e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:08:41 +0100
Subject: [PATCH 0123/2811] Create GeneratesMainNavigationMenu.php

---
 .../Navigation/GeneratesMainNavigationMenu.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
new file mode 100644
index 00000000000..0dea48b085f
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class GeneratesMainNavigationMenu
+{
+    //
+}

From cc05a1ec5d71bc9f3fe0167900729f583462784e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:09:11 +0100
Subject: [PATCH 0124/2811] Mark class as experimental

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0dea48b085f..99e50dce6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ */
 class GeneratesMainNavigationMenu
 {
     //

From 72303ec98ab2b2598df7fd28d546885870f2f25d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:10:22 +0100
Subject: [PATCH 0125/2811] Sketch out contract

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 99e50dce6d5..81a888de847 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,5 +9,8 @@
  */
 class GeneratesMainNavigationMenu
 {
-    //
+    public function execute(): NavigationMenu
+    {
+        //
+    }
 }

From c8e1cff4b02519ca425174875e5eb53ef13fe0dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:11:00 +0100
Subject: [PATCH 0126/2811] Defer logic to new action

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ++--
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 7eb3ada7949..4dcbb297c99 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,8 +6,8 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -20,7 +20,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', new NavigationMenu());
+            $this->app->make(NavigationManager::class)->registerMenu('main', (new GeneratesMainNavigationMenu())->execute());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 81a888de847..4523df0eba4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,6 @@ class GeneratesMainNavigationMenu
 {
     public function execute(): NavigationMenu
     {
-        //
+        return new NavigationMenu();
     }
 }

From 47df911f5d4ff41743acc7d8c317922ff6fc86a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:14:33 +0100
Subject: [PATCH 0127/2811] Use the legacy entrypoint to create menu in the new
 action

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4523df0eba4..3c0d081c9bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,8 @@ class GeneratesMainNavigationMenu
 {
     public function execute(): NavigationMenu
     {
-        return new NavigationMenu();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+
+        return new NavigationMenu($navigation->items);
     }
 }

From b617d88c3d9ef7a9c181e94f971bc5d0a19fd373 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:15:35 +0100
Subject: [PATCH 0128/2811] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3c0d081c9bb..1c0872a8b4e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,6 +6,8 @@
 
 /**
  * @experimental This class may change significantly before its release.
+ *
+ * @todo Refactor to move logic to the new action
  */
 class GeneratesMainNavigationMenu
 {

From a944a276c59a4e23b47e615267ea4c83d448f12b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:16:55 +0100
Subject: [PATCH 0129/2811] Refactor action entry point to be static

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 4dcbb297c99..edb8ee9bf13 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -20,7 +20,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', (new GeneratesMainNavigationMenu())->execute());
+            $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 1c0872a8b4e..c160f6d8723 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public function execute(): NavigationMenu
+    public static function handle(): NavigationMenu
     {
         $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 

From f2ca7616e96b1ceec508040531c85f36bb75060f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:23:19 +0100
Subject: [PATCH 0130/2811] Ensure kernel is booted when trying to get a menu

---
 .../src/Framework/Features/Navigation/NavigationManager.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 3d65a8597f8..4a44371ddb6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
+
 /**
  * Manages the navigation menus for the project.
  */
@@ -29,6 +31,10 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
+        if (! Hyde::isBooted()) {
+            Hyde::boot();
+        }
+
         return $this->menus[$name];
     }
 }

From 23edc36bc280110e626a076ef84feb6b68683e16 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:23:24 +0100
Subject: [PATCH 0131/2811] Add todo

---
 .../src/Framework/Features/Navigation/NavigationManager.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 4a44371ddb6..7fc836be42c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -32,6 +32,7 @@ public function registerMenu(string $name, NavigationMenu $menu): void
     public function getMenu(string $name): NavigationMenu
     {
         if (! Hyde::isBooted()) {
+            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
             Hyde::boot();
         }
 

From e18fbf9d357e92e57e33e5f966c6d9b52fe32b9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:24:24 +0100
Subject: [PATCH 0132/2811] Add items getter

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 3bb7089c6fe..4919ceb1bf1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -16,4 +16,10 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection($items);
     }
+
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    public function getItems(): Collection
+    {
+        return $this->items;
+    }
 }

From 7a9aada2fe5fbc34ac4754e6fdce7b052021a34f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:24:54 +0100
Subject: [PATCH 0133/2811] Update navigation view to use accessor

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 3324c3a79f2..ef15fe3f127 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -33,7 +33,7 @@
     <div id="main-navigation-links" class="w-full x-uncloak-md md:flex flex-grow md:flex-grow-0 md:items-center md:w-auto px-6 -mx-4 border-t mt-3 pt-3 md:border-none md:mt-0 md:py-0 border-gray-200 dark:border-gray-700"
          :class="navigationOpen ? '' : 'hidden'" x-cloak>
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
-            @foreach ($navigation->items as $item)
+            @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
                         <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->items"/>

From 94714ec0416c997a9a9713b64f14e30f8e8b695c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 20:27:47 +0100
Subject: [PATCH 0134/2811] Update navigation component to use new menu class

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ef15fe3f127..ba8c148b583 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+    $navigation = app('navigation')->getMenu('main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From 0c701d96da5121817360af943969565a54fd798b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:04:08 +0100
Subject: [PATCH 0135/2811] Add back temporary compatibility with old system

Routes must be deferred first
---
 .../framework/resources/views/layouts/navigation.blade.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ba8c148b583..4831f46b9b2 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,6 @@
 @php
-    $navigation = app('navigation')->getMenu('main');
+    // $navigation = app('navigation')->getMenu('main');
+    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From 2e30221f7d3bad7898ef713495a786eb23088a28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:05:45 +0100
Subject: [PATCH 0136/2811] Create ExternalRoute.php

---
 .../framework/src/Support/Models/ExternalRoute.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Support/Models/ExternalRoute.php

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
new file mode 100644
index 00000000000..62eccf78c8a
--- /dev/null
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Support\Models;
+
+class ExternalRoute
+{
+    //
+}

From b17f2a3f6a5497cc1d349d35cd5ee1ea6961d737 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:05:54 +0100
Subject: [PATCH 0137/2811] Class ExternalRoute extends Route

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

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 62eccf78c8a..9f7ffcc036b 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Support\Models;
 
-class ExternalRoute
+class ExternalRoute extends Route
 {
     //
 }

From c2ae06f71e445b8d6a689d0359cbae359134e44f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:06:08 +0100
Subject: [PATCH 0138/2811] Add class description

---
 packages/framework/src/Support/Models/ExternalRoute.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 9f7ffcc036b..33364dc5fdf 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Support\Models;
 
+/**
+ * A route that leads to an external URI.
+ */
 class ExternalRoute extends Route
 {
     //

From de56a661ae7b149ca8effb1a58806e6ac35b8017 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:07:29 +0100
Subject: [PATCH 0139/2811] Add destination property

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

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index 33364dc5fdf..bcc7fd2172f 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -9,5 +9,5 @@
  */
 class ExternalRoute extends Route
 {
-    //
+    protected string $destination;
 }

From e5550d24cc5ac3e5d1533649065cef4a4be8be0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:07:53 +0100
Subject: [PATCH 0140/2811] Construct destination

---
 packages/framework/src/Support/Models/ExternalRoute.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index bcc7fd2172f..b2f6769546f 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -10,4 +10,9 @@
 class ExternalRoute extends Route
 {
     protected string $destination;
+
+    public function __construct(string $destination)
+    {
+        $this->destination = $destination;
+    }
 }

From 26d1773cadee7a5d166d558ba64e3385d1ce19fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:08:06 +0100
Subject: [PATCH 0141/2811] Add noinspection annotation

---
 packages/framework/src/Support/Models/ExternalRoute.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index b2f6769546f..ba26ab629a9 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -11,6 +11,7 @@ class ExternalRoute extends Route
 {
     protected string $destination;
 
+    /** @noinspection PhpMissingParentConstructorInspection */
     public function __construct(string $destination)
     {
         $this->destination = $destination;

From 7c1a5635e98e96fd51837fb00b228e362b0ae6b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:08:45 +0100
Subject: [PATCH 0142/2811] Mark class as experimental

---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index ba26ab629a9..e3ed9d7d22c 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -6,6 +6,8 @@
 
 /**
  * A route that leads to an external URI.
+ *
+ * @experimental Take caution when using this class, as it may be subject to change.
  */
 class ExternalRoute extends Route
 {

From fdedbbd7c87e6e06cee0a9d4574264251d0838c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:09:00 +0100
Subject: [PATCH 0143/2811] Override link resolver

---
 packages/framework/src/Support/Models/ExternalRoute.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index e3ed9d7d22c..f6ad450b071 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -18,4 +18,9 @@ public function __construct(string $destination)
     {
         $this->destination = $destination;
     }
+
+    public function getLink(): string
+    {
+        return $this->destination;
+    }
 }

From d42a11b029f3a90f43f1525fc4c66ae375e28c81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:11:09 +0100
Subject: [PATCH 0144/2811] Turn NavItem links to ExternalRoutes when using
 forLink helper

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d3b39db3dca..f90cbc4a2bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,6 +9,7 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -54,7 +55,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forLink(string $href, string $label, int $priority = 500): static
     {
-        return new static($href, $label, $priority);
+        return new static(new ExternalRoute($href), $label, $priority);
     }
 
     /**

From f8dda2b779da89453033445284f07660bb8a7129 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:12:08 +0100
Subject: [PATCH 0145/2811] Cast string to external route upon NavItem
 construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f90cbc4a2bb..69bdad9fc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,6 +31,10 @@ class NavItem implements Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
     {
+        if (is_string($destination)) {
+            $destination = new ExternalRoute($destination);
+        }
+
         $this->destination = (string) $destination;
         $this->label = $label;
         $this->priority = $priority;

From a2b4131071c73a761345777be6b6e7863ada9e20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:17:14 +0100
Subject: [PATCH 0146/2811] Revert "Turn NavItem links to ExternalRoutes when
 using forLink helper"

This reverts commit d42a11b029f3a90f43f1525fc4c66ae375e28c81.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69bdad9fc27..5bff052b649 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -59,7 +58,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forLink(string $href, string $label, int $priority = 500): static
     {
-        return new static(new ExternalRoute($href), $label, $priority);
+        return new static($href, $label, $priority);
     }
 
     /**

From ff85c3ab19d3699c8324867cb792be38bfb13a45 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:13:28 +0100
Subject: [PATCH 0147/2811] Breaking: `NavItem::$destination` is now a Route
 instead of string

This is necessary in order to defer route resolving to compile time
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5bff052b649..f7f9e34d917 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -20,7 +20,7 @@
  */
 class NavItem implements Stringable
 {
-    public readonly string $destination;
+    public readonly Route $destination;
     public readonly string $label;
     public readonly int $priority;
     public readonly ?string $group;
@@ -34,7 +34,7 @@ public function __construct(Route|string $destination, string $label, int $prior
             $destination = new ExternalRoute($destination);
         }
 
-        $this->destination = (string) $destination;
+        $this->destination = $destination;
         $this->label = $label;
         $this->priority = $priority;
         $this->group = $group;

From f21b91c532044a1761d09db40cec48463db7e393 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:18:53 +0100
Subject: [PATCH 0148/2811] Update NavItemTest.php

---
 packages/framework/tests/Unit/NavItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 6ab0458ee1b..17ccf81697a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -43,7 +43,7 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route, $item->destination);
     }
 
     public function testGetDestination()

From 9ae32df0525ab2ae16d52e76736e3a377ae1ac52 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 18:56:09 +0100
Subject: [PATCH 0149/2811] Add string cast to string resolver

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f7f9e34d917..fdb1e963bd7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -79,7 +79,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public function __toString(): string
     {
-        return $this->destination;
+        return (string) $this->destination;
     }
 
     /**

From a1fcbe980aa2477a07564df7b63bb272155fd512 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:20:40 +0100
Subject: [PATCH 0150/2811] Import class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index fdb1e963bd7..7af82b15ff5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -9,6 +9,7 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Support\Models\ExternalRoute;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.

From 77a17155b5ebf83a70ae6b945137e0af47cec8fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:20:54 +0100
Subject: [PATCH 0151/2811] Getter now returns Route object

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7af82b15ff5..0ee3bd1a779 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -89,7 +89,7 @@ public function __toString(): string
      * If the navigation item is an external link, this will return the link as is,
      * if it's for a route, a resolved relative link will be returned.
      */
-    public function getDestination(): string
+    public function getDestination(): Route
     {
         return $this->destination;
     }

From 8f0d41a186c985efd139a38565b7392cc2a7ec9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:27:24 +0100
Subject: [PATCH 0152/2811] Split getDestination method into new getLink method

---
 .../src/Framework/Features/Navigation/NavItem.php | 15 ++++++++++-----
 packages/framework/tests/Unit/NavItemTest.php     | 10 +++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0ee3bd1a779..a488911d1a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -80,20 +80,25 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public function __toString(): string
     {
-        return (string) $this->destination;
+        return $this->getLink();
     }
 
     /**
-     * Get the destination link of the navigation item.
-     *
-     * If the navigation item is an external link, this will return the link as is,
-     * if it's for a route, a resolved relative link will be returned.
+     * Get the destination route of the navigation item.
      */
     public function getDestination(): Route
     {
         return $this->destination;
     }
 
+    /**
+     * Resolve the destination link of the navigation item.
+     */
+    public function getLink(): string
+    {
+        return (string) $this->destination;
+    }
+
     /**
      * Get the label of the navigation item.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 17ccf81697a..230da11728e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -47,9 +47,17 @@ public function testConstruct()
     }
 
     public function testGetDestination()
+    {
+        $route = new Route(new InMemoryPage('foo'));
+        $navItem = new NavItem($route, 'Page', 500);
+
+        $this->assertSame($route, $navItem->getDestination());
+    }
+
+    public function testGetLink()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getDestination());
+        $this->assertSame('foo.html', $navItem->getLink());
     }
 
     public function testGetLabel()

From d653aac6863ca8cbdb39c3f648b32f7c985101fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:27:29 +0100
Subject: [PATCH 0153/2811] Update NavItemTest.php

---
 packages/framework/tests/Unit/NavItemTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 230da11728e..a9d4e227462 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\InMemoryPage;
@@ -83,7 +84,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::fromRoute($route);
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route, $item->destination);
     }
 
     public function testToString()
@@ -97,7 +98,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertSame('foo', $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
         $this->assertSame('bar', $item->label);
         $this->assertSame(500, $item->priority);
     }
@@ -112,7 +113,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route->getLink(), $item->destination->getLink());
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -122,7 +123,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination);
+        $this->assertSame($route->getLink(), $item->destination->getLink());
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 7fc22d9deea7747688469185525bd8d6100adf7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 8 Feb 2024 18:58:53 +0100
Subject: [PATCH 0154/2811] Compare current state as string

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a488911d1a0..75836e2e3ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -130,7 +130,7 @@ public function getGroup(): ?string
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination;
+        return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
     protected static function getRouteGroup(Route $route): ?string

From 1fb6ec0990a73fe6cebb6c3193c11bb832d3dcd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:29:11 +0100
Subject: [PATCH 0155/2811] Remove early route resolving

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 2 +-
 packages/framework/tests/Unit/NavItemTest.php                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 75836e2e3ad..d5e09b898f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -47,7 +47,7 @@ public function __construct(Route|string $destination, string $label, int $prior
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         return new static(
-            $route->getLink(),
+            $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
             $group ?? static::getRouteGroup($route),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a9d4e227462..b7ccacf3622 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -113,7 +113,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination->getLink());
+        $this->assertSame($route, $item->destination);
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -123,7 +123,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route->getLink(), $item->destination->getLink());
+        $this->assertSame($route, $item->destination);
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 66dc3ded958eea4f85354120c2f89c2adb0cf8bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:29:49 +0100
Subject: [PATCH 0156/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d5e09b898f3..971450c970f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -14,6 +14,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @FIXME Before merge: Add release notes from https://github.com/hydephp/develop/pull/1539
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From 5ed58f4d20855ba6d7e27012f75edcb04f0c2f8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 21:58:07 +0100
Subject: [PATCH 0157/2811] Revert "Add todo"

This reverts commit 66dc3ded958eea4f85354120c2f89c2adb0cf8bf.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 971450c970f..d5e09b898f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -14,8 +14,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @FIXME Before merge: Add release notes from https://github.com/hydephp/develop/pull/1539
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From a2945fb0e1d40c05886923d8be9ed9e784bade93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:03:02 +0100
Subject: [PATCH 0158/2811] Revert "Add back temporary compatibility with old
 system"

This reverts commit 0c701d96da5121817360af943969565a54fd798b.
---
 .../framework/resources/views/layouts/navigation.blade.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 4831f46b9b2..ba8c148b583 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,6 +1,5 @@
 @php
-    // $navigation = app('navigation')->getMenu('main');
-    $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+    $navigation = app('navigation')->getMenu('main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">

From c133c82ca93a12b27954aff50a69970072edf6d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:12:43 +0100
Subject: [PATCH 0159/2811] Merge pull request #1539 from
 hydephp/update-navitem-class-to-support-deferring-route-resolves

Update NavItem class to support deferring route resolves
---
 RELEASE_NOTES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2cc8b136fc6..c5fd968e74f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,11 +11,14 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
+- Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -56,6 +59,14 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ## Low impact
 
+### Navigation item changes
+
+The `NavItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+
+If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
+
+If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
+
 ### New documentation search implementation
 
 As the new documentation search implementation brings changes to their code API you may need to adapt your code

From 88fd2e7bdb8f2a753626868e2b4e1af1c979054c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 13 Feb 2024 22:13:12 +0100
Subject: [PATCH 0160/2811] Add ExternalRoute class to release notes

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c5fd968e74f..3ff8919c416 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,6 +11,7 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- Added a new `ExternalRoute` class to represent external routes.
 - Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
 
 ### Changed

From f9884c1d51654adcafe7bfd6eb774b84f7bed605 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:13:24 +0100
Subject: [PATCH 0161/2811] Split out temporary method for refactor

---
 .../Features/Navigation/BaseNavigationMenu.php       | 12 +++++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..4e83f7f1cc9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,7 +22,8 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    public static function create(): static
+    /** @deprecated Temporary method for refactor */
+    public static function __generate(): static
     {
         $menu = new static();
 
@@ -33,6 +34,15 @@ public static function create(): static
         return $menu;
     }
 
+    /** @deprecated Temporary method for refactor */
+    public static function create(): static
+    {
+        $menu = new static();
+        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         Routes::each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c160f6d8723..3a776e61ade 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
 
         return new NavigationMenu($navigation->items);
     }

From af7e0d9727ccdad45451cf2e8af8baeaf1962448 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:30:32 +0100
Subject: [PATCH 0162/2811] Revert "Split out temporary method for refactor"

This reverts commit f9884c1d51654adcafe7bfd6eb774b84f7bed605.
---
 .../Features/Navigation/BaseNavigationMenu.php       | 12 +-----------
 .../Navigation/GeneratesMainNavigationMenu.php       |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 4e83f7f1cc9..d8bf84ebfab 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -22,8 +22,7 @@ final protected function __construct()
         $this->items = new Collection();
     }
 
-    /** @deprecated Temporary method for refactor */
-    public static function __generate(): static
+    public static function create(): static
     {
         $menu = new static();
 
@@ -34,15 +33,6 @@ public static function __generate(): static
         return $menu;
     }
 
-    /** @deprecated Temporary method for refactor */
-    public static function create(): static
-    {
-        $menu = new static();
-        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
-
-        return $menu;
-    }
-
     protected function generate(): void
     {
         Routes::each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3a776e61ade..c160f6d8723 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
 
         return new NavigationMenu($navigation->items);
     }

From c61fbb43c163f1fde84e8703b3507c32f8d8766e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 13:31:16 +0100
Subject: [PATCH 0163/2811] Split out granular temporary method for refactor

---
 .../GeneratesMainNavigationMenu.php           |  2 +-
 .../Navigation/MainNavigationMenu.php         | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c160f6d8723..3a776e61ade 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::create();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
 
         return new NavigationMenu($navigation->items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index db72a3569bb..f82a962ca5d 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -12,6 +12,27 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
+    /** @deprecated Temporary method for refactor */
+    public static function __generate(): static
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return $menu;
+    }
+
+    /** @deprecated Temporary method for refactor */
+    public static function create(): static
+    {
+        $menu = new static();
+        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         parent::generate();

From b40f5987eea67663991335e42f34a3f334abd4d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:32:08 +0100
Subject: [PATCH 0164/2811] Temporary rename

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 .../src/Framework/Features/Navigation/MainNavigationMenu.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3a776e61ade..3ed96a630ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,7 +13,7 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::__generate();
+        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::temp__generate();
 
         return new NavigationMenu($navigation->items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index f82a962ca5d..929c6c213cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -13,7 +13,7 @@
 class MainNavigationMenu extends BaseNavigationMenu
 {
     /** @deprecated Temporary method for refactor */
-    public static function __generate(): static
+    public static function temp__generate(): static
     {
         $menu = new static();
 

From 850de857bed3ae354f97400d37fdad24d7c98e94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:32:20 +0100
Subject: [PATCH 0165/2811] Copy temporary parent methods

---
 .../GeneratesMainNavigationMenu.php           | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3ed96a630ad..fa3d76e59d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use Hyde\Support\Models\Route;
+use Hyde\Foundation\Facades\Routes;
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -17,4 +22,36 @@ public static function handle(): NavigationMenu
 
         return new NavigationMenu($navigation->items);
     }
+
+    protected function parent__generate(): void
+    {
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
+    }
+
+    protected function parent__canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
+
+    protected function parent__removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function parent__sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
+    }
 }

From f445c7a5183cb0c590e5547d6cf6a4ba4ae573d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:33:10 +0100
Subject: [PATCH 0166/2811] Copy over temporary child methods

---
 .../GeneratesMainNavigationMenu.php           | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fa3d76e59d2..14bf4e60c2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,9 @@
 
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
+
 use function collect;
 
 /**
@@ -23,6 +25,50 @@ public static function handle(): NavigationMenu
         return new NavigationMenu($navigation->items);
     }
 
+    protected function generate(): void
+    {
+        $this->parent__generate();
+
+        if ($this->dropdownsEnabled()) {
+            $this->moveGroupedItemsIntoDropdowns();
+        }
+    }
+
+    protected function moveGroupedItemsIntoDropdowns(): void
+    {
+        $dropdowns = [];
+
+        foreach ($this->items as $key => $item) {
+            if ($this->canAddItemToDropdown($item)) {
+                // Buffer the item in the dropdowns array
+                $dropdowns[$item->getGroup()][] = $item;
+
+                // Remove the item from the main items collection
+                $this->items->forget($key);
+            }
+        }
+
+        foreach ($dropdowns as $group => $items) {
+            // Create a new dropdown item containing the buffered items
+            $this->items->add(new DropdownNavItem($group, $items));
+        }
+    }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $this->parent__canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+    }
+
+    protected function canAddItemToDropdown(NavItem $item): bool
+    {
+        return $item->getGroup() !== null;
+    }
+
+    protected function dropdownsEnabled(): bool
+    {
+        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+    }
+
     protected function parent__generate(): void
     {
         Routes::each(function (Route $route): void {

From 8ca7263c51f8400e88e313746ddd1d648115ba7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:39:01 +0100
Subject: [PATCH 0167/2811] Inline temporary refactoring method

---
 .../Navigation/GeneratesMainNavigationMenu.php  | 17 +++++++++++++++--
 .../Features/Navigation/MainNavigationMenu.php  | 12 ------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 14bf4e60c2f..11acdfa71a7 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
@@ -18,11 +19,23 @@
  */
 class GeneratesMainNavigationMenu
 {
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+    }
+
     public static function handle(): NavigationMenu
     {
-        $navigation = \Hyde\Framework\Features\Navigation\MainNavigationMenu::temp__generate();
+        $menu = new static();
+
+        $menu->generate();
+        $menu->parent__sortByPriority();
+        $menu->parent__removeDuplicateItems();
 
-        return new NavigationMenu($navigation->items);
+        return new NavigationMenu($menu->items);
     }
 
     protected function generate(): void
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 929c6c213cb..61fad3c0fec 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -12,18 +12,6 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
-    /** @deprecated Temporary method for refactor */
-    public static function temp__generate(): static
-    {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
-    }
-
     /** @deprecated Temporary method for refactor */
     public static function create(): static
     {

From 70959896044f7276c626c99ced49f6137d3436f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:42:53 +0100
Subject: [PATCH 0168/2811] Merge back old renamed test with new one

---
 .../tests/Feature/MainNavigationMenuTest.php  | 390 ------------------
 .../tests/Feature/NavigationMenuTest.php      | 378 ++++++++++++++++-
 2 files changed, 377 insertions(+), 391 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/MainNavigationMenuTest.php

diff --git a/packages/framework/tests/Feature/MainNavigationMenuTest.php b/packages/framework/tests/Feature/MainNavigationMenuTest.php
deleted file mode 100644
index c7bb9bd1826..00000000000
--- a/packages/framework/tests/Feature/MainNavigationMenuTest.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use BadMethodCallException;
-use Hyde\Support\Models\Route;
-
-use function collect;
-use function config;
-
-use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Collection;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
- */
-class MainNavigationMenuTest extends TestCase
-{
-    public function testConstructor()
-    {
-        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
-    }
-
-    public function testGenerateMethodCreatesCollectionOfNavItems()
-    {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
-    }
-
-    public function testGetItemsReturnsItems()
-    {
-        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
-    }
-
-    public function testItemsAreSortedByPriority()
-    {
-        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
-
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
-    }
-
-    public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
-    {
-        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
-        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
-
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
-    }
-
-    public function testCreatedCollectionIsSortedByNavigationMenuPriority()
-    {
-        $this->file('_pages/foo.md');
-        $this->file('_docs/index.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-            NavItem::fromRoute(Routes::get('docs/index')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
-    {
-        $this->file('_pages/foo.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testCollectionOnlyContainsNavItems()
-    {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
-    }
-
-    public function testExternalLinkCanBeAddedInConfig()
-    {
-        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('https://example.com', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPathLinkCanBeAddedInConfig()
-    {
-        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDuplicatesAreRemovedWhenAddingInConfig()
-    {
-        config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
-        ]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
-    {
-        config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
-        ]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testConfigItemsTakePrecedenceOverGeneratedItems()
-    {
-        $this->file('_pages/foo.md');
-
-        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::forLink('bar', 'Foo'),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
-    {
-        $this->file('_docs/foo.md');
-        $this->file('_docs/index.md');
-
-        $menu = MainNavigationMenu::create();
-
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('docs/index')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
-    {
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
-    {
-        config(['hyde.navigation.subdirectories' => 'flat']);
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo/bar')),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $this->directory('_pages/foo');
-        $this->file('_pages/foo/bar.md');
-
-        $menu = MainNavigationMenu::create();
-        $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute(Routes::get('foo/bar')),
-            ]),
-        ]);
-
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
-    }
-
-    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
-        $this->assertFalse($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
-        $this->assertTrue($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
-    {
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
-    }
-
-    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-            ]), ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleItems()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
-
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(2, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-            DropdownNavItem::fromArray('cat', [
-                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsThrowsExceptionWhenDisabled()
-    {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-
-        $menu = MainNavigationMenu::create();
-        $menu->getDropdowns();
-    }
-
-    public function testDocumentationPagesDoNotGetAddedToDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
-        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testBlogPostsDoNotGetAddedToDropdowns()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
-        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
-
-        $menu = MainNavigationMenu::create();
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::push((new MarkdownPage('foo'))->getRoute());
-        Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
-
-        $this->assertCount(3, $menu->items);
-        $this->assertEquals([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            DropdownNavItem::fromArray('bar', [
-                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
-            ]),
-        ], $menu->items->all());
-    }
-
-    public function testDropdownMenuItemsAreSortedByPriority()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
-
-        $menu = MainNavigationMenu::create();
-        $dropdowns = $menu->getDropdowns();
-
-        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
-    }
-}
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b75fa735190..3f2fdb6afef 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,12 +4,388 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use BadMethodCallException;
+use Hyde\Support\Models\Route;
+
+use function collect;
+use function config;
+
+use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Features\Navigation\DropdownNavItem;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase
 {
-    //
+    public function testConstructor()
+    {
+        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
+    }
+
+    public function testGenerateMethodCreatesCollectionOfNavItems()
+    {
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.priority' => 1])));
+        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
+        Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
+
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+    }
+
+    public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
+    {
+        Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
+        Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
+
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+    }
+
+    public function testCreatedCollectionIsSortedByNavigationMenuPriority()
+    {
+        $this->file('_pages/foo.md');
+        $this->file('_docs/index.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::fromRoute(Routes::get('docs/index')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
+    {
+        $this->file('_pages/foo.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testCollectionOnlyContainsNavItems()
+    {
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
+    }
+
+    public function testExternalLinkCanBeAddedInConfig()
+    {
+        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('https://example.com', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPathLinkCanBeAddedInConfig()
+    {
+        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDuplicatesAreRemovedWhenAddingInConfig()
+    {
+        config(['hyde.navigation.custom' => [
+            NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('foo', 'foo'),
+        ]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
+    {
+        config(['hyde.navigation.custom' => [
+            NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('bar', 'foo'),
+        ]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('foo', 'foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testConfigItemsTakePrecedenceOverGeneratedItems()
+    {
+        $this->file('_pages/foo.md');
+
+        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forLink('bar', 'Foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
+    {
+        $this->file('_docs/foo.md');
+        $this->file('_docs/index.md');
+
+        $menu = MainNavigationMenu::create();
+
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('docs/index')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
+    {
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute(Routes::get('foo/bar')),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $this->directory('_pages/foo');
+        $this->file('_pages/foo/bar.md');
+
+        $menu = MainNavigationMenu::create();
+        $expected = collect([
+            NavItem::fromRoute(Routes::get('index')),
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute(Routes::get('foo/bar')),
+            ]),
+        ]);
+
+        $this->assertCount(count($expected), $menu->items);
+        $this->assertEquals($expected, $menu->items);
+    }
+
+    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $menu = MainNavigationMenu::create();
+        $this->assertFalse($menu->hasDropdowns());
+    }
+
+    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $menu = MainNavigationMenu::create();
+        $this->assertTrue($menu->hasDropdowns());
+    }
+
+    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
+    {
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
+    }
+
+    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        $menu = MainNavigationMenu::create();
+        $this->assertCount(0, $menu->getDropdowns());
+        $this->assertSame([], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        $menu = MainNavigationMenu::create();
+        $this->assertCount(1, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+            ]), ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsWithMultipleItems()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(1, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
+            ]),
+        ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsWithMultipleDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
+        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
+        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
+
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(2, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('foo', [
+                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
+                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
+            ]),
+            DropdownNavItem::fromArray('cat', [
+                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
+            ]),
+        ], $menu->getDropdowns());
+    }
+
+    public function testGetDropdownsThrowsExceptionWhenDisabled()
+    {
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
+
+        $menu = MainNavigationMenu::create();
+        $menu->getDropdowns();
+    }
+
+    public function testDocumentationPagesDoNotGetAddedToDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
+        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertFalse($menu->hasDropdowns());
+        $this->assertCount(0, $menu->getDropdowns());
+    }
+
+    public function testBlogPostsDoNotGetAddedToDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
+        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
+
+        $menu = MainNavigationMenu::create();
+        $this->assertFalse($menu->hasDropdowns());
+        $this->assertCount(0, $menu->getDropdowns());
+    }
+
+    public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::push((new MarkdownPage('foo'))->getRoute());
+        Routes::push((new MarkdownPage('bar/baz'))->getRoute());
+        $menu = MainNavigationMenu::create();
+
+        $this->assertCount(3, $menu->items);
+        $this->assertEquals([
+            NavItem::fromRoute(Routes::get('index')),
+            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
+            DropdownNavItem::fromArray('bar', [
+                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
+            ]),
+        ], $menu->items->all());
+    }
+
+    public function testDropdownMenuItemsAreSortedByPriority()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
+        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
+        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
+
+        $menu = MainNavigationMenu::create();
+        $dropdowns = $menu->getDropdowns();
+
+        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
+    }
 }

From 197b80723db0899c15577056c291bce48e4dcbe7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:47:58 +0100
Subject: [PATCH 0169/2811] Formatting

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 3f2fdb6afef..97f2673dcdf 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -6,10 +6,6 @@
 
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
-
-use function collect;
-use function config;
-
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;

From a6132c710d5f274c00288d3e7020168fb4d8c1ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:54:46 +0100
Subject: [PATCH 0170/2811] Add coverage annotation

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 97f2673dcdf..c7a5d614f71 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -17,6 +17,7 @@
 use Illuminate\Support\Collection;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu

From 1a4d66f3c7896efddd12185be77398a8695969bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:54:54 +0100
Subject: [PATCH 0171/2811] Remove resolved todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 11acdfa71a7..56aab99c18b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -14,8 +14,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @todo Refactor to move logic to the new action
  */
 class GeneratesMainNavigationMenu
 {

From aab36f0eb75961323907e794dbc8bba98bd690d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:56:21 +0100
Subject: [PATCH 0172/2811] Remove temporary parent prefixes from standalone
 methods

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 56aab99c18b..cab76d9dd8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -30,8 +30,8 @@ public static function handle(): NavigationMenu
         $menu = new static();
 
         $menu->generate();
-        $menu->parent__sortByPriority();
-        $menu->parent__removeDuplicateItems();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
 
         return new NavigationMenu($menu->items);
     }
@@ -99,7 +99,7 @@ protected function parent__canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation();
     }
 
-    protected function parent__removeDuplicateItems(): void
+    protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
@@ -107,7 +107,7 @@ protected function parent__removeDuplicateItems(): void
         });
     }
 
-    protected function parent__sortByPriority(): void
+    protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }

From dd12c9fb9adb52c7ca6a97bdd8d9d1800360bf36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:58:23 +0100
Subject: [PATCH 0173/2811] Inline temporary parent method copies

---
 .../GeneratesMainNavigationMenu.php           | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cab76d9dd8f..8eb8bf2b3d6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -38,7 +38,16 @@ public static function handle(): NavigationMenu
 
     protected function generate(): void
     {
-        $this->parent__generate();
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
 
         if ($this->dropdownsEnabled()) {
             $this->moveGroupedItemsIntoDropdowns();
@@ -67,7 +76,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $this->parent__canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+        return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
     protected function canAddItemToDropdown(NavItem $item): bool
@@ -80,25 +89,6 @@ protected function dropdownsEnabled(): bool
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
-    protected function parent__generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
-    protected function parent__canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
-    }
-
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {

From db45a35186911b7d5887eeea538a5ef0e6aa9973 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 14:59:50 +0100
Subject: [PATCH 0174/2811] Remove helper methods moved to new action

---
 .../Navigation/MainNavigationMenu.php         | 41 -------------------
 1 file changed, 41 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 61fad3c0fec..c0f51cc4b3b 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -5,8 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
 use BadMethodCallException;
 
 /** @deprecated Use the new NavigationMenu class instead */
@@ -21,15 +19,6 @@ public static function create(): static
         return $menu;
     }
 
-    protected function generate(): void
-    {
-        parent::generate();
-
-        if ($this->dropdownsEnabled()) {
-            $this->moveGroupedItemsIntoDropdowns();
-        }
-    }
-
     public function hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
@@ -47,36 +36,6 @@ public function getDropdowns(): array
         })->values()->all();
     }
 
-    protected function moveGroupedItemsIntoDropdowns(): void
-    {
-        $dropdowns = [];
-
-        foreach ($this->items as $key => $item) {
-            if ($this->canAddItemToDropdown($item)) {
-                // Buffer the item in the dropdowns array
-                $dropdowns[$item->getGroup()][] = $item;
-
-                // Remove the item from the main items collection
-                $this->items->forget($key);
-            }
-        }
-
-        foreach ($dropdowns as $group => $items) {
-            // Create a new dropdown item containing the buffered items
-            $this->items->add(new DropdownNavItem($group, $items));
-        }
-    }
-
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route) && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
-    }
-
-    protected function canAddItemToDropdown(NavItem $item): bool
-    {
-        return $item->getGroup() !== null;
-    }
-
     protected function dropdownsEnabled(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';

From ee786d706f8729977588817642c5d9217c5ae37c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:06:16 +0100
Subject: [PATCH 0175/2811] Breaking: Make `BaseNavigationMenu::$items`
 protected

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../Navigation/BaseNavigationMenu.php         |  2 +-
 .../tests/Feature/NavigationMenuTest.php      | 58 +++++++++----------
 .../Services/DocumentationSidebarTest.php     | 36 ++++++------
 4 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 4c26062cf9f..cebd57f4833 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -1,7 +1,7 @@
 @php /** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */ @endphp
 @if(! $sidebar->hasGroups())
     <ul id="sidebar-items" role="list" class="pl-2">
-        @foreach ($sidebar->items as $item)
+        @foreach ($sidebar->getItems() as $item)
             @include('hyde::components.docs.sidebar-item')
         @endforeach
     </ul>
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index d8bf84ebfab..9761a13a465 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -15,7 +15,7 @@
 abstract class BaseNavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    public Collection $items;
+    protected Collection $items;
 
     final protected function __construct()
     {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index c7a5d614f71..5bc2caf372d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -31,12 +31,12 @@ public function testConstructor()
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->items);
+        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(MainNavigationMenu::create()->items, MainNavigationMenu::create()->getItems());
+        $this->assertEquals(MainNavigationMenu::create()->getItems(), MainNavigationMenu::create()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -45,7 +45,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -53,7 +53,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->items->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -69,8 +69,8 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
             NavItem::fromRoute(Routes::get('docs/index')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
@@ -84,13 +84,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
             NavItem::fromRoute(Routes::get('foo')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->items);
+        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
@@ -104,8 +104,8 @@ public function testExternalLinkCanBeAddedInConfig()
             NavItem::forLink('https://example.com', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPathLinkCanBeAddedInConfig()
@@ -119,8 +119,8 @@ public function testPathLinkCanBeAddedInConfig()
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDuplicatesAreRemovedWhenAddingInConfig()
@@ -137,8 +137,8 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
@@ -155,8 +155,8 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('foo', 'foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testConfigItemsTakePrecedenceOverGeneratedItems()
@@ -172,8 +172,8 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
             NavItem::forLink('bar', 'Foo'),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
@@ -188,8 +188,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
             NavItem::fromRoute(Routes::get('docs/index')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
@@ -200,8 +200,8 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $menu = MainNavigationMenu::create();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
@@ -216,8 +216,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
             NavItem::fromRoute(Routes::get('foo/bar')),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
@@ -234,8 +234,8 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
             ]),
         ]);
 
-        $this->assertCount(count($expected), $menu->items);
-        $this->assertEquals($expected, $menu->items);
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
     }
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
@@ -362,14 +362,14 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
         $menu = MainNavigationMenu::create();
 
-        $this->assertCount(3, $menu->items);
+        $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
             DropdownNavItem::fromArray('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
-        ], $menu->items->all());
+        ], $menu->getItems()->all());
     }
 
     public function testDropdownMenuItemsAreSortedByPriority()
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 54290a8e34d..e27a832ab3b 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -51,7 +51,7 @@ public function testSidebarItemsAreAddedAutomatically()
 
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testIndexPageIsRemovedFromSidebar()
@@ -60,7 +60,7 @@ public function testIndexPageIsRemovedFromSidebar()
         Filesystem::touch('_docs/index.md');
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
@@ -69,7 +69,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
         File::put(Hyde::path('_docs/test.md'), "---\nnavigation:\n    hidden: true\n---\n\n# Foo");
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(5, $sidebar->items);
+        $this->assertCount(5, $sidebar->getItems());
     }
 
     public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
@@ -85,7 +85,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -106,7 +106,7 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
                 NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -114,7 +114,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->items->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -123,7 +123,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->items->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
@@ -145,7 +145,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
                 NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
                 NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -153,7 +153,7 @@ public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
 
-        $this->assertEquals('bar', DocumentationSidebar::create()->items->first()->getGroup());
+        $this->assertEquals('bar', DocumentationSidebar::create()->getItems()->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
@@ -276,7 +276,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
-            DocumentationSidebar::create()->items
+            DocumentationSidebar::create()->getItems()
         );
     }
 
@@ -361,14 +361,14 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(2, $sidebar->items);
+        $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
             collect([
                 NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
             ]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -378,11 +378,11 @@ public function testDuplicateLabelsWithinTheSameGroupIsRemoved()
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/bar'), priority: 999)]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -399,10 +399,10 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
         Filesystem::touch('_docs/index.md');
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/index'))]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 
@@ -412,10 +412,10 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
         Filesystem::touch('_docs/index.md');
         $sidebar = DocumentationSidebar::create();
 
-        $this->assertCount(1, $sidebar->items);
+        $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/test-0'))]),
-            $sidebar->items
+            $sidebar->getItems()
         );
     }
 

From f60ababd60d29016b83a336d5b39445aa3ec889c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:10:11 +0100
Subject: [PATCH 0176/2811] Return the values to match annotation generics

---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 9761a13a465..c2ea70c25ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -68,6 +68,6 @@ protected function sortByPriority(): void
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->values();
     }
 }

From 9c193771fb2fa6a2a9eaac7564f9ec0754baa772 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:15:58 +0100
Subject: [PATCH 0177/2811] Extract testing helper method

---
 .../tests/Feature/NavigationMenuTest.php      | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 5bc2caf372d..dfb5e89f147 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -26,17 +26,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, MainNavigationMenu::create());
+        $this->assertInstanceOf(MainNavigationMenu::class, $this->createMainNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, MainNavigationMenu::create()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createMainNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals(MainNavigationMenu::create()->getItems(), MainNavigationMenu::create()->getItems());
+        $this->assertEquals($this->createMainNavigationMenu()->getItems(), $this->createMainNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -45,7 +45,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -53,7 +53,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], MainNavigationMenu::create()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -61,7 +61,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -77,7 +77,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -90,14 +90,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, MainNavigationMenu::create()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createMainNavigationMenu()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -112,7 +112,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -130,7 +130,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -148,7 +148,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -165,7 +165,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -181,7 +181,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -197,7 +197,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -210,7 +210,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -241,7 +241,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -249,20 +249,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse(MainNavigationMenu::create()->hasDropdowns());
+        $this->assertFalse($this->createMainNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -271,7 +271,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -286,7 +286,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -306,7 +306,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -326,7 +326,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -336,7 +336,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -349,7 +349,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -360,7 +360,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -380,9 +380,14 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = MainNavigationMenu::create();
+        $menu = $this->createMainNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
+
+    protected function createMainNavigationMenu(): MainNavigationMenu
+    {
+        return MainNavigationMenu::create();
+    }
 }

From cf3869fe45d250417e77a73f872464570eede7be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:19:28 +0100
Subject: [PATCH 0178/2811] Refactor to make the base navigation menu
 constructor public

Starting to normalize the API so we can merge the classes
---
 .../src/Framework/Features/Navigation/BaseNavigationMenu.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index c2ea70c25ff..2f16ac49b46 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Collection;
+use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
@@ -17,9 +18,9 @@ abstract class BaseNavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    final protected function __construct()
+    public function __construct(Arrayable|array $items = [])
     {
-        $this->items = new Collection();
+        $this->items = new Collection($items);
     }
 
     public static function create(): static

From a673b411b7ec3292916235a24a211354d8588fc0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:23:06 +0100
Subject: [PATCH 0179/2811] Simplify static constructor

---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index c0f51cc4b3b..da092f24a26 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -13,10 +13,7 @@ class MainNavigationMenu extends BaseNavigationMenu
     /** @deprecated Temporary method for refactor */
     public static function create(): static
     {
-        $menu = new static();
-        $menu->items = GeneratesMainNavigationMenu::handle()->getItems();
-
-        return $menu;
+        return new static(GeneratesMainNavigationMenu::handle()->getItems());
     }
 
     public function hasDropdowns(): bool

From 2b94061ab95248f7d095967c8dec52b830eb02d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:26:14 +0100
Subject: [PATCH 0180/2811] Move parent logic now only used by sidebar to that
 class

---
 .../Navigation/BaseNavigationMenu.php         | 37 -------------------
 .../Navigation/DocumentationSidebar.php       | 34 ++++++++++++++++-
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 2f16ac49b46..e95c6e715a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -4,14 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
-use function collect;
-
 /** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
@@ -34,38 +29,6 @@ public static function create(): static
         return $menu;
     }
 
-    protected function generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
-    protected function canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
-    }
-
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
-        });
-    }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy('priority')->values();
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ccfaacafbf9..5b316f08362 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,7 +66,39 @@ public function makeGroupTitle(string $group): string
 
     protected function canAddRoute(Route $route): bool
     {
-        return parent::canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
+        return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
+    }
+
+    protected function parent__generate(): void
+    {
+        Routes::each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            // Since these were added explicitly by the user, we can assume they should always be shown
+            $this->items->push($item);
+        });
+    }
+
+    protected function parent__canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
+
+    protected function removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
     }
 
     private function isPageIndexPage(): bool

From 4afa8126367b4377acefaa103ed4b819ce9858dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:36:57 +0100
Subject: [PATCH 0181/2811] Move static create method to sidebar class

---
 .../Features/Navigation/BaseNavigationMenu.php        | 11 -----------
 .../Features/Navigation/DocumentationSidebar.php      | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index e95c6e715a0..950eb034e31 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -18,17 +18,6 @@ public function __construct(Arrayable|array $items = [])
         $this->items = new Collection($items);
     }
 
-    public static function create(): static
-    {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5b316f08362..ce7c9f4238d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,6 +18,17 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    public static function create(): static
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return $menu;
+    }
+
     protected function generate(): void
     {
         Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {

From fd9dfdbee0a94928961c952c91c036f2948d7774 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:37:34 +0100
Subject: [PATCH 0182/2811] Remove unused temporary parent function copy

---
 .../Features/Navigation/DocumentationSidebar.php   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ce7c9f4238d..8f6cbe803c7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -80,20 +80,6 @@ protected function canAddRoute(Route $route): bool
         return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function parent__generate(): void
-    {
-        Routes::each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
-
     protected function parent__canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation();

From 209aa9b6d4c4f507b62d4e0c523bd7ce42f4b242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:37:47 +0100
Subject: [PATCH 0183/2811] Inline parent method copy

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8f6cbe803c7..c782e8cf16e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,12 +77,7 @@ public function makeGroupTitle(string $group): string
 
     protected function canAddRoute(Route $route): bool
     {
-        return $this->parent__canAddRoute($route) && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
-    protected function parent__canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation();
+        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
     protected function removeDuplicateItems(): void

From 5f12a8692506bfa2821c68b9e1b9e90078ed56a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:42:47 +0100
Subject: [PATCH 0184/2811] Deprecate create method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c782e8cf16e..13f3d340817 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,6 +18,7 @@
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    /** @deprecated Will be moved to an action */
     public static function create(): static
     {
         $menu = new static();

From a3ae79254e7eb613cfea7256f501fc06d1f7d7c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:43:15 +0100
Subject: [PATCH 0185/2811] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 8eb8bf2b3d6..6ad2aba5717 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -14,6 +14,8 @@
 
 /**
  * @experimental This class may change significantly before its release.
+ *
+ * @todo Consider making into a service which can create the sidebar as well.
  */
 class GeneratesMainNavigationMenu
 {

From 54338f03be64ac2488bbb4ee3afc8d31afe5c303 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:49:58 +0100
Subject: [PATCH 0186/2811] Add testing helper for the new menu to aid in
 refactor

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index dfb5e89f147..1956ef3b391 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,6 +7,7 @@
 use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -15,6 +16,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -386,6 +388,12 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
 
+    protected function createNewMainNavigationMenu(): NavigationMenu
+    {
+        return GeneratesMainNavigationMenu::handle();
+    }
+
+    /** @deprecated */
     protected function createMainNavigationMenu(): MainNavigationMenu
     {
         return MainNavigationMenu::create();

From cac6d904ef262b68fcfdfd1631d42d6640f691e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:50:26 +0100
Subject: [PATCH 0187/2811] Move dropdown accessors to new menu class

---
 .../Navigation/MainNavigationMenu.php         | 25 -------------------
 .../Features/Navigation/NavigationMenu.php    | 24 ++++++++++++++++++
 .../tests/Feature/NavigationMenuTest.php      | 22 ++++++++--------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index da092f24a26..bb046359779 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,9 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-use BadMethodCallException;
-
 /** @deprecated Use the new NavigationMenu class instead */
 class MainNavigationMenu extends BaseNavigationMenu
 {
@@ -15,26 +12,4 @@ public static function create(): static
     {
         return new static(GeneratesMainNavigationMenu::handle()->getItems());
     }
-
-    public function hasDropdowns(): bool
-    {
-        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
-    }
-
-    /** @return array<string, DropdownNavItem> */
-    public function getDropdowns(): array
-    {
-        if (! $this->dropdownsEnabled()) {
-            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-        }
-
-        return $this->items->filter(function (NavItem $item): bool {
-            return $item instanceof DropdownNavItem;
-        })->values()->all();
-    }
-
-    protected function dropdownsEnabled(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4919ceb1bf1..983404b9616 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use BadMethodCallException;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -22,4 +24,26 @@ public function getItems(): Collection
     {
         return $this->items;
     }
+
+    public function hasDropdowns(): bool
+    {
+        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
+    }
+
+    /** @return array<string, DropdownNavItem> */
+    public function getDropdowns(): array
+    {
+        if (! $this->dropdownsEnabled()) {
+            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
+        }
+
+        return $this->items->filter(function (NavItem $item): bool {
+            return $item instanceof DropdownNavItem;
+        })->values()->all();
+    }
+
+    protected function dropdownsEnabled(): bool
+    {
+        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1956ef3b391..485c97e2026 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createMainNavigationMenu()->hasDropdowns());
+        $this->assertFalse($this->createNewMainNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -382,7 +382,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createNewMainNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());

From 1df963693c345d4b095c42f0eca67bc96c874292 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 15:51:54 +0100
Subject: [PATCH 0188/2811] Deprecate dropdown accessors in new class

---
 .../Features/Navigation/NavigationMenu.php          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 983404b9616..3d2538f4877 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -25,12 +25,23 @@ public function getItems(): Collection
         return $this->items;
     }
 
+    /**
+     * @experimental These do not seem to be used outside of tests and may be removed
+     *
+     * @deprecated If kept, they should be renamed to be more generic.
+     */
     public function hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
     }
 
-    /** @return array<string, DropdownNavItem> */
+    /**
+     * @experimental These do not seem to be used outside of tests and may be removed
+     *
+     * @deprecated If kept, they should be renamed to be more generic.
+     *
+     * @return array<string, DropdownNavItem>
+     */
     public function getDropdowns(): array
     {
         if (! $this->dropdownsEnabled()) {

From 323dcce9488639b92e4993ced5a47b5706d56f4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:32:42 +0100
Subject: [PATCH 0189/2811] Begin testing against new class

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 485c97e2026..d41f4e28ef9 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -28,17 +28,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, $this->createMainNavigationMenu());
+        $this->assertInstanceOf(NavigationMenu::class, $this->createNewMainNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, $this->createMainNavigationMenu()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createNewMainNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createMainNavigationMenu()->getItems(), $this->createMainNavigationMenu()->getItems());
+        $this->assertEquals($this->createNewMainNavigationMenu()->getItems(), $this->createNewMainNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()

From 6915770b395ac27097161b85d9fab107d145416c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:33:13 +0100
Subject: [PATCH 0190/2811] Invert testing helper method names

---
 .../tests/Feature/NavigationMenuTest.php      | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d41f4e28ef9..9482d6d1c64 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -28,17 +28,17 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, $this->createNewMainNavigationMenu());
+        $this->assertInstanceOf(NavigationMenu::class, $this->createNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
-        $this->assertInstanceOf(Collection::class, $this->createNewMainNavigationMenu()->getItems());
+        $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createNewMainNavigationMenu()->getItems(), $this->createNewMainNavigationMenu()->getItems());
+        $this->assertEquals($this->createNavigationMenu()->getItems(), $this->createNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()
@@ -47,7 +47,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -55,7 +55,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -63,7 +63,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -79,7 +79,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -92,14 +92,14 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testCollectionOnlyContainsNavItems()
     {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createMainNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createLegacyMainNavigationMenu()->getItems());
     }
 
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -114,7 +114,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -132,7 +132,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -150,7 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -167,7 +167,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -183,7 +183,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -212,7 +212,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -243,7 +243,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 
@@ -251,20 +251,20 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertTrue($menu->hasDropdowns());
     }
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createNewMainNavigationMenu()->hasDropdowns());
+        $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
     }
@@ -273,7 +273,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(1, $menu->getDropdowns());
 
@@ -308,7 +308,7 @@ public function testGetDropdownsWithMultipleDropdowns()
         Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
         Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(2, $menu->getDropdowns());
 
@@ -328,7 +328,7 @@ public function testGetDropdownsThrowsExceptionWhenDisabled()
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $menu->getDropdowns();
     }
 
@@ -338,7 +338,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
         Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
@@ -351,7 +351,7 @@ public function testBlogPostsDoNotGetAddedToDropdowns()
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
         Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
         $this->assertCount(0, $menu->getDropdowns());
     }
@@ -362,7 +362,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = $this->createMainNavigationMenu();
+        $menu = $this->createLegacyMainNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -382,19 +382,19 @@ public function testDropdownMenuItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
 
-        $menu = $this->createNewMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
         $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
     }
 
-    protected function createNewMainNavigationMenu(): NavigationMenu
+    protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();
     }
 
     /** @deprecated */
-    protected function createMainNavigationMenu(): MainNavigationMenu
+    protected function createLegacyMainNavigationMenu(): MainNavigationMenu
     {
         return MainNavigationMenu::create();
     }

From 483284c7becc12a57e76e3f308e144a03e41485a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:36:29 +0100
Subject: [PATCH 0191/2811] Update tests to have more helpful assertions

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 9482d6d1c64..d87b89ef843 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -34,11 +34,14 @@ public function testConstructor()
     public function testGenerateMethodCreatesCollectionOfNavItems()
     {
         $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $this->assertEquals($this->createNavigationMenu()->getItems(), $this->createNavigationMenu()->getItems());
+        $this->assertEquals(collect([
+            NavItem::fromRoute(Routes::get('index')),
+        ]), $this->createNavigationMenu()->getItems());
     }
 
     public function testItemsAreSortedByPriority()

From 0eb760ed80f45787caa1d6736ed0321f476408e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:47:19 +0100
Subject: [PATCH 0192/2811] Remove duplicate test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d87b89ef843..a1e0e992f84 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -93,11 +93,6 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testCollectionOnlyContainsNavItems()
-    {
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createLegacyMainNavigationMenu()->getItems());
-    }
-
     public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);

From 7ef717531970738e1a327f726f8f22bd846a9e5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:48:05 +0100
Subject: [PATCH 0193/2811] Move over to test new class

---
 .../tests/Feature/NavigationMenuTest.php      | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index a1e0e992f84..072a65eac6e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -50,7 +50,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -58,7 +58,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createLegacyMainNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -66,7 +66,7 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $this->file('_pages/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -82,7 +82,7 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
     {
         $this->file('_pages/foo.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -97,7 +97,7 @@ public function testExternalLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -112,7 +112,7 @@ public function testPathLinkCanBeAddedInConfig()
     {
         config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -130,7 +130,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
             NavItem::forLink('foo', 'foo'),
         ]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -148,7 +148,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
             NavItem::forLink('bar', 'foo'),
         ]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -165,7 +165,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
         config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -181,7 +181,7 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $this->file('_docs/foo.md');
         $this->file('_docs/index.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
@@ -197,7 +197,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -210,7 +210,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute(Routes::get('foo/bar')),
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             DropdownNavItem::fromArray('foo', [
@@ -360,7 +360,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
-        $menu = $this->createLegacyMainNavigationMenu();
+        $menu = $this->createNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
@@ -390,10 +390,4 @@ protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();
     }
-
-    /** @deprecated */
-    protected function createLegacyMainNavigationMenu(): MainNavigationMenu
-    {
-        return MainNavigationMenu::create();
-    }
 }

From 78d646972417a5f3fc832f4ba4bc02f9e2b9e2a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:48:14 +0100
Subject: [PATCH 0194/2811] Remove unused import

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 072a65eac6e..b722161f4d6 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -9,7 +9,6 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;

From d133dd62130ce5e5c1baed4b0035563a5701c99a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:51:35 +0100
Subject: [PATCH 0195/2811] Breaking: Remove class `MainNavigationMenu`

---
 .../Features/Navigation/MainNavigationMenu.php    | 15 ---------------
 .../tests/Feature/NavigationMenuTest.php          |  1 -
 2 files changed, 16 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
deleted file mode 100644
index bb046359779..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/** @deprecated Use the new NavigationMenu class instead */
-class MainNavigationMenu extends BaseNavigationMenu
-{
-    /** @deprecated Temporary method for refactor */
-    public static function create(): static
-    {
-        return new static(GeneratesMainNavigationMenu::handle()->getItems());
-    }
-}
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b722161f4d6..6aed9038c02 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,7 +19,6 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */

From d2660f2b9aa7b8cf491e8e27dbed31f9783444f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:51:51 +0100
Subject: [PATCH 0196/2811] Mark code that must be adapted before merge

---
 docs/digging-deeper/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 10d3ba73c90..eda34de5fea 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -300,6 +300,8 @@ The main navigation menu is the `MainNavigationMenu` class, and the documentatio
 Both extend the same `BaseNavigationMenu` class:
 
 ```php
+// TODO: Update these examples
+
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\BaseNavigationMenu;

From 98854e30a704751f55b264572badc6dc540998f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:54:00 +0100
Subject: [PATCH 0197/2811] Update test to use the new logic location

---
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index b34478273d6..f47b998ac37 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => MainNavigationMenu::create(),
+            'navigation' => GeneratesMainNavigationMenu::handle(),
         ])->render();
     }
 

From e89e44a057ade7a07e0f75d1e9f69913c8c040a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:55:28 +0100
Subject: [PATCH 0198/2811] Simplify test data setup

---
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index f47b998ac37..47fe6c7c640 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => GeneratesMainNavigationMenu::handle(),
+            'navigation' => new NavigationMenu(),
         ])->render();
     }
 

From f054e91dd339a18998a44b7d9a35502720b3c8c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 16:58:41 +0100
Subject: [PATCH 0199/2811] Inline parent methods to only child

---
 .../Features/Navigation/BaseNavigationMenu.php  | 17 +----------------
 .../Navigation/DocumentationSidebar.php         | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
index 950eb034e31..36449e0b8db 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -4,23 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Collection;
-use Illuminate\Contracts\Support\Arrayable;
-
 /** @deprecated Use the new NavigationMenu class instead */
 abstract class BaseNavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
-    public function __construct(Arrayable|array $items = [])
-    {
-        $this->items = new Collection($items);
-    }
-
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->values();
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 13f3d340817..d1d52cc5e67 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -12,12 +12,27 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends BaseNavigationMenu
 {
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    public function __construct(Arrayable|array $items = [])
+    {
+        $this->items = new Collection($items);
+    }
+
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    public function getItems(): Collection
+    {
+        return $this->items->values();
+    }
+
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {

From 12ff4cebceb24924dee33bfe14cf9fef14f40f02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:03:53 +0100
Subject: [PATCH 0200/2811] DocumentationSidebar no longer extends
 BaseNavigationMenu

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d1d52cc5e67..790ac82e595 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -17,7 +17,7 @@
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
-class DocumentationSidebar extends BaseNavigationMenu
+class DocumentationSidebar
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From bcf8ffb2d3d770c86fa652d30acf67699d6e9e66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:04:17 +0100
Subject: [PATCH 0201/2811] Remove BaseNavigationMenu coverage annotation

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 6aed9038c02..1b5ee518592 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,7 +19,6 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\BaseNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase

From 4065016d90c7e56382afe16bf8ded83d1cd08795 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:05:02 +0100
Subject: [PATCH 0202/2811] Breaking: Remove class `BaseNavigationMenu`

---
 .../Features/Navigation/BaseNavigationMenu.php        | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
deleted file mode 100644
index 36449e0b8db..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/** @deprecated Use the new NavigationMenu class instead */
-abstract class BaseNavigationMenu
-{
-    //
-}

From ae1b24d8449bb9c01e03596f07ce8cead0c573f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:14:26 +0100
Subject: [PATCH 0203/2811] Add additional unit tests

---
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b7ccacf3622..47227d4d8c3 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -47,6 +47,28 @@ public function testConstruct()
         $this->assertSame($route, $item->destination);
     }
 
+    public function testPassingRouteInstanceToConstructorUsesRouteInstance()
+    {
+        $route = new Route(new MarkdownPage());
+        $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
+    }
+
+    public function testPassingUrlToConstructorUsesExternalRoute()
+    {
+        $item = new NavItem('https://example.com', 'Home');
+        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->destination);
+        $this->assertSame('https://example.com', (string) $item->destination);
+    }
+
+    public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
+    {
+        $item = new NavItem('foo', 'Home');
+        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
+        $this->assertSame('foo', (string) $item->destination);
+    }
+
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));

From 18d2bdf05a9ba9fae2b60b672b25ce4ad7e166db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:14:46 +0100
Subject: [PATCH 0204/2811] Update NavItem constructor to resolve existing
 routes by key

---
 .../src/Framework/Features/Navigation/NavItem.php          | 2 +-
 packages/framework/tests/Unit/NavItemTest.php              | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d5e09b898f3..19b4172afe1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -32,7 +32,7 @@ class NavItem implements Stringable
     public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
     {
         if (is_string($destination)) {
-            $destination = new ExternalRoute($destination);
+            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
         $this->destination = $destination;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 47227d4d8c3..9c7d5b2b2b0 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -53,6 +53,13 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
     }
 
+    public function testPassingRouteKeyToConstructorUsesRouteInstance()
+    {
+        $route = Routes::get('index');
+
+        $this->assertSame($route, (new NavItem('index', 'Home'))->destination);
+    }
+
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');

From 9716f2cc3e00a67245d458e0a0f1cb38740c3f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 17:28:12 +0100
Subject: [PATCH 0205/2811] Deprecate class `DropdownNavItem`

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index aef24a99973..3a8aa3f0a50 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -12,6 +12,8 @@
 /**
  * A navigation item that contains other navigation items.
  *
+ * @deprecated Use the `NavItem::getChildren()` instead.
+ *
  * Unlike a regular navigation items, a dropdown item does not have a route or URL destination.
  */
 class DropdownNavItem extends NavItem

From 68c3b7f6f522a5f20ff7f8ef17907900618b6e34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:12:09 +0100
Subject: [PATCH 0206/2811] Add new `$children` array to `NavItem` class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 19b4172afe1..0959a516a49 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,6 +26,9 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    public readonly array $children;
+
     /**
      * Create a new navigation menu item.
      */

From 55d4745932240eac90241a5c3c3969901b46726a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:13:27 +0100
Subject: [PATCH 0207/2811] Add children array to constructor

---
 .../src/Framework/Features/Navigation/NavItem.php     |  3 ++-
 packages/framework/tests/Unit/NavItemTest.php         | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0959a516a49..61a14cf3ba9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -32,7 +32,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -42,6 +42,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = $group;
+        $this->children = $children;
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 9c7d5b2b2b0..bd4702f7676 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -76,6 +76,17 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
         $this->assertSame('foo', (string) $item->destination);
     }
 
+    public function testCanConstructWithChildren()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+
+        $this->assertCount(2, $item->children);
+    }
+
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));

From 1a9fc5229b75c767f65967d4c06ff4330ab63278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:14:53 +0100
Subject: [PATCH 0208/2811] Add child getter

---
 .../Framework/Features/Navigation/NavItem.php   | 12 ++++++++++++
 packages/framework/tests/Unit/NavItemTest.php   | 17 +++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 61a14cf3ba9..8aed5f37ed8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -137,6 +137,18 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
+    /**
+     * Get the children of the navigation item.
+     *
+     * For the main navigation menu, this stores any dropdown items.
+     *
+     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
     protected static function getRouteGroup(Route $route): ?string
     {
         /** @var string|null $group */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index bd4702f7676..d1aeb3eced7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -119,6 +119,23 @@ public function testGetGroup()
         $this->assertNull($navItem->getGroup());
     }
 
+    public function testGetChildren()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $this->assertSame($children, $navItem->getChildren());
+    }
+
+    public function testGetChildrenWithNoChildren()
+    {
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertEmpty($navItem->getChildren());
+    }
+
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());

From 5374dc07f5a0194f731f4fae176a8766b3e73146 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:27:47 +0100
Subject: [PATCH 0209/2811] Add new Navigation API section

---
 docs/digging-deeper/navigation.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index eda34de5fea..4ead086dd8c 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -319,3 +319,9 @@ Dropdowns are represented by `DropdownNavItem` instances, which extend the `NavI
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 ```
+
+## The Navigation API
+
+If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
+
+For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.

From 98e10b65a5d0f646715a4c6fbffe9b4c36fbdd0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:33:01 +0100
Subject: [PATCH 0210/2811] Add prefixes to test method names

---
 .../framework/tests/Unit/DropdownNavItemTest.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
index 884045acb46..e5d1eaf1cc0 100644
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ b/packages/framework/tests/Unit/DropdownNavItemTest.php
@@ -32,7 +32,7 @@ public static function tearDownAfterClass(): void
         Render::swap(new RenderData());
     }
 
-    public function testConstruct()
+    public function testDropdownConstruct()
     {
         $item = new DropdownNavItem('foo', []);
 
@@ -41,21 +41,21 @@ public function testConstruct()
         $this->assertSame(999, $item->priority);
     }
 
-    public function testConstructWithCustomPriority()
+    public function testDropdownConstructWithCustomPriority()
     {
         $item = new DropdownNavItem('foo', [], 500);
 
         $this->assertSame(500, $item->priority);
     }
 
-    public function testConstructWithNullPriority()
+    public function testDropdownConstructWithNullPriority()
     {
         $item = new DropdownNavItem('foo', [], null);
 
         $this->assertSame(999, $item->priority);
     }
 
-    public function testFromArray()
+    public function testDropdownFromArray()
     {
         $item = DropdownNavItem::fromArray('foo', []);
 
@@ -63,7 +63,7 @@ public function testFromArray()
         $this->assertSame([], $item->items);
     }
 
-    public function testWithChildren()
+    public function testDropdownWithChildren()
     {
         $children = [
             new NavItem(new Route(new MarkdownPage()), 'bar'),
@@ -76,7 +76,7 @@ public function testWithChildren()
         $this->assertSame($children, $item->items);
     }
 
-    public function testGetItems()
+    public function testDropdownGetItems()
     {
         $children = [
             new NavItem(new Route(new MarkdownPage()), 'bar'),
@@ -89,7 +89,7 @@ public function testGetItems()
         $this->assertSame($children, $item->getItems()->all());
     }
 
-    public function testCanSetPriorityInConfig()
+    public function testCanSetDropdownPriorityInConfig()
     {
         $root = Config::getFacadeRoot();
         $mock = clone $root;

From 7ad9e4913fd1ed074c4ae0efc4fac29e41b21e50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:36:55 +0100
Subject: [PATCH 0211/2811] Copy legacy config resolver to new class

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8aed5f37ed8..6ac062d6721 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -161,4 +161,16 @@ protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    protected function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    {
+        /** @var array<string, int> $config */
+        $config = Config::getArray('hyde.navigation.order', [
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ]);
+
+        return $config[$groupKey] ?? null;
+    }
 }

From 43e8d5ea5e199b2249adb7dd19efb688d8add15f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:38:28 +0100
Subject: [PATCH 0212/2811] Import namespace

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6ac062d6721..2084d91bfe8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;

From 82ee80d61c086c2ef09c95a09a3c8e2d992ed29a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:40:01 +0100
Subject: [PATCH 0213/2811] Remove child method inherited by parent

---
 .../Features/Navigation/DropdownNavItem.php         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 3a8aa3f0a50..a5e55fffd6b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 
 use function collect;
@@ -39,16 +38,4 @@ public function getItems(): Collection
     {
         return collect($this->items);
     }
-
-    private function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', [
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ]);
-
-        return $config[$groupKey] ?? null;
-    }
 }

From 229adab2a1d53c64a4973fdfa2558f81c769f414 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:46:29 +0100
Subject: [PATCH 0214/2811] Make helper static

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index a5e55fffd6b..b3119bb0827 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -23,7 +23,7 @@ class DropdownNavItem extends NavItem
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
-        parent::__construct('', $label, $priority ?? $this->searchForDropdownPriorityInNavigationConfig($label) ?? 999);
+        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2084d91bfe8..663954b5ef6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -163,7 +163,7 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
-    protected function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
         $config = Config::getArray('hyde.navigation.order', [

From 47f1b9b49c6f7d447d2f206602bbde139c84af30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:46:34 +0100
Subject: [PATCH 0215/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 663954b5ef6..dfe6e0a8a91 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -15,6 +15,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @todo Consider splitting facade methods to actual facade class.
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From a90d49c75da01b13f3d7a68e4cbcce4b1885e047 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 18:52:55 +0100
Subject: [PATCH 0216/2811] Add a `NavItem::dropdown()` facade helper

---
 .../Framework/Features/Navigation/NavItem.php | 12 +++++++++
 packages/framework/tests/Unit/NavItemTest.php | 27 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index dfe6e0a8a91..4f5f6fdbde0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -82,6 +82,18 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
         return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
+    /**
+     * Create a new dropdown navigation menu item.
+     *
+     * @param  string  $label  The label of the dropdown item.
+     * @param  array<NavItem>  $items  The items to be included in the dropdown.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.
+     */
+    public static function dropdown(string $label, array $items, ?int $priority = null): static
+    {
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+    }
+
     /**
      * Resolve a link to the navigation item.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index d1aeb3eced7..e7b68398824 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -231,6 +231,33 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('../../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
+    public function testDropdownFacade()
+    {
+        $item = NavItem::dropdown('foo', []);
+
+        $this->assertSame('foo', $item->label);
+        $this->assertSame([], $item->getChildren());
+        $this->assertSame(999, $item->priority);
+    }
+
+    public function testDropdownFacadeWithChildren()
+    {
+        $children = [
+            new NavItem(new Route(new MarkdownPage()), 'bar'),
+        ];
+
+        $item = NavItem::dropdown('foo', $children);
+        $this->assertSame($children, $item->getChildren());
+        $this->assertSame(999, $item->priority);
+    }
+
+    public function testDropdownFacadeWithCustomPriority()
+    {
+        $item = NavItem::dropdown('foo', [], 500);
+
+        $this->assertSame(500, $item->priority);
+    }
+
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 8068a2c0951e8813ae026c62c7e150bb4da3063e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:05:26 +0100
Subject: [PATCH 0217/2811] Merge legacy tests into new class

---
 .../tests/Unit/DropdownNavItemTest.php        | 92 +------------------
 packages/framework/tests/Unit/NavItemTest.php | 34 ++++++-
 2 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
index e5d1eaf1cc0..66b046c3008 100644
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ b/packages/framework/tests/Unit/DropdownNavItemTest.php
@@ -4,13 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Facades\Config;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Support\Facades\Render;
-use Hyde\Support\Models\RenderData;
-use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 
 /**
@@ -18,88 +11,5 @@
  */
 class DropdownNavItemTest extends UnitTestCase
 {
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-        Render::swap(new RenderData());
-    }
-
-    public static function tearDownAfterClass(): void
-    {
-        Render::swap(new RenderData());
-    }
-
-    public function testDropdownConstruct()
-    {
-        $item = new DropdownNavItem('foo', []);
-
-        $this->assertSame('foo', $item->label);
-        $this->assertSame([], $item->items);
-        $this->assertSame(999, $item->priority);
-    }
-
-    public function testDropdownConstructWithCustomPriority()
-    {
-        $item = new DropdownNavItem('foo', [], 500);
-
-        $this->assertSame(500, $item->priority);
-    }
-
-    public function testDropdownConstructWithNullPriority()
-    {
-        $item = new DropdownNavItem('foo', [], null);
-
-        $this->assertSame(999, $item->priority);
-    }
-
-    public function testDropdownFromArray()
-    {
-        $item = DropdownNavItem::fromArray('foo', []);
-
-        $this->assertSame('foo', $item->label);
-        $this->assertSame([], $item->items);
-    }
-
-    public function testDropdownWithChildren()
-    {
-        $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
-        ];
-
-        $item = new DropdownNavItem('foo', $children);
-        $this->assertSame($children, $item->items);
-
-        $item = DropdownNavItem::fromArray('foo', $children);
-        $this->assertSame($children, $item->items);
-    }
-
-    public function testDropdownGetItems()
-    {
-        $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
-        ];
-
-        $item = new DropdownNavItem('foo', $children);
-        $this->assertSame($children, $item->getItems()->all());
-
-        $item = DropdownNavItem::fromArray('foo', $children);
-        $this->assertSame($children, $item->getItems()->all());
-    }
-
-    public function testCanSetDropdownPriorityInConfig()
-    {
-        $root = Config::getFacadeRoot();
-        $mock = clone $root;
-        Config::swap($mock);
-
-        Config::set('hyde.navigation.order.foo', 500);
-        $item = new DropdownNavItem('foo', []);
-
-        $this->assertSame(500, $item->priority);
-
-        Config::swap($root);
-    }
+    //
 }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index e7b68398824..50627013951 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -79,12 +79,42 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     public function testCanConstructWithChildren()
     {
         $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500, null, [
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem($route, 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->label);
+        $this->assertSame($route, $item->destination);
+        $this->assertSame(500, $item->priority);
+
+        $this->assertCount(2, $item->children);
+        $this->assertSame($children, $item->children);
+
+        $this->assertSame('Foo', $item->children[0]->label);
+        $this->assertSame('Bar', $item->children[1]->label);
+
+        $this->assertSame('foo.html', $item->children[0]->getLink());
+        $this->assertSame('bar.html', $item->children[1]->getLink());
+
+        $this->assertSame(500, $item->children[0]->priority);
+        $this->assertSame(500, $item->children[1]->priority);
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
+        ];
+        $item = new NavItem('', 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->label);
+        $this->assertSame('', $item->destination->getLink());
 
         $this->assertCount(2, $item->children);
+        $this->assertSame($children, $item->children);
     }
 
     public function testGetDestination()

From 920868f1b1c0faa1ca3b7630b976d542b525203c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:20:05 +0100
Subject: [PATCH 0218/2811] Delete DropdownNavItemTest.php

---
 .../framework/tests/Unit/DropdownNavItemTest.php  | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 packages/framework/tests/Unit/DropdownNavItemTest.php

diff --git a/packages/framework/tests/Unit/DropdownNavItemTest.php b/packages/framework/tests/Unit/DropdownNavItemTest.php
deleted file mode 100644
index 66b046c3008..00000000000
--- a/packages/framework/tests/Unit/DropdownNavItemTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Testing\UnitTestCase;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\DropdownNavItem
- */
-class DropdownNavItemTest extends UnitTestCase
-{
-    //
-}

From c1848d2556866bc0de0a380c4c70fc1b241118fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:25:37 +0100
Subject: [PATCH 0219/2811] Inline fromArray method to simplify impending class
 removal

---
 .../Features/Navigation/DropdownNavItem.php          |  6 ------
 .../framework/tests/Feature/NavigationMenuTest.php   | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index b3119bb0827..04bf803cdd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -27,12 +27,6 @@ public function __construct(string $label, array $items, ?int $priority = null)
         $this->items = $items;
     }
 
-    /** @param array<NavItem> $items */
-    public static function fromArray(string $name, array $items): static
-    {
-        return new static($name, $items);
-    }
-
     /** @return Collection<NavItem> */
     public function getItems(): Collection
     {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1b5ee518592..e7b3fc1e454 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -226,7 +226,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -272,7 +272,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
             ]), ], $menu->getDropdowns());
     }
@@ -288,7 +288,7 @@ public function testGetDropdownsWithMultipleItems()
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
                 NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
             ]),
@@ -308,11 +308,11 @@ public function testGetDropdownsWithMultipleDropdowns()
         $this->assertCount(2, $menu->getDropdowns());
 
         $this->assertEquals([
-            DropdownNavItem::fromArray('foo', [
+            new DropdownNavItem('foo', [
                 NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
                 NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
             ]),
-            DropdownNavItem::fromArray('cat', [
+            new DropdownNavItem('cat', [
                 NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
             ]),
         ], $menu->getDropdowns());
@@ -363,7 +363,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            DropdownNavItem::fromArray('bar', [
+            new DropdownNavItem('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());

From 948d64766f58d741aa29f2e67bc3fed376eb1bcb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:42:27 +0100
Subject: [PATCH 0220/2811] Inline getItems method to simplify impending class
 removal

---
 .../Framework/Features/Navigation/DropdownNavItem.php  | 10 ----------
 .../framework/tests/Feature/NavigationMenuTest.php     |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 04bf803cdd0..5aaa80eeed5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -4,10 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Collection;
-
-use function collect;
-
 /**
  * A navigation item that contains other navigation items.
  *
@@ -26,10 +22,4 @@ public function __construct(string $label, array $items, ?int $priority = null)
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
     }
-
-    /** @return Collection<NavItem> */
-    public function getItems(): Collection
-    {
-        return collect($this->items);
-    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e7b3fc1e454..75134937f07 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -380,7 +380,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
-        $this->assertSame(['Foo', 'Bar', 'Baz'], $dropdowns[0]->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->items)->pluck('label')->toArray());
     }
 
     protected function createNavigationMenu(): NavigationMenu

From 0747f2824f4493b1a92901226481ee7ba302bf3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:10 +0100
Subject: [PATCH 0221/2811] Deprecate items array

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 5aaa80eeed5..38fc99d055f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -13,7 +13,7 @@
  */
 class DropdownNavItem extends NavItem
 {
-    /** @var array<NavItem> */
+    /** @deprecated */
     public array $items;
 
     /** @param array<NavItem> $items */

From 74c2d9a806fe407c736c0d2f57eb390ce3e2b530 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:27 +0100
Subject: [PATCH 0222/2811] Add temporary compatibility for class being removed

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 38fc99d055f..99620af32e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -21,5 +21,6 @@ public function __construct(string $label, array $items, ?int $priority = null)
     {
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
         $this->items = $items;
+        $this->children = $items;
     }
 }

From 57f0f151b9ccf4be4277ba8b0f9fb5eabf525827 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:49:52 +0100
Subject: [PATCH 0223/2811] Fix readonly assignment

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 99620af32e2..84753e80fa9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -19,8 +19,7 @@ class DropdownNavItem extends NavItem
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
-        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999);
+        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
         $this->items = $items;
-        $this->children = $items;
     }
 }

From cf888d9435cb6d22b7c097179742683ada3ca8b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:56:00 +0100
Subject: [PATCH 0224/2811] Get children instead of deprecated items

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index ba8c148b583..aabc9e671f0 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
-                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->items"/>
+                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 75134937f07..e9c522c0f4f 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -380,7 +380,7 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $menu = $this->createNavigationMenu();
         $dropdowns = $menu->getDropdowns();
 
-        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->items)->pluck('label')->toArray());
+        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
     }
 
     protected function createNavigationMenu(): NavigationMenu

From 04128ab455ea88888cc9aa9bece9e1c2ef82f09e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 19:57:21 +0100
Subject: [PATCH 0225/2811] Remove items array

---
 .../src/Framework/Features/Navigation/DropdownNavItem.php     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
index 84753e80fa9..d774008d46f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
@@ -13,13 +13,9 @@
  */
 class DropdownNavItem extends NavItem
 {
-    /** @deprecated */
-    public array $items;
-
     /** @param array<NavItem> $items */
     public function __construct(string $label, array $items, ?int $priority = null)
     {
         parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
-        $this->items = $items;
     }
 }

From e093242a243007f841e8271c748b331ad551613e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:15 +0100
Subject: [PATCH 0226/2811] Add additional unit test

---
 packages/framework/tests/Unit/NavItemTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 50627013951..2d3a81ed193 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -298,6 +298,24 @@ public function testIsCurrent()
         $this->assertFalse(NavItem::fromRoute(new Route(new InMemoryPage('bar')))->isCurrent());
     }
 
+    public function testIsCurrentWithExternalRoute()
+    {
+        Render::swap(Mockery::mock(RenderData::class, [
+            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRouteKey' => 'foo',
+        ]));
+        $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+
+        Render::swap(Mockery::mock(RenderData::class, [
+            'getRoute' => new ExternalRoute('foo'),
+            'getRouteKey' => 'foo',
+        ]));
+
+        $this->assertTrue(NavItem::forLink('foo', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+    }
+
     public function testGetGroupWithNoGroup()
     {
         $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroup());

From d6a031dc84bb134bb1e5be378b990779dfaedf27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:35 +0100
Subject: [PATCH 0227/2811] Remove assertions not reachable by code

This should not be possible by the code itself
---
 packages/framework/tests/Unit/NavItemTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2d3a81ed193..e5860a02726 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -306,14 +306,6 @@ public function testIsCurrentWithExternalRoute()
         ]));
         $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
         $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
-
-        Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => new ExternalRoute('foo'),
-            'getRouteKey' => 'foo',
-        ]));
-
-        $this->assertTrue(NavItem::forLink('foo', 'bar')->isCurrent());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
     }
 
     public function testGetGroupWithNoGroup()

From 9cb345be077fbfb2421dd67c799b5bd7d787ea70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:05:56 +0100
Subject: [PATCH 0228/2811] Remove unnecessary parentheses in file

---
 packages/framework/tests/Unit/NavItemTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index e5860a02726..a91f22f060b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -237,7 +237,7 @@ public function testForRouteWithCustomPriority()
     public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
 
@@ -245,7 +245,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo/bar'))),
+            'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
@@ -253,7 +253,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
         $this->assertSame('../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo/bar/baz'))),
+            'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
@@ -291,7 +291,7 @@ public function testDropdownFacadeWithCustomPriority()
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
         $this->assertTrue(NavItem::fromRoute(new Route(new InMemoryPage('foo')))->isCurrent());
@@ -301,7 +301,7 @@ public function testIsCurrent()
     public function testIsCurrentWithExternalRoute()
     {
         Render::swap(Mockery::mock(RenderData::class, [
-            'getRoute' => (new Route(new InMemoryPage('foo'))),
+            'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
         $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());

From ca831e2303b538f1bb1573cbd3abb6024c738b2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:06:34 +0100
Subject: [PATCH 0229/2811] Move up helper in source

---
 .../Framework/Features/Navigation/NavItem.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4f5f6fdbde0..45700426222 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -144,14 +144,6 @@ public function getGroup(): ?string
         return $this->group;
     }
 
-    /**
-     * Check if the NavItem instance is the current page.
-     */
-    public function isCurrent(): bool
-    {
-        return Hyde::currentRoute()->getLink() === (string) $this->destination;
-    }
-
     /**
      * Get the children of the navigation item.
      *
@@ -164,6 +156,14 @@ public function getChildren(): array
         return $this->children;
     }
 
+    /**
+     * Check if the NavItem instance is the current page.
+     */
+    public function isCurrent(): bool
+    {
+        return Hyde::currentRoute()->getLink() === (string) $this->destination;
+    }
+
     protected static function getRouteGroup(Route $route): ?string
     {
         /** @var string|null $group */

From 90b2c44b41141af362afb85190a496956812822f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:08:01 +0100
Subject: [PATCH 0230/2811] Add a `NavItem::hasChildren()` helper

---
 .../src/Framework/Features/Navigation/NavItem.php |  8 ++++++++
 packages/framework/tests/Unit/NavItemTest.php     | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 45700426222..562b8b55922 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -156,6 +156,14 @@ public function getChildren(): array
         return $this->children;
     }
 
+    /**
+     * Check if the NavItem instance has children.
+     */
+    public function hasChildren(): bool
+    {
+        return count($this->children) > 0;
+    }
+
     /**
      * Check if the NavItem instance is the current page.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a91f22f060b..78e3407b0f7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -288,6 +288,21 @@ public function testDropdownFacadeWithCustomPriority()
         $this->assertSame(500, $item->priority);
     }
 
+    public function testHasChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $this->assertFalse($item->hasChildren());
+    }
+
+    public function testHasChildrenWithChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+        $this->assertTrue($item->hasChildren());
+    }
+
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 98a3b6c81a7f5f643d0899c084f774b72f88ccee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:09:26 +0100
Subject: [PATCH 0231/2811] Check dropdown state using helper instead of
 instanceof

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index aabc9e671f0..899ccd75f31 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -35,7 +35,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\DropdownNavItem)
+                    @if($item->hasChildren())
                         <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')

From 7f754b5fb96d63bece7b8bb6259ca066800a5d36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:24:35 +0100
Subject: [PATCH 0232/2811] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 562b8b55922..8aa758eb100 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -16,6 +16,7 @@
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * @todo Consider splitting facade methods to actual facade class.
+ * @todo Consider adding an "identifier" property to make it more visible how items are identified, for example when modifying sidebars in the config.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor

From 6d0603309eb53a2ccfea96ebb4f60b151b0de539 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:32:57 +0100
Subject: [PATCH 0233/2811] No longer throw exception when disabled

Since children can now manually be added we can't throw for this anymore
---
 .../src/Framework/Features/Navigation/NavigationMenu.php | 5 -----
 packages/framework/tests/Feature/NavigationMenuTest.php  | 9 +++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 3d2538f4877..6bc0ccfb2f1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use BadMethodCallException;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -44,10 +43,6 @@ public function hasDropdowns(): bool
      */
     public function getDropdowns(): array
     {
-        if (! $this->dropdownsEnabled()) {
-            throw new BadMethodCallException('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-        }
-
         return $this->items->filter(function (NavItem $item): bool {
             return $item instanceof DropdownNavItem;
         })->values()->all();
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e9c522c0f4f..50df269e621 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -318,13 +317,11 @@ public function testGetDropdownsWithMultipleDropdowns()
         ], $menu->getDropdowns());
     }
 
-    public function testGetDropdownsThrowsExceptionWhenDisabled()
+    public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Dropdowns are not enabled. Enable it by setting `hyde.navigation.subdirectories` to `dropdown`.');
-
         $menu = $this->createNavigationMenu();
-        $menu->getDropdowns();
+        $this->assertCount(0, $menu->getDropdowns());
+        $this->assertSame([], $menu->getDropdowns());
     }
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()

From 74fbe6b2ab28e9afd166e43398ca6f79331d993c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:44:46 +0100
Subject: [PATCH 0234/2811] Skip tests for deprecated method

Want to see the impact of this
---
 packages/framework/tests/Feature/NavigationMenuTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 50df269e621..29e25ac4add 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -236,6 +236,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -243,6 +244,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
 
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -251,6 +253,7 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
@@ -326,6 +329,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
@@ -338,6 +342,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());

From 72c969ebb57e88cabc9b718fb26fd6fd321b8d93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:48:42 +0100
Subject: [PATCH 0235/2811] Skip tests for deprecated method

Want to see the impact of this
---
 packages/framework/tests/Feature/NavigationMenuTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 29e25ac4add..ff3b1851b35 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -260,6 +260,7 @@ public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -268,6 +269,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
 
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -281,6 +283,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
 
     public function testGetDropdownsWithMultipleItems()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -299,6 +302,7 @@ public function testGetDropdownsWithMultipleItems()
 
     public function testGetDropdownsWithMultipleDropdowns()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -322,6 +326,7 @@ public function testGetDropdownsWithMultipleDropdowns()
 
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
@@ -373,6 +378,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testDropdownMenuItemsAreSortedByPriority()
     {
+        $this->markTestSkipped('Tested method may be removed.');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From b9554d270afd1c906295c2d69f1eb279404d0131 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:49:32 +0100
Subject: [PATCH 0236/2811] Prefix legacy methods

Want to see the impact of this
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 6bc0ccfb2f1..b172afab164 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -29,7 +29,7 @@ public function getItems(): Collection
      *
      * @deprecated If kept, they should be renamed to be more generic.
      */
-    public function hasDropdowns(): bool
+    public function legacy_hasDropdowns(): bool
     {
         return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
     }
@@ -41,7 +41,7 @@ public function hasDropdowns(): bool
      *
      * @return array<string, DropdownNavItem>
      */
-    public function getDropdowns(): array
+    public function legacy_getDropdowns(): array
     {
         return $this->items->filter(function (NavItem $item): bool {
             return $item instanceof DropdownNavItem;

From 70525cb76fc2a39e3265d877a80af51ec3d4ea48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:50:55 +0100
Subject: [PATCH 0237/2811] Add dropdowns as new implementation type

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 6ad2aba5717..0131bf34f31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -72,7 +72,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(new DropdownNavItem($group, $items));
+            $this->items->add(NavItem::dropdown($group, $items));
         }
     }
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index ff3b1851b35..ffcc289e1d3 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -225,7 +225,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            new DropdownNavItem('foo', [
+            NavItem::dropdown('foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -370,7 +370,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            new DropdownNavItem('bar', [
+            NavItem::dropdown('bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());

From a62664bb30bbec99e29c4c2e71c3203c24743633 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 20:57:23 +0100
Subject: [PATCH 0238/2811] Breaking: Remove class `DropdownNavItem`

---
 .../Features/Navigation/DropdownNavItem.php   | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php b/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
deleted file mode 100644
index d774008d46f..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/DropdownNavItem.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * A navigation item that contains other navigation items.
- *
- * @deprecated Use the `NavItem::getChildren()` instead.
- *
- * Unlike a regular navigation items, a dropdown item does not have a route or URL destination.
- */
-class DropdownNavItem extends NavItem
-{
-    /** @param array<NavItem> $items */
-    public function __construct(string $label, array $items, ?int $priority = null)
-    {
-        parent::__construct('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, children: $items);
-    }
-}

From 78d7570060718c5bca1428e4464aaf630d66ec6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:03:32 +0100
Subject: [PATCH 0239/2811] Remove NavigationMenu dropdown accessor methods

These do not seem to be used outside of tests and don't offer anything useful
---
 .../Features/Navigation/NavigationMenu.php    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index b172afab164..4919ceb1bf1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -23,33 +22,4 @@ public function getItems(): Collection
     {
         return $this->items;
     }
-
-    /**
-     * @experimental These do not seem to be used outside of tests and may be removed
-     *
-     * @deprecated If kept, they should be renamed to be more generic.
-     */
-    public function legacy_hasDropdowns(): bool
-    {
-        return $this->dropdownsEnabled() && count($this->getDropdowns()) >= 1;
-    }
-
-    /**
-     * @experimental These do not seem to be used outside of tests and may be removed
-     *
-     * @deprecated If kept, they should be renamed to be more generic.
-     *
-     * @return array<string, DropdownNavItem>
-     */
-    public function legacy_getDropdowns(): array
-    {
-        return $this->items->filter(function (NavItem $item): bool {
-            return $item instanceof DropdownNavItem;
-        })->values()->all();
-    }
-
-    protected function dropdownsEnabled(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
 }

From f2becade2f9dcba19f06dc9061e43a121967bb83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:04:24 +0100
Subject: [PATCH 0240/2811] Update test method skip notice for
 https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a

---
 .../framework/tests/Feature/NavigationMenuTest.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index ffcc289e1d3..5c8fdcafcbe 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -236,7 +236,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -244,7 +244,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
 
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -253,14 +253,14 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
 
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -378,7 +378,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testDropdownMenuItemsAreSortedByPriority()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From 91e6d6ad43b9d4b4b7664ed22ee648ddfef35e27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:07:12 +0100
Subject: [PATCH 0241/2811] Formatting

---
 .../framework/tests/Feature/NavigationMenuTest.php    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 5c8fdcafcbe..64fda5a768a 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -237,6 +237,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
     public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
@@ -245,6 +246,7 @@ public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
     public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -254,6 +256,7 @@ public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
     public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
     }
@@ -261,6 +264,7 @@ public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
     public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -270,6 +274,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
         $menu = $this->createNavigationMenu();
@@ -284,6 +289,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     public function testGetDropdownsWithMultipleItems()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -303,6 +309,7 @@ public function testGetDropdownsWithMultipleItems()
     public function testGetDropdownsWithMultipleDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -327,6 +334,7 @@ public function testGetDropdownsWithMultipleDropdowns()
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
         $this->assertSame([], $menu->getDropdowns());
@@ -335,6 +343,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new DocumentationPage('foo'))->getRoute());
@@ -348,6 +357,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
         $this->markTestSkipped('Tested method may be removed.');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute((new MarkdownPost('foo'))->getRoute());
@@ -379,6 +389,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
     public function testDropdownMenuItemsAreSortedByPriority()
     {
         $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
+
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));

From 7c8ea3b86464095a594ce3e45c4feaa9e82f2964 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:09:38 +0100
Subject: [PATCH 0242/2811] Create NavigationMenuUnitTest.php

---
 .../tests/Unit/NavigationMenuUnitTest.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavigationMenuUnitTest.php

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
new file mode 100644
index 00000000000..3e22cc5fbf3
--- /dev/null
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ */
+class NavigationMenuUnitTest extends UnitTestCase
+{
+    //
+}

From bd0381ba6462996b225642a5413379acae4bd3c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:09:44 +0100
Subject: [PATCH 0243/2811] Link to unit test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 64fda5a768a..6bee9dd592c 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -19,6 +19,8 @@
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class NavigationMenuTest extends TestCase
 {

From abd5c186d83963d574d4bba869bfb0d0b99efb97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:04 +0100
Subject: [PATCH 0244/2811] Test construction

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 3e22cc5fbf3..d743dc3f151 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -13,5 +14,24 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
-    //
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ]));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ])));
+    }
 }

From 336c48df900f9340a66f640dcb6670f977d0b766 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:22 +0100
Subject: [PATCH 0245/2811] Test getter

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index d743dc3f151..c9ad45b2082 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -34,4 +34,25 @@ public function testCanConstructWithItemsArrayable()
             'item2' => 'value2',
         ])));
     }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ]))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect([
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ])))->getItems());
+    }
 }

From d7625aee9bcefe4058da12cd89f617ad8643c1c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:18:55 +0100
Subject: [PATCH 0246/2811] Test retrieval

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index c9ad45b2082..eeb51958740 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -55,4 +55,27 @@ public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
             'item2' => 'value2',
         ])))->getItems());
     }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+        $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+        $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new NavigationMenu())->getItems()->all());
+    }
 }

From a520f06aa43103bd70b3b16370b28ad81a757c93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:19:17 +0100
Subject: [PATCH 0247/2811] Extract testing helper

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 38 +++++++------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index eeb51958740..52f8d444203 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -21,18 +21,12 @@ public function testCanConstruct()
 
     public function testCanConstructWithItemsArray()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ]));
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu($this->getItems()));
     }
 
     public function testCanConstructWithItemsArrayable()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ])));
+        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect($this->getItems())));
     }
 
     public function testGetItemsReturnsCollection()
@@ -42,35 +36,23 @@ public function testGetItemsReturnsCollection()
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ]))->getItems());
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect([
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ])))->getItems());
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
-        $items = [
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ];
+        $items = $this->getItems();
         $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
-        $items = [
-            'item1' => 'value1',
-            'item2' => 'value2',
-        ];
+        $items = $this->getItems();
         $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
     }
 
@@ -78,4 +60,12 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     {
         $this->assertSame([], (new NavigationMenu())->getItems()->all());
     }
+
+    protected function getItems(): array
+    {
+        return [
+            'item1' => 'value1',
+            'item2' => 'value2',
+        ];
+    }
 }

From 57b11fb683700bfe50b7e47c556a4fa97c215569 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:19:57 +0100
Subject: [PATCH 0248/2811] Add code spacing

---
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 52f8d444203..5a0137bdf48 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -47,12 +47,14 @@ public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     public function testGetItemsReturnsItems()
     {
         $items = $this->getItems();
+
         $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
         $items = $this->getItems();
+
         $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
     }
 

From f0396bcb71cb91a4a53b0bc437e71c4ecd7ba335 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:20:03 +0100
Subject: [PATCH 0249/2811] Cleanup code

---
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5a0137bdf48..a1b7d58c786 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
@@ -31,17 +32,17 @@ public function testCanConstructWithItemsArrayable()
 
     public function testGetItemsReturnsCollection()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu())->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu())->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu($this->getItems()))->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
+        $this->assertInstanceOf(Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()

From 51f4c64ca57e97d6c2f3ff2134b0ca8051138615 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:24:16 +0100
Subject: [PATCH 0250/2811] Sketch out add method contract

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4919ceb1bf1..c0174ea2134 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -22,4 +22,9 @@ public function getItems(): Collection
     {
         return $this->items;
     }
+
+    public function add(NavItem $item): void
+    {
+        //
+    }
 }

From 238dac75d43f1192079d826eafb0d7778484bb1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:27:07 +0100
Subject: [PATCH 0251/2811] Add todo concerning priorities

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c0174ea2134..82aaf2bfc2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,6 +20,8 @@ public function __construct(Arrayable|array $items = [])
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
+        // TODO: Consider sorting by priority here, as orders may have been changed after adding items
+
         return $this->items;
     }
 

From 5cb76da6e7dc87a8aa22320ce5c868874a48a427 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:29:44 +0100
Subject: [PATCH 0252/2811] Sketch out implementation idea

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 82aaf2bfc2f..cf3fb231968 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -27,6 +27,6 @@ public function getItems(): Collection
 
     public function add(NavItem $item): void
     {
-        //
+        // If item has identifier, put $this->items->put($item->identifier(), $item);
     }
 }

From 2a31157686fb0ff4a73a5090fc25451809cb5ec2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:29:47 +0100
Subject: [PATCH 0253/2811] Revert "Add todo concerning priorities"

This reverts commit 238dac75d43f1192079d826eafb0d7778484bb1d. See https://github.com/hydephp/develop/pull/1568/files#r1490023195
---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cf3fb231968..0019292c4e4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,8 +20,6 @@ public function __construct(Arrayable|array $items = [])
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
-        // TODO: Consider sorting by priority here, as orders may have been changed after adding items
-
         return $this->items;
     }
 

From ffe7ad81544defc8331603a3b74cb78196714662 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:31:15 +0100
Subject: [PATCH 0254/2811] Push added items directly

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0019292c4e4..9e4901c484b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -25,6 +25,6 @@ public function getItems(): Collection
 
     public function add(NavItem $item): void
     {
-        // If item has identifier, put $this->items->put($item->identifier(), $item);
+        $this->items->push($item);
     }
 }

From 9330ac7a1c1d98892bb0855bd649875065136d73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:33:22 +0100
Subject: [PATCH 0255/2811] Test the add method

---
 .../framework/tests/Unit/NavigationMenuUnitTest.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index a1b7d58c786..c960b2dce01 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -6,6 +6,8 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 
 /**
@@ -64,6 +66,17 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
         $this->assertSame([], (new NavigationMenu())->getItems()->all());
     }
 
+    public function testCanAddItems()
+    {
+        $menu = new NavigationMenu();
+        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
     protected function getItems(): array
     {
         return [

From 95b395ce69a1b3e0e373285adcb64aa0f3cc57d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:37:09 +0100
Subject: [PATCH 0256/2811] Update navigation menu to construct items using add
 method

This adds an implicit type system ensuring the types of the internal array
---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++++-
 packages/framework/tests/Unit/NavigationMenuUnitTest.php    | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9e4901c484b..9edc2783dd6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -14,7 +14,11 @@ class NavigationMenu
 
     public function __construct(Arrayable|array $items = [])
     {
-        $this->items = new Collection($items);
+        $this->items = new Collection();
+
+        foreach ($items as $item) {
+            $this->add($item);
+        }
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index c960b2dce01..57ad6222993 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -80,8 +80,9 @@ public function testCanAddItems()
     protected function getItems(): array
     {
         return [
-            'item1' => 'value1',
-            'item2' => 'value2',
+            new NavItem(new ExternalRoute('/'), 'Home'),
+            new NavItem(new ExternalRoute('/about'), 'About'),
+            new NavItem(new ExternalRoute('/contact'), 'Contact'),
         ];
     }
 }

From 088d5b5e6f55d61050890c2cbe4bab312fa62bb6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:38:21 +0100
Subject: [PATCH 0257/2811] Update array generics to match new forced data
 state

Data format is ensured by https://github.com/hydephp/develop/pull/1568/commits/95b395ce69a1b3e0e373285adcb64aa0f3cc57d5
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9edc2783dd6..d187de988bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -9,7 +9,7 @@
 
 class NavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -21,7 +21,7 @@ public function __construct(Arrayable|array $items = [])
         }
     }
 
-    /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {
         return $this->items;

From dcc1a5ff94285f56b683f3eba635c4515936a3a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:42:27 +0100
Subject: [PATCH 0258/2811] Add code documentation for the navigation menu
 class

---
 .../Features/Navigation/NavigationMenu.php        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d187de988bb..4f5a40ba4b8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -7,11 +7,17 @@
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
+/**
+ * Represents a site navigation menu, and contains all of its navigation items.
+ */
 class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
+    /**
+     * Create a new navigation menu instance.
+     */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
@@ -21,12 +27,19 @@ public function __construct(Arrayable|array $items = [])
         }
     }
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * Get the navigation items in the menu.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     public function getItems(): Collection
     {
         return $this->items;
     }
 
+    /**
+     * Add a navigation item to the navigation menu.
+     */
     public function add(NavItem $item): void
     {
         $this->items->push($item);

From 1078ee6a1506f708b37ab68be7dda2fb21e1aeac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:48:16 +0100
Subject: [PATCH 0259/2811] Normalize skip message

---
 .../framework/tests/Feature/NavigationMenuTest.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 6bee9dd592c..cf3e5f2d451 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -275,7 +275,7 @@ public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
 
     public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
         Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
@@ -290,7 +290,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
 
     public function testGetDropdownsWithMultipleItems()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -310,7 +310,7 @@ public function testGetDropdownsWithMultipleItems()
 
     public function testGetDropdownsWithMultipleDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -335,7 +335,7 @@ public function testGetDropdownsWithMultipleDropdowns()
 
     public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         $menu = $this->createNavigationMenu();
         $this->assertCount(0, $menu->getDropdowns());
@@ -344,7 +344,7 @@ public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
 
     public function testDocumentationPagesDoNotGetAddedToDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
@@ -358,7 +358,7 @@ public function testDocumentationPagesDoNotGetAddedToDropdowns()
 
     public function testBlogPostsDoNotGetAddedToDropdowns()
     {
-        $this->markTestSkipped('Tested method may be removed.');
+        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
 
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 

From c1ca8fc0125ed51f5535e6627bdbdbb40baa2611 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 21:48:53 +0100
Subject: [PATCH 0260/2811] Test service container integration

---
 .../tests/Feature/NavigationMenuTest.php          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index cf3e5f2d451..00bac2a5c96 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -404,6 +405,20 @@ public function testDropdownMenuItemsAreSortedByPriority()
         $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
     }
 
+    public function testCanGetMenuFromServiceContainer()
+    {
+        $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));
+    }
+
+    public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
+    {
+        $navigation = app('navigation')->getMenu('main');
+        $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
+
+        $this->assertCount(2, $navigation->getItems());
+        $this->assertSame('Foo', $navigation->getItems()->last()->label);
+    }
+
     protected function createNavigationMenu(): NavigationMenu
     {
         return GeneratesMainNavigationMenu::handle();

From 8b0f21c9d5348bf946f64747e90f54eff74bde94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:04:28 +0100
Subject: [PATCH 0261/2811] Automatically sort items by priority upon retrieval

I considered adding a secondary method to get sorted items, but I anticipate most people will want it sorted. Otherwise they can extend the class and change it. Or suggest a PR to add a $sort parameter. The values are reset to reorder the keys.
---
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../tests/Unit/NavigationMenuUnitTest.php     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4f5a40ba4b8..4473baca808 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -34,7 +34,7 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->sortBy('priority')->values();
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 57ad6222993..5242dd9f317 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -77,6 +77,34 @@ public function testCanAddItems()
         $this->assertSame($item, $menu->getItems()->first());
     }
 
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new NavigationMenu();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new NavigationMenu();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
     protected function getItems(): array
     {
         return [

From 3a7280394136825c64e0c643c0b9c0681f63d534 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:16:38 +0100
Subject: [PATCH 0262/2811] Document sorting

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4473baca808..ca3021f1336 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -30,6 +30,8 @@ public function __construct(Arrayable|array $items = [])
     /**
      * Get the navigation items in the menu.
      *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
      * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
      */
     public function getItems(): Collection

From 86e9e48208b221b77777aa5065fe1019cdc875a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:17:34 +0100
Subject: [PATCH 0263/2811] Begin overview

---
 docs/digging-deeper/navigation.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4ead086dd8c..4d201775d42 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -325,3 +325,11 @@ use Hyde\Framework\Features\Navigation\DropdownNavItem;
 If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
 
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
+
+### Overview
+
+The Navigation API consists of the following classes, allowing you to fluently interact with the navigation menus:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+```

From 80899397081abadbd821dc014ac6599e181dc5b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 14 Feb 2024 22:23:03 +0100
Subject: [PATCH 0264/2811] Remove tests for methods removed in
 https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a

---
 .../tests/Feature/NavigationMenuTest.php      | 153 ------------------
 1 file changed, 153 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 00bac2a5c96..83c10b62dd5 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -8,11 +8,8 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
@@ -237,140 +234,6 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testHasDropdownsReturnsFalseWhenThereAreNoDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNavigationMenu();
-        $this->assertFalse($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsReturnsTrueWhenThereAreDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNavigationMenu();
-        $this->assertTrue($menu->hasDropdowns());
-    }
-
-    public function testHasDropdownsAlwaysReturnsFalseWhenDropdownsAreDisabled()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $this->assertFalse($this->createNavigationMenu()->hasDropdowns());
-    }
-
-    public function testGetDropdownsReturnsEmptyArrayThereAreNoDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsReturnsCorrectArrayWhenThereAreDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-            ]), ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleItems()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        $menu = $this->createNavigationMenu();
-
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsWithMultipleDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPage('foo/bar'))->getRoute());
-        Routes::addRoute((new MarkdownPage('foo/baz'))->getRoute());
-        Routes::addRoute((new MarkdownPage('cat/hat'))->getRoute());
-
-        $menu = $this->createNavigationMenu();
-
-        $this->assertCount(2, $menu->getDropdowns());
-
-        $this->assertEquals([
-            new DropdownNavItem('foo', [
-                NavItem::fromRoute((new MarkdownPage('foo/bar'))->getRoute()),
-                NavItem::fromRoute((new MarkdownPage('foo/baz'))->getRoute()),
-            ]),
-            new DropdownNavItem('cat', [
-                NavItem::fromRoute((new MarkdownPage('cat/hat'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testGetDropdownsDoesNotThrowWhenAutomaticDropdownsIsDisabled()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(0, $menu->getDropdowns());
-        $this->assertSame([], $menu->getDropdowns());
-    }
-
-    public function testDocumentationPagesDoNotGetAddedToDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new DocumentationPage('foo'))->getRoute());
-        Routes::addRoute((new DocumentationPage('bar/baz'))->getRoute());
-        $menu = $this->createNavigationMenu();
-
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
-    public function testBlogPostsDoNotGetAddedToDropdowns()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute((new MarkdownPost('foo'))->getRoute());
-        Routes::addRoute((new MarkdownPost('bar/baz'))->getRoute());
-
-        $menu = $this->createNavigationMenu();
-        $this->assertFalse($menu->hasDropdowns());
-        $this->assertCount(0, $menu->getDropdowns());
-    }
-
     public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
@@ -389,22 +252,6 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         ], $menu->getItems()->all());
     }
 
-    public function testDropdownMenuItemsAreSortedByPriority()
-    {
-        $this->markTestSkipped('Tested method removed in https://github.com/hydephp/develop/commit/78d7570060718c5bca1428e4464aaf630d66ec6a');
-
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        Routes::addRoute(new Route(new MarkdownPage('foo/foo', ['navigation.priority' => 1])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/bar', ['navigation.priority' => 2])));
-        Routes::addRoute(new Route(new MarkdownPage('foo/baz', ['navigation.priority' => 3])));
-
-        $menu = $this->createNavigationMenu();
-        $dropdowns = $menu->getDropdowns();
-
-        $this->assertSame(['Foo', 'Bar', 'Baz'], collect($dropdowns[0]->getChildren())->pluck('label')->toArray());
-    }
-
     public function testCanGetMenuFromServiceContainer()
     {
         $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));

From 1647be4f748f0493e642b466b706944e9ab6d62a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:08:33 +0100
Subject: [PATCH 0265/2811] Create GeneratesDocumentationSidebarMenu.php

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
new file mode 100644
index 00000000000..d9e6d69e081
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class GeneratesDocumentationSidebarMenu
+{
+    //
+}

From 2a21f77e02e4462fdaaacf334dc46bbab6f889a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:08:47 +0100
Subject: [PATCH 0266/2811] Add design annotations

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d9e6d69e081..e72cb873f49 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ *
+ * @todo Consider making into a service which can create the sidebar as well.
+ */
 class GeneratesDocumentationSidebarMenu
 {
     //

From a9342cfb765601f1047aa02c4db84aca793b6f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:09:34 +0100
Subject: [PATCH 0267/2811] Copy over base contract from related class

---
 .../GeneratesDocumentationSidebarMenu.php     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e72cb873f49..50715a1f245 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -11,5 +13,22 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+    }
+
+    public static function handle(): DocumentationSidebar
+    {
+        $menu = new static();
+
+        $menu->generate();
+        $menu->sortByPriority();
+        $menu->removeDuplicateItems();
+
+        return new DocumentationSidebar($menu->items);
+    }
 }

From 80df7fffdabf6fae2d4c2e912654e0e5fea93dd4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:10:09 +0100
Subject: [PATCH 0268/2811] Copy over helper methods for refactor

---
 .../GeneratesDocumentationSidebarMenu.php     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 50715a1f245..a71d19c6a97 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,8 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Support\Models\Route;
+use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -31,4 +36,32 @@ public static function handle(): DocumentationSidebar
 
         return new DocumentationSidebar($menu->items);
     }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
+    }
+
+    protected function removeDuplicateItems(): void
+    {
+        $this->items = $this->items->unique(function (NavItem $item): string {
+            // Filter using a combination of the group and label to allow duplicate labels in different groups
+            return $item->getGroup().$item->label;
+        });
+    }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy('priority')->values();
+    }
+
+    private function isPageIndexPage(): bool
+    {
+        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
+    }
+
+    private function shouldIndexPageBeActive(string $group): bool
+    {
+        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
+    }
 }

From fe4b91fd32a8f3ce5035df417add227ecbfefb75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:14:27 +0100
Subject: [PATCH 0269/2811] Deprecate methods being refactored

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 790ac82e595..c9a029020d6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -91,11 +91,13 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
+    /** @deprecated Move to new action */
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
+    /** @deprecated Move to new action */
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
@@ -104,16 +106,19 @@ protected function removeDuplicateItems(): void
         });
     }
 
+    /** @deprecated Move to new action */
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }
 
+    /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
+    /** @deprecated Move to new action */
     private function shouldIndexPageBeActive(string $group): bool
     {
         return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();

From bed0d5d8d0a3d7678bf6529b673b25312809e487 Mon Sep 17 00:00:00 2001
From: caendesilva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:17:34 +0100
Subject: [PATCH 0270/2811] Begin copying over generate method to action

---
 .../Features/Navigation/DocumentationSidebar.php  |  1 +
 .../GeneratesDocumentationSidebarMenu.php         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c9a029020d6..c4ffabaf2fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -45,6 +45,7 @@ public static function create(): static
         return $menu;
     }
 
+    /** @deprecated Move to new action */
     protected function generate(): void
     {
         Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a71d19c6a97..7fe9094cafd 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Facades\Routes;
 
 use function collect;
 
@@ -37,6 +38,20 @@ public static function handle(): DocumentationSidebar
         return new DocumentationSidebar($menu->items);
     }
 
+    protected function generate(): void
+    {
+        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+            }
+        });
+
+        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
+        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
+        }
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From 80243ae50e29cee54cfaf24b2aa9740a2227ea75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:29:55 +0100
Subject: [PATCH 0271/2811] Defer logic to new action

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c4ffabaf2fa..665e845c341 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -36,13 +36,7 @@ public function getItems(): Collection
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {
-        $menu = new static();
-
-        $menu->generate();
-        $menu->sortByPriority();
-        $menu->removeDuplicateItems();
-
-        return $menu;
+        return GeneratesDocumentationSidebarMenu::handle();
     }
 
     /** @deprecated Move to new action */

From c1105f06335f10f479e5e5bf8e07e184dece30e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:30:58 +0100
Subject: [PATCH 0272/2811] Remove now moved methods

---
 .../Navigation/DocumentationSidebar.php       | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 665e845c341..3ec019cd188 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,10 +6,8 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Foundation\Facades\Routes;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
@@ -39,21 +37,6 @@ public static function create(): static
         return GeneratesDocumentationSidebarMenu::handle();
     }
 
-    /** @deprecated Move to new action */
-    protected function generate(): void
-    {
-        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-            }
-        });
-
-        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
-        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
-        }
-    }
-
     public function hasGroups(): bool
     {
         return (count($this->getGroups()) >= 1) && ($this->getGroups() !== ['other']);
@@ -86,27 +69,6 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
-    /** @deprecated Move to new action */
-    protected function canAddRoute(Route $route): bool
-    {
-        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
-    /** @deprecated Move to new action */
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
-        });
-    }
-
-    /** @deprecated Move to new action */
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy('priority')->values();
-    }
-
     /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {

From 189c515bbc3a277b8b8fd5d0b12be4ce8452268b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:32:49 +0100
Subject: [PATCH 0273/2811] Deprecate method
 `DocumentationSidebar::makeGroupTitle()`

With the new NavItem system this should not be necessary, as the parent has a title
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3ec019cd188..0e2027dcb15 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,6 +64,7 @@ public function isGroupActive(string $group): bool
             || $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
     }
 
+    /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
     public function makeGroupTitle(string $group): string
     {
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);

From 92ea7ea99f877ac086f5ae2024de07f891499a3f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:35:39 +0100
Subject: [PATCH 0274/2811] Revert private method deprecations

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0e2027dcb15..4a661bfaafe 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -70,13 +70,11 @@ public function makeGroupTitle(string $group): string
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
-    /** @deprecated Move to new action */
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    /** @deprecated Move to new action */
     private function shouldIndexPageBeActive(string $group): bool
     {
         return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();

From 41849e670aee8e614a5367f4301002bc070dc7dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 13:35:46 +0100
Subject: [PATCH 0275/2811] Remove unused methods

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7fe9094cafd..3221bfa3ada 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,13 +5,10 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -69,14 +66,4 @@ protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
     }
-
-    private function isPageIndexPage(): bool
-    {
-        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
-    }
-
-    private function shouldIndexPageBeActive(string $group): bool
-    {
-        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
-    }
 }

From 831983e525588c73d9ebc4586cf62514b375f2b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:00:35 +0100
Subject: [PATCH 0276/2811] Document public method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4a661bfaafe..04e33c4b60f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -58,6 +58,9 @@ public function getItemsInGroup(?string $group): Collection
         })->sortBy('navigation.priority')->values();
     }
 
+    /**
+     * Is a page within the group the current page?
+     */
     public function isGroupActive(string $group): bool
     {
         return Str::slug(Render::getPage()->navigationMenuGroup()) === $group

From b1a800fa1b1d0aa402ae7b0fd6265dd7ca3f965a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:01:38 +0100
Subject: [PATCH 0277/2811] Explain complex logic regarding
 https://github.com/hydephp/develop/pull/1084

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 04e33c4b60f..3646fe7e250 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -60,6 +60,8 @@ public function getItemsInGroup(?string $group): Collection
 
     /**
      * Is a page within the group the current page?
+     *
+     * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
     public function isGroupActive(string $group): bool
     {

From 1876a680b67b42312923af6a8b2fcc98bbc854ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:02:52 +0100
Subject: [PATCH 0278/2811] Introduce local variables to make complex logic
 clearer

---
 .../Features/Navigation/DocumentationSidebar.php      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3646fe7e250..5bc6cb04c0e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,10 @@ public function getItemsInGroup(?string $group): Collection
      */
     public function isGroupActive(string $group): bool
     {
-        return Str::slug(Render::getPage()->navigationMenuGroup()) === $group
-            || $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+        $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
+        $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+
+        return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
     /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
@@ -82,6 +84,9 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        return Render::getPage()->navigationMenuGroup() === 'other' && $group === collect($this->getGroups())->first();
+        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === 'other';
+        $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
+
+        return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }
 }

From 206a57f98281156c19f7adc24d5ded8de5825c40 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 14:58:00 +0100
Subject: [PATCH 0279/2811] Add todo

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d9406d6f2ca..51827a4d0a0 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,6 +210,7 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
+        // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
         return $this->isInstanceOf(DocumentationPage::class) ? 'other' : null;
     }
 

From a1a4d115d24dd1dd1137d989d1ebcfbc538a1352 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 15:13:38 +0100
Subject: [PATCH 0280/2811] Add todo to deprecation notice

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5bc6cb04c0e..d071b031480 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -71,7 +71,11 @@ public function isGroupActive(string $group): bool
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    /** @deprecated With the new NavItem system this should not be necessary, as the parent has a title */
+    /**
+     * @deprecated With the new NavItem system this should not be necessary, as the parent has a title
+     *
+     * @todo Get title from instance
+     */
     public function makeGroupTitle(string $group): string
     {
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);

From 27afe8e4e3f62ff1038136698b67ccd6cf46ed89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 15:18:29 +0100
Subject: [PATCH 0281/2811] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d071b031480..eba36a0d3ac 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -54,6 +54,7 @@ public function getGroups(): array
     public function getItemsInGroup(?string $group): Collection
     {
         return $this->items->filter(function (NavItem $item) use ($group): bool {
+            // Todo: Use identifier instead of slug
             return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
         })->sortBy('navigation.priority')->values();
     }

From 67a98047d6b7bed1241adee5874a480adc45054e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 16:32:07 +0100
Subject: [PATCH 0282/2811] Create AutomaticNavigationConfigurationsTest.php

---
 .../AutomaticNavigationConfigurationsTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
new file mode 100644
index 00000000000..50dabdca18c
--- /dev/null
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
+ *
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
+ * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavItem
+ */
+class AutomaticNavigationConfigurationsTest extends TestCase
+{
+    //
+}

From 10c43d5a462b725340a0efcba19337c434ef9578 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:14:54 +0100
Subject: [PATCH 0283/2811] Begin creating metatest framework

---
 .../AutomaticNavigationConfigurationsTest.php | 122 +++++++++++++++++-
 1 file changed, 121 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 50dabdca18c..aa13b13a4e7 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -17,5 +20,122 @@
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
-    //
+    public function testMainNavigationMenu()
+    {
+        $this->menu()
+            ->assertHasItem('Home')
+            ->assertMatchesFormat([
+                [
+                    'label' => 'Home',
+                    'group' => null,
+                    'priority' => 0,
+                    'children' => [],
+                ],
+            ]);
+    }
+
+    protected function menu(): AssertableNavigationMenu
+    {
+        return new AssertableNavigationMenu($this);
+    }
+}
+
+class TestNavItem
+{
+    public readonly string $label;
+    public readonly ?string $group;
+    public readonly int $priority;
+    public readonly array $children;
+
+    public function __construct(string $label, ?string $group, int $priority, array $children)
+    {
+        $this->label = $label;
+        $this->group = $group;
+        $this->priority = $priority;
+        $this->children = collect($children)->map(fn (NavItem $child) => $child->getLabel())->toArray();
+    }
+
+    public static function properties(): array
+    {
+        return ['label', 'group', 'priority', 'children'];
+    }
+}
+
+class AssertableNavigationMenu extends NavigationMenu
+{
+    protected TestCase $test;
+
+    public function __construct(TestCase $test)
+    {
+        parent::__construct(GeneratesMainNavigationMenu::handle()->getItems());
+
+        $this->test = $test;
+    }
+
+    /** A simplified serialized format for comparisons */
+    public function format(): array
+    {
+        return $this->items->map(function (NavItem $item) {
+            return new TestNavItem(
+                $item->getLabel(),
+                $item->getGroup(),
+                $item->getPriority(),
+                $item->getChildren()
+            );
+        })->toArray();
+    }
+
+    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
+    public function dd(): void
+    {
+        dd($this->items);
+    }
+
+    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
+    public function ddFormat(): void
+    {
+        dd($this->format());
+    }
+
+    /**
+     * @param  array  $expected  The expected format
+     * @param  bool  $strict  If false, missing array keys are ignored
+     */
+    public function assertMatchesFormat(array $expected, bool $strict = false): static
+    {
+        // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
+
+        foreach ($expected as $index => $item) {
+            foreach (TestNavItem::properties() as $property) {
+                $actual = $this->format()[$index] ?? null;
+
+                if ($actual === null) {
+                    // Count mismatch which we will catch at end of loop
+
+                    continue;
+                }
+
+                if (! isset($item[$property])) {
+                    if ($strict) {
+                        $this->test->fail("Missing array key '$property' in the expected format");
+                    }
+
+                    continue;
+                }
+
+                $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
+            }
+
+            $this->test->assertCount(count($expected), $this->format(), 'The expected format has a different count than the actual format');
+        }
+
+        return $this;
+    }
+
+    public function assertHasItem(string $label): static
+    {
+        $this->test->assertNotEmpty($this->items->first(fn ($item) => $item->getLabel() === $label), "Item with label '$label' not found in the main navigation menu");
+
+        return $this;
+    }
 }

From 62a7b36f2c48422c662b2febccf3dc11490cc70b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:30 +0100
Subject: [PATCH 0284/2811] Rename testing helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index aa13b13a4e7..dcf9a6162d4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -24,7 +24,7 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasItem('Home')
-            ->assertMatchesFormat([
+            ->assertEquals([
                 [
                     'label' => 'Home',
                     'group' => null,
@@ -101,7 +101,7 @@ public function ddFormat(): void
      * @param  array  $expected  The expected format
      * @param  bool  $strict  If false, missing array keys are ignored
      */
-    public function assertMatchesFormat(array $expected, bool $strict = false): static
+    public function assertEquals(array $expected, bool $strict = false): static
     {
         // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
 

From 0ff7bda614aaf3dd68431dd67e97f4f444fae7ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:38 +0100
Subject: [PATCH 0285/2811] Join comma-separated values into a single line

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dcf9a6162d4..d81e2afcdd8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -76,12 +76,7 @@ public function __construct(TestCase $test)
     public function format(): array
     {
         return $this->items->map(function (NavItem $item) {
-            return new TestNavItem(
-                $item->getLabel(),
-                $item->getGroup(),
-                $item->getPriority(),
-                $item->getChildren()
-            );
+            return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }
 

From c126b4916296e938d6946e287bc66c2e15459492 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:17:51 +0100
Subject: [PATCH 0286/2811] Add closure return type

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d81e2afcdd8..f5e65c6cb5e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,7 +75,7 @@ public function __construct(TestCase $test)
     /** A simplified serialized format for comparisons */
     public function format(): array
     {
-        return $this->items->map(function (NavItem $item) {
+        return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }

From 70f55a94868850b2aa3c86576adc9c5ca809ca96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:18:16 +0100
Subject: [PATCH 0287/2811] Remove comment

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f5e65c6cb5e..5460d007492 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -98,8 +98,6 @@ public function ddFormat(): void
      */
     public function assertEquals(array $expected, bool $strict = false): static
     {
-        // $this->test->assertEquals($expected, $this->format(), 'Failed to match the expected format');
-
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
                 $actual = $this->format()[$index] ?? null;

From 24ae3e7539802b685a031514c9d29fbdfe428610 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:19:38 +0100
Subject: [PATCH 0288/2811] Rename test term to be more specific

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5460d007492..bb3b7039341 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,7 +73,7 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function format(): array
+    public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
@@ -89,18 +89,18 @@ public function dd(): void
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
     public function ddFormat(): void
     {
-        dd($this->format());
+        dd($this->state());
     }
 
     /**
-     * @param  array  $expected  The expected format
+     * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored
      */
     public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->format()[$index] ?? null;
+                $actual = $this->state()[$index] ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop
@@ -110,7 +110,7 @@ public function assertEquals(array $expected, bool $strict = false): static
 
                 if (! isset($item[$property])) {
                     if ($strict) {
-                        $this->test->fail("Missing array key '$property' in the expected format");
+                        $this->test->fail("Missing array key '$property' in the expected state");
                     }
 
                     continue;
@@ -119,7 +119,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                 $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
             }
 
-            $this->test->assertCount(count($expected), $this->format(), 'The expected format has a different count than the actual format');
+            $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
         }
 
         return $this;

From 28d9ede3c5ccdf2f9b066fcd36b0b7408b1b5a7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:03 +0100
Subject: [PATCH 0289/2811] Add option to get single state

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bb3b7039341..a8608efa41e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,8 +73,12 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function state(): array
+    public function state(?int $index = null): TestNavItem|array
     {
+        if ($index !== null) {
+            return $this->state()[$index];
+        }
+
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
@@ -100,7 +104,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state()[$index] ?? null;
+                $actual = $this->state($index) ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From 97c6de8f8fb17178e2c0f8d8ef0aa5b041735f01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:07 +0100
Subject: [PATCH 0290/2811] Revert "Add option to get single state"

This reverts commit 28d9ede3c5ccdf2f9b066fcd36b0b7408b1b5a7f.
---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a8608efa41e..bb3b7039341 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -73,12 +73,8 @@ public function __construct(TestCase $test)
     }
 
     /** A simplified serialized format for comparisons */
-    public function state(?int $index = null): TestNavItem|array
+    public function state(): array
     {
-        if ($index !== null) {
-            return $this->state()[$index];
-        }
-
         return $this->items->map(function (NavItem $item): TestNavItem {
             return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
         })->toArray();
@@ -104,7 +100,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state($index) ?? null;
+                $actual = $this->state()[$index] ?? null;
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From a741c8eb4093104f0c8d271f976e5286bca9e826 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:46 +0100
Subject: [PATCH 0291/2811] Add helper to get single state

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bb3b7039341..6231ca3ad4b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -80,6 +80,11 @@ public function state(): array
         })->toArray();
     }
 
+    public function getState(int $index): ?TestNavItem
+    {
+        return $this->state()[$index] ?? null;
+    }
+
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
     public function dd(): void
     {
@@ -100,7 +105,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->state()[$index] ?? null;
+                $actual = $this->getState($index);
 
                 if ($actual === null) {
                     // Count mismatch which we will catch at end of loop

From cd8b33f9e5fae115e4dc400aced8c13f2bf512e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:21:55 +0100
Subject: [PATCH 0292/2811] Inline local variable

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6231ca3ad4b..5f303481684 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -105,9 +105,7 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                $actual = $this->getState($index);
-
-                if ($actual === null) {
+                if ($this->getState($index) === null) {
                     // Count mismatch which we will catch at end of loop
 
                     continue;
@@ -121,7 +119,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                     continue;
                 }
 
-                $this->test->assertSame($item[$property], $actual->$property, "Failed to match the expected value for '$property'");
+                $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
 
             $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');

From d1714175d1dff84c8de7bd6cb636f0584d346238 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:22:57 +0100
Subject: [PATCH 0293/2811] Fix assertion should run after all loops

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5f303481684..98668ae4be4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -121,10 +121,10 @@ public function assertEquals(array $expected, bool $strict = false): static
 
                 $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
-
-            $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
         }
 
+        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
+
         return $this;
     }
 

From 986694cc02d3041bc026594e83e2d0c2b8f614e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:24:09 +0100
Subject: [PATCH 0294/2811] Refactor loop control flow

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 98668ae4be4..e3a1ba39739 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -111,15 +111,11 @@ public function assertEquals(array $expected, bool $strict = false): static
                     continue;
                 }
 
-                if (! isset($item[$property])) {
-                    if ($strict) {
-                        $this->test->fail("Missing array key '$property' in the expected state");
-                    }
-
-                    continue;
+                if (isset($item[$property])) {
+                    $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                } elseif ($strict) {
+                    $this->test->fail("Missing array key '$property' in the expected state");
                 }
-
-                $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
             }
         }
 

From 789cfa045f683c3df0503f2cbce9aef20faf2b7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:25:53 +0100
Subject: [PATCH 0295/2811] Refactor inner loop control flow

---
 .../AutomaticNavigationConfigurationsTest.php    | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e3a1ba39739..2c0d1032e29 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -105,16 +105,12 @@ public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
             foreach (TestNavItem::properties() as $property) {
-                if ($this->getState($index) === null) {
-                    // Count mismatch which we will catch at end of loop
-
-                    continue;
-                }
-
-                if (isset($item[$property])) {
-                    $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
-                } elseif ($strict) {
-                    $this->test->fail("Missing array key '$property' in the expected state");
+                if ($this->getState($index) !== null) {
+                    if (isset($item[$property])) {
+                        $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                    } elseif ($strict) {
+                        $this->test->fail("Missing array key '$property' in the expected state");
+                    }
                 }
             }
         }

From 07956df1e632f47c602d4803fd4f094726bad9c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:37:35 +0100
Subject: [PATCH 0296/2811] Add shorthand to compare labels

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2c0d1032e29..95abc807742 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -24,14 +24,7 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasItem('Home')
-            ->assertEquals([
-                [
-                    'label' => 'Home',
-                    'group' => null,
-                    'priority' => 0,
-                    'children' => [],
-                ],
-            ]);
+            ->assertEquals(['Home']);
     }
 
     protected function menu(): AssertableNavigationMenu
@@ -104,6 +97,10 @@ public function ddFormat(): void
     public function assertEquals(array $expected, bool $strict = false): static
     {
         foreach ($expected as $index => $item) {
+            if (! is_array($item)) {
+                $item = ['label' => $item];
+            }
+
             foreach (TestNavItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {

From 68fa1d9a1de483887c10690c297319de74a525bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:38:36 +0100
Subject: [PATCH 0297/2811] Simplify comparison

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 95abc807742..e5f72c8a14a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -22,9 +22,7 @@ class AutomaticNavigationConfigurationsTest extends TestCase
 {
     public function testMainNavigationMenu()
     {
-        $this->menu()
-            ->assertHasItem('Home')
-            ->assertEquals(['Home']);
+        $this->menu()->assertEquals(['Home']);
     }
 
     protected function menu(): AssertableNavigationMenu

From 47fe9e92652293a64508bc7901524814575fcd57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:40:42 +0100
Subject: [PATCH 0298/2811] Add property instead of extension

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e5f72c8a14a..d69fa94b658 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
@@ -52,13 +52,14 @@ public static function properties(): array
     }
 }
 
-class AssertableNavigationMenu extends NavigationMenu
+class AssertableNavigationMenu
 {
     protected TestCase $test;
+    protected Collection $items;
 
     public function __construct(TestCase $test)
     {
-        parent::__construct(GeneratesMainNavigationMenu::handle()->getItems());
+        $this->items = GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;
     }

From 723d49c6737082387100564234c3dcd5c31a9ef9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 17:43:09 +0100
Subject: [PATCH 0299/2811] Add scaffolding to test sidebars

---
 .../AutomaticNavigationConfigurationsTest.php   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d69fa94b658..be75abaf099 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -25,10 +26,20 @@ public function testMainNavigationMenu()
         $this->menu()->assertEquals(['Home']);
     }
 
+    public function testDocumentationSidebarMenu()
+    {
+        $this->sidebar()->assertEquals([]);
+    }
+
     protected function menu(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this);
     }
+
+    protected function sidebar(): AssertableNavigationMenu
+    {
+        return new AssertableNavigationMenu($this, true);
+    }
 }
 
 class TestNavItem
@@ -57,9 +68,11 @@ class AssertableNavigationMenu
     protected TestCase $test;
     protected Collection $items;
 
-    public function __construct(TestCase $test)
+    public function __construct(TestCase $test, $sidebar = false)
     {
-        $this->items = GeneratesMainNavigationMenu::handle()->getItems();
+        $this->items = $sidebar
+            ? GeneratesDocumentationSidebarMenu::handle()->getItems()
+            : GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;
     }

From 88af77f2a24b2a2a5c43f0d005738a9b5bd2016f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:10:43 +0100
Subject: [PATCH 0300/2811] Set up test kernel

---
 .../AutomaticNavigationConfigurationsTest.php | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index be75abaf099..a52c853a5fd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,7 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
@@ -21,6 +23,14 @@
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+
     public function testMainNavigationMenu()
     {
         $this->menu()->assertEquals(['Home']);
@@ -136,3 +146,19 @@ public function assertHasItem(string $label): static
         return $this;
     }
 }
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
+}

From 118d1331cc888689602e05d016e9d07c74158a15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:12:03 +0100
Subject: [PATCH 0301/2811] Test with pages

---
 .../AutomaticNavigationConfigurationsTest.php | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a52c853a5fd..572c8cd404a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -41,6 +43,29 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()->assertEquals([]);
     }
 
+    public function testMainNavigationMenuWithPages()
+    {
+        $this->withPages([
+            'About' => MarkdownPage::class,
+            'Contact' => MarkdownPage::class,
+        ]);
+
+        $this->menu()->assertEquals([
+            'About',
+            'Contact',
+        ]);
+    }
+
+    protected function withPages(array $pages): static
+    {
+        $routes = collect($pages)->mapWithKeys(/** @param class-string<\Hyde\Pages\Concerns\HydePage> $page */ function (string $page, string $title) {
+            return [Str::slug($title) => $page::make(Str::slug($title), ['title' => $title])->getRoute()];
+        });
+        $this->kernel->setRoutes($routes);
+
+        return $this;
+    }
+
     protected function menu(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this);

From f9d55c816a14fb7cb9b6d353dc3d379a51bdad27 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:12:36 +0100
Subject: [PATCH 0302/2811] Merge fluent method calls

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 572c8cd404a..c63a39b9a6f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -48,9 +48,7 @@ public function testMainNavigationMenuWithPages()
         $this->withPages([
             'About' => MarkdownPage::class,
             'Contact' => MarkdownPage::class,
-        ]);
-
-        $this->menu()->assertEquals([
+        ])->menu()->assertEquals([
             'About',
             'Contact',
         ]);

From a56a071be1441604dde0ba52379a44fd333a040e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:37:17 +0100
Subject: [PATCH 0303/2811] Simplify test data handling

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c63a39b9a6f..474edf688c2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -46,8 +46,8 @@ public function testDocumentationSidebarMenu()
     public function testMainNavigationMenuWithPages()
     {
         $this->withPages([
-            'About' => MarkdownPage::class,
-            'Contact' => MarkdownPage::class,
+            new MarkdownPage('about'),
+            new MarkdownPage('contact'),
         ])->menu()->assertEquals([
             'About',
             'Contact',
@@ -56,10 +56,7 @@ public function testMainNavigationMenuWithPages()
 
     protected function withPages(array $pages): static
     {
-        $routes = collect($pages)->mapWithKeys(/** @param class-string<\Hyde\Pages\Concerns\HydePage> $page */ function (string $page, string $title) {
-            return [Str::slug($title) => $page::make(Str::slug($title), ['title' => $title])->getRoute()];
-        });
-        $this->kernel->setRoutes($routes);
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
 
         return $this;
     }

From 996debd08126e92e5d6b4d48950b629aa89b7a03 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:49:44 +0100
Subject: [PATCH 0304/2811] Rename method to match other rename

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 474edf688c2..5022cb91237 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -127,7 +127,7 @@ public function dd(): void
     }
 
     /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function ddFormat(): void
+    public function ddState(): void
     {
         dd($this->state());
     }

From 2e04862b5197da3a4944470a325a4ba1dab8692f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:49:22 +0100
Subject: [PATCH 0305/2811] Test main navigation menu with front matter
 priorities

---
 .../AutomaticNavigationConfigurationsTest.php | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5022cb91237..dfea0f05b02 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -54,6 +54,33 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    {
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 2]),
+            new MarkdownPage('second', ['navigation.priority' => 1]),
+        ])->menu()->assertEquals([
+            'Second',
+            'First',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 2]),
+            new MarkdownPage('second', ['navigation.order' => 1]),
+        ])->menu()->assertEquals([
+            'Second',
+            'First',
+        ]);
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From b195e8b08cd658dfa7c1e4f0b71b3f53b7e67f98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:51:56 +0100
Subject: [PATCH 0306/2811] Improve test specificity

---
 .../AutomaticNavigationConfigurationsTest.php | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dfea0f05b02..3fe78583315 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -59,23 +59,42 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         $this->withPages([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
         ])->menu()->assertEquals([
             'First',
             'Second',
+            'Third',
         ]);
 
         $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 2]),
-            new MarkdownPage('second', ['navigation.priority' => 1]),
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
         ])->menu()->assertEquals([
+            'Third',
             'Second',
             'First',
         ]);
+    }
+
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    {
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
 
         $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 2]),
-            new MarkdownPage('second', ['navigation.order' => 1]),
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
         ])->menu()->assertEquals([
+            'Third',
             'Second',
             'First',
         ]);

From 0eaaa096e1a3b5e18ecdc3edb31e9bc83676a9ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 18:59:19 +0100
Subject: [PATCH 0307/2811] Refactor to extract helper to reduce boilerplate

---
 .../AutomaticNavigationConfigurationsTest.php | 50 +++++--------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3fe78583315..ae8b55be136 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
@@ -56,48 +57,23 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 1]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->menu()->assertEquals([
-            'First',
-            'Second',
-            'Third',
-        ]);
-
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.priority' => 3]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->menu()->assertEquals([
-            'Third',
-            'Second',
-            'First',
-        ]);
+        $this->testNavigationMenuWithPages('priority', [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->testNavigationMenuWithPages('priority', [3, 2, 1], ['Third', 'Second', 'First']);
     }
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 1]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->menu()->assertEquals([
-            'First',
-            'Second',
-            'Third',
-        ]);
+        $this->testNavigationMenuWithPages('order', [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->testNavigationMenuWithPages('order', [3, 2, 1], ['Third', 'Second', 'First']);
+    }
 
-        $this->withPages([
-            new MarkdownPage('first', ['navigation.order' => 3]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->menu()->assertEquals([
-            'Third',
-            'Second',
-            'First',
-        ]);
+    protected function testNavigationMenuWithPages($field, $priorities, $expectedOrder): void
+    {
+        $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
+            return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
+        })->all();
+
+        $this->withPages($pages)->menu()->assertEquals($expectedOrder);
     }
 
     protected function withPages(array $pages): static

From 0b216709a132efc9e218a52af5c159593f1575d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:01:11 +0100
Subject: [PATCH 0308/2811] Improve testing helper implementation

---
 .../AutomaticNavigationConfigurationsTest.php  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ae8b55be136..7940346a495 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,21 +55,23 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithPagesPriority()
     {
-        $this->testNavigationMenuWithPages('priority', [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->testNavigationMenuWithPages('priority', [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    public function testMainNavigationMenuWithPagesOrder()
     {
-        $this->testNavigationMenuWithPages('order', [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->testNavigationMenuWithPages('order', [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    protected function testNavigationMenuWithPages($field, $priorities, $expectedOrder): void
+    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
-        $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
+        $field = key($frontMatterValues);
+
+        $pages = collect($frontMatterValues[$field])->map(function ($value) use ($expectedOrder, $field) {
             return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
         })->all();
 

From 24fb65ac3f74aa7d2b81381e513ad24ff5bae1c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:03:17 +0100
Subject: [PATCH 0309/2811] Rename tests to be clearer

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7940346a495..14c8b8ee7b0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,13 +55,13 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesPriority()
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
         $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
         $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesOrder()
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
         $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
         $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);

From c17a6c644dccebb65a25238f04b13fbbf65fe36d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:07:43 +0100
Subject: [PATCH 0310/2811] Merge test methods to further assess field
 interoperability

---
 .../AutomaticNavigationConfigurationsTest.php | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 14c8b8ee7b0..08a04343910 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,25 +57,19 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder(['priority' => [1, 2, 3]], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['priority' => [3, 2, 1]], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder(['priority', 'order'], [1, 2, 3], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder(['priority', 'order'], [3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    protected function assertMenuOrder(array $fields, array $frontMatterValues, array $expectedOrder): void
     {
-        $this->assertMenuOrder(['order' => [1, 2, 3]], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['order' => [3, 2, 1]], ['Third', 'Second', 'First']);
-    }
-
-    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
-    {
-        $field = key($frontMatterValues);
+        foreach ($fields as $field) {
+            $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
+                return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
+            })->all();
 
-        $pages = collect($frontMatterValues[$field])->map(function ($value) use ($expectedOrder, $field) {
-            return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
-        })->all();
-
-        $this->withPages($pages)->menu()->assertEquals($expectedOrder);
+            $this->withPages($pages)->menu()->assertEquals($expectedOrder);
+        }
     }
 
     protected function withPages(array $pages): static

From 80e56fbba53a8519f312d81ed2a4c7278608458b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:08:24 +0100
Subject: [PATCH 0311/2811] Inline constant parameter value

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 08a04343910..cc3c2530945 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,12 +57,14 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder(['priority', 'order'], [1, 2, 3], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder(['priority', 'order'], [3, 2, 1], ['Third', 'Second', 'First']);
+        $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
+        $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    protected function assertMenuOrder(array $fields, array $frontMatterValues, array $expectedOrder): void
+    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
+        $fields = ['priority', 'order'];
+
         foreach ($fields as $field) {
             $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);

From 4db97af9c29c1037fb4b0101567ce1136cfbc778 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:08:46 +0100
Subject: [PATCH 0312/2811] Inline local variable

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cc3c2530945..ea4377c9060 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -63,9 +63,7 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
     {
-        $fields = ['priority', 'order'];
-
-        foreach ($fields as $field) {
+        foreach (['priority', 'order'] as $field) {
             $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
             })->all();

From af4f9b89b47b45af515fb5a106e579bad1c36e89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:09:14 +0100
Subject: [PATCH 0313/2811] Simplify parameter name

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ea4377c9060..0e3715acab8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -61,10 +61,10 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
     }
 
-    protected function assertMenuOrder(array $frontMatterValues, array $expectedOrder): void
+    protected function assertMenuOrder(array $priorities, array $expectedOrder): void
     {
         foreach (['priority', 'order'] as $field) {
-            $pages = collect($frontMatterValues)->map(function ($value) use ($expectedOrder, $field) {
+            $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
                 return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
             })->all();
 

From ccc78e08b7482c7611d863fecf508a159095dd18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:10:17 +0100
Subject: [PATCH 0314/2811] Remove unnecessary suffix for merged methods

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0e3715acab8..1a721c3a4d8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -55,7 +55,7 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithPagesWithFrontMatter()
     {
         $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
         $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);

From 7c9100e1d4f8825c6359d138f05bd0934aa1207f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 19:17:26 +0100
Subject: [PATCH 0315/2811] Rollback to
 b195e8b08cd658dfa7c1e4f0b71b3f53b7e67f98

This quickly lost its use now that we want to test more options
---
 .../AutomaticNavigationConfigurationsTest.php | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 1a721c3a4d8..3fe78583315 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
@@ -55,21 +54,50 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatter()
+    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuOrder([1, 2, 3], ['First', 'Second', 'Third']);
-        $this->assertMenuOrder([3, 2, 1], ['Third', 'Second', 'First']);
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
+
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
+        ])->menu()->assertEquals([
+            'Third',
+            'Second',
+            'First',
+        ]);
     }
 
-    protected function assertMenuOrder(array $priorities, array $expectedOrder): void
+    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        foreach (['priority', 'order'] as $field) {
-            $pages = collect($priorities)->map(function ($value) use ($expectedOrder, $field) {
-                return new MarkdownPage(Str::slug($expectedOrder[$value - 1]), ["navigation.$field" => $value]);
-            })->all();
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
+        ])->menu()->assertEquals([
+            'First',
+            'Second',
+            'Third',
+        ]);
 
-            $this->withPages($pages)->menu()->assertEquals($expectedOrder);
-        }
+        $this->withPages([
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
+        ])->menu()->assertEquals([
+            'Third',
+            'Second',
+            'First',
+        ]);
     }
 
     protected function withPages(array $pages): static

From 3d81244039918f7373b58157745d77de36152411 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:07:19 +0100
Subject: [PATCH 0316/2811] Add shorthand option

---
 .../AutomaticNavigationConfigurationsTest.php | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3fe78583315..12ceb8fb17e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,21 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'Third',
             'Second',
             'First',
@@ -79,21 +79,21 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->withPages([
+        $this->menu([
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->menu()->assertEquals([
+        ])->assertEquals([
             'Third',
             'Second',
             'First',
@@ -107,8 +107,12 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(): AssertableNavigationMenu
+    protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
         return new AssertableNavigationMenu($this);
     }
 

From 6f2ce09e87453640ccc9f186e7ed71eb0ea21a08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:11:21 +0100
Subject: [PATCH 0317/2811] Move up method in source

---
 .../AutomaticNavigationConfigurationsTest.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 12ceb8fb17e..466f12833f5 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -100,13 +100,6 @@ public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
         ]);
     }
 
-    protected function withPages(array $pages): static
-    {
-        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
-
-        return $this;
-    }
-
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {
@@ -116,6 +109,13 @@ protected function menu(?array $withPages = null): AssertableNavigationMenu
         return new AssertableNavigationMenu($this);
     }
 
+    protected function withPages(array $pages): static
+    {
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
+    }
+
     protected function sidebar(): AssertableNavigationMenu
     {
         return new AssertableNavigationMenu($this, true);

From ae3328de7a37dc113019e38dc515909f07d962a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:12:40 +0100
Subject: [PATCH 0318/2811] Add additional simplified assertion helper

---
 .../AutomaticNavigationConfigurationsTest.php | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 466f12833f5..dae030aafb2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,21 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
-        ])->assertEquals([
+        ], [
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
-        ])->assertEquals([
+        ], [
             'Third',
             'Second',
             'First',
@@ -79,27 +79,32 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
-        ])->assertEquals([
+        ], [
             'First',
             'Second',
             'Third',
         ]);
 
-        $this->menu([
+        $this->assertMenuEquals([
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),
-        ])->assertEquals([
+        ], [
             'Third',
             'Second',
             'First',
         ]);
     }
 
+    protected function assertMenuEquals(array $menuPages, array $expected): void
+    {
+        $this->menu($menuPages)->assertEquals($expected);
+    }
+
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {

From 92af696d3cc89105a9a2465bce793a0c9ada5805 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:13:12 +0100
Subject: [PATCH 0319/2811] Flip helper parameter order to match base assertion
 order

---
 .../AutomaticNavigationConfigurationsTest.php | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index dae030aafb2..3b501f90f19 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -57,50 +57,50 @@ public function testMainNavigationMenuWithPages()
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.priority' => 1]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 3]),
-        ], [
             'First',
             'Second',
             'Third',
+        ], [
+            new MarkdownPage('first', ['navigation.priority' => 1]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 3]),
         ]);
 
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.priority' => 3]),
-            new MarkdownPage('second', ['navigation.priority' => 2]),
-            new MarkdownPage('third', ['navigation.priority' => 1]),
-        ], [
             'Third',
             'Second',
             'First',
+        ], [
+            new MarkdownPage('first', ['navigation.priority' => 3]),
+            new MarkdownPage('second', ['navigation.priority' => 2]),
+            new MarkdownPage('third', ['navigation.priority' => 1]),
         ]);
     }
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.order' => 1]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 3]),
-        ], [
             'First',
             'Second',
             'Third',
+        ], [
+            new MarkdownPage('first', ['navigation.order' => 1]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 3]),
         ]);
 
         $this->assertMenuEquals([
-            new MarkdownPage('first', ['navigation.order' => 3]),
-            new MarkdownPage('second', ['navigation.order' => 2]),
-            new MarkdownPage('third', ['navigation.order' => 1]),
-        ], [
             'Third',
             'Second',
             'First',
+        ], [
+            new MarkdownPage('first', ['navigation.order' => 3]),
+            new MarkdownPage('second', ['navigation.order' => 2]),
+            new MarkdownPage('third', ['navigation.order' => 1]),
         ]);
     }
 
-    protected function assertMenuEquals(array $menuPages, array $expected): void
+    protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);
     }

From af247f82ed63913272715dcb54cc3ab39e473d5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:13:45 +0100
Subject: [PATCH 0320/2811] Join comma-separated values into a single line

---
 .../AutomaticNavigationConfigurationsTest.php | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3b501f90f19..5a61719ffdf 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -56,21 +56,13 @@ public function testMainNavigationMenuWithPages()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
     {
-        $this->assertMenuEquals([
-            'First',
-            'Second',
-            'Third',
-        ], [
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.priority' => 1]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 3]),
         ]);
 
-        $this->assertMenuEquals([
-            'Third',
-            'Second',
-            'First',
-        ], [
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
             new MarkdownPage('first', ['navigation.priority' => 3]),
             new MarkdownPage('second', ['navigation.priority' => 2]),
             new MarkdownPage('third', ['navigation.priority' => 1]),
@@ -79,21 +71,13 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
 
     public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
     {
-        $this->assertMenuEquals([
-            'First',
-            'Second',
-            'Third',
-        ], [
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.order' => 1]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 3]),
         ]);
 
-        $this->assertMenuEquals([
-            'Third',
-            'Second',
-            'First',
-        ], [
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
             new MarkdownPage('first', ['navigation.order' => 3]),
             new MarkdownPage('second', ['navigation.order' => 2]),
             new MarkdownPage('third', ['navigation.order' => 1]),

From c0b3b4bd0cb3e831016ab4f85f8e92cc7bba4091 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:16:00 +0100
Subject: [PATCH 0321/2811] Remove unnecessary qualifiers from test method
 names

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5a61719ffdf..1158bdc003f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -54,7 +54,7 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
+    public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.priority' => 1]),
@@ -69,7 +69,7 @@ public function testMainNavigationMenuWithPagesWithFrontMatterPriority()
         ]);
     }
 
-    public function testMainNavigationMenuWithPagesWithFrontMatterOrder()
+    public function testMainNavigationMenuWithFrontMatterOrder()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [
             new MarkdownPage('first', ['navigation.order' => 1]),

From cfcdf12ff23cd0b01bc1fb1f2545abe6e866e4e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:17:02 +0100
Subject: [PATCH 0322/2811] Test main navigation menu with front matter label

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 1158bdc003f..fa4b1827a64 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -84,6 +84,15 @@ public function testMainNavigationMenuWithFrontMatterOrder()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterLabel()
+    {
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('foo', ['navigation.label' => 'First']),
+            new MarkdownPage('bar', ['navigation.label' => 'Second']),
+            new MarkdownPage('baz', ['navigation.label' => 'Third']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 734276d74234351d33d53a80b807abbd32e37be3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:19:41 +0100
Subject: [PATCH 0323/2811] Test front matter visibility control

---
 .../AutomaticNavigationConfigurationsTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fa4b1827a64..bca57f42e1d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -93,6 +93,36 @@ public function testMainNavigationMenuWithFrontMatterLabel()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterHidden()
+    {
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => false]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true]),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithFrontMatterVisible()
+    {
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 23315ece834fe2530e5a426f06db76c796adcc7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:22:08 +0100
Subject: [PATCH 0324/2811] Test main navigation menu with front matter group

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index bca57f42e1d..2134e5bd324 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -123,6 +123,19 @@ public function testMainNavigationMenuWithFrontMatterVisible()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterGroup()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('baz', ['navigation.group' => 'Group 1']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From cd2b957522dc299e8bada37f3129b40043a712e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:23:33 +0100
Subject: [PATCH 0325/2811] Test main navigation menu with front matter
 category

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2134e5bd324..e5cc03dabc6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -136,6 +136,19 @@ public function testMainNavigationMenuWithFrontMatterGroup()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterCategory()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.category' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.category' => 'Group 1']),
+            new MarkdownPage('baz', ['navigation.category' => 'Group 1']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 469f4c8afb5c61a5d71a9b1b8a9db776d389596e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:23:46 +0100
Subject: [PATCH 0326/2811] Add todo

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e5cc03dabc6..43594b3b5e0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -125,6 +125,8 @@ public function testMainNavigationMenuWithFrontMatterVisible()
 
     public function testMainNavigationMenuWithFrontMatterGroup()
     {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'group' => 'group-1'],
             ['label' => 'Bar', 'group' => 'group-1'],
@@ -138,6 +140,8 @@ public function testMainNavigationMenuWithFrontMatterGroup()
 
     public function testMainNavigationMenuWithFrontMatterCategory()
     {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'group' => 'group-1'],
             ['label' => 'Bar', 'group' => 'group-1'],

From 06159f65764bc1592bea1be79059f4c5494873e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:28:04 +0100
Subject: [PATCH 0327/2811] Test conflicting priority state to assert
 precedence

---
 .../AutomaticNavigationConfigurationsTest.php | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 43594b3b5e0..86d18f916ec 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -153,6 +153,29 @@ public function testMainNavigationMenuWithFrontMatterCategory()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ], [
+            new MarkdownPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
+            new MarkdownPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
+            new MarkdownPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
+        ]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ], [
+            new MarkdownPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
+            new MarkdownPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
+            new MarkdownPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From da3205ba1954b79d598f376bb732898819206c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:28:59 +0100
Subject: [PATCH 0328/2811] Document precedence reason

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 86d18f916ec..eb34df4053f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -155,6 +155,8 @@ public function testMainNavigationMenuWithFrontMatterCategory()
 
     public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
     {
+        // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
+
         $this->assertMenuEquals([
             ['label' => 'Foo', 'priority' => 1],
             ['label' => 'Bar', 'priority' => 2],

From 98ddc00aff6156be1bae89c8359d2b017e51dfac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:29:57 +0100
Subject: [PATCH 0329/2811] Introduce local variable for duplicate array

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index eb34df4053f..46208be7905 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -157,21 +157,19 @@ public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
     {
         // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
 
-        $this->assertMenuEquals([
+        $expected = [
             ['label' => 'Foo', 'priority' => 1],
             ['label' => 'Bar', 'priority' => 2],
             ['label' => 'Baz', 'priority' => 3],
-        ], [
+        ];
+
+        $this->assertMenuEquals($expected, [
             new MarkdownPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
             new MarkdownPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
             new MarkdownPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
         ]);
 
-        $this->assertMenuEquals([
-            ['label' => 'Foo', 'priority' => 1],
-            ['label' => 'Bar', 'priority' => 2],
-            ['label' => 'Baz', 'priority' => 3],
-        ], [
+        $this->assertMenuEquals($expected, [
             new MarkdownPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
             new MarkdownPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
             new MarkdownPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),

From 80bf7decdf7784f22361b5f49ac8c75f8ab6a38f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:32:18 +0100
Subject: [PATCH 0330/2811] Test visibility conflict precedence

---
 .../AutomaticNavigationConfigurationsTest.php | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 46208be7905..142673a42ee 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -176,6 +176,41 @@ public function testMainNavigationMenuWithFrontMatterPriorityAndOrder()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterHiddenAndVisible()
+    {
+        // Since the main key in the navigation schema is 'hidden', that takes precedence over its 'visible' alias
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => false, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new MarkdownPage('bar', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('foo', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new MarkdownPage('baz', ['navigation.hidden' => false, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertMenuEquals(['Bar'], [
+            new MarkdownPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new MarkdownPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new MarkdownPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 9c02dcf24e11c1709c64d576a46b0900b0da221a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:35:35 +0100
Subject: [PATCH 0331/2811] Test group conflict precedence

---
 .../AutomaticNavigationConfigurationsTest.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 142673a42ee..0cb8b22ddd6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -211,6 +211,21 @@ public function testMainNavigationMenuWithFrontMatterHiddenAndVisible()
         ]);
     }
 
+    public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
+    {
+        // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+        ]);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From afe3f91377925664e2610e50c098eee4d27ff221 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:35:54 +0100
Subject: [PATCH 0332/2811] Remove data from test that has no impact on result

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0cb8b22ddd6..8b9ca8d1803 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -216,9 +216,9 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['group' => 'group-1'],
+            ['group' => 'group-1'],
+            ['group' => 'group-1'],
         ], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),

From c6a92eac4a4eccfd794988e3880f6459012d0689 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 20:36:46 +0100
Subject: [PATCH 0333/2811] Fill repeated array

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8b9ca8d1803..65987a64866 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -215,11 +215,7 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertMenuEquals([
-            ['group' => 'group-1'],
-            ['group' => 'group-1'],
-            ['group' => 'group-1'],
-        ], [
+        $this->assertMenuEquals(array_fill(0, 3, ['group' => 'group-1']), [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),

From 0cc29e1e9d99c921b4cf2b2555d29252156cc61b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:27:14 +0100
Subject: [PATCH 0334/2811] Test default configuration results

---
 .../AutomaticNavigationConfigurationsTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 65987a64866..f9452fbfca1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,10 +4,15 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -54,6 +59,29 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
+    public function testMainNavigationDoesNotInclude404Page()
+    {
+        $this->assertMenuEquals([], [new MarkdownPage('404')]);
+    }
+
+    public function testOnlyRootTypePagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Html Page', 'Blade Page', 'Markdown Page'], [
+            new HtmlPage('html-page'),
+            new BladePage('blade-page'),
+            new MarkdownPage('markdown-page'),
+            new MarkdownPost('markdown-post'),
+            new DocumentationPage('documentation-page'),
+        ]);
+    }
+
+    public function testInMemoryPagesIsAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['In Memory Page'], [
+            new InMemoryPage('in-memory-page'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 0b880c0b7dc556fb0c9a9febd5363cb44d1df280 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:29:26 +0100
Subject: [PATCH 0335/2811] Test duplicated identifier states

---
 .../AutomaticNavigationConfigurationsTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f9452fbfca1..ffe21af1e42 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,6 +82,27 @@ public function testInMemoryPagesIsAddedToNavigationMenu()
         ]);
     }
 
+    public function testOnlyFirstItemWithDuplicateIdentifierIsUsed()
+    {
+        $this->assertMenuEquals(['Markdown'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown']),
+            new BladePage('foo', ['navigation.label' => 'Blade']),
+        ]);
+    }
+
+    public function testItemWithHighestPriorityIsUsedForDuplicateIdentifier()
+    {
+        $this->assertMenuEquals(['Markdown'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 1]),
+            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 2]),
+        ]);
+
+        $this->assertMenuEquals(['Blade'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 2]),
+            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 1]),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 5ec271384839aabb0f449d1a0417cbae21bf1b90 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 15 Feb 2024 21:29:29 +0100
Subject: [PATCH 0336/2811] Revert "Test duplicated identifier states"

This reverts commit 0b880c0b7dc556fb0c9a9febd5363cb44d1df280. This is a bad idea, we do not at all want to handle cases like these. We can't imply support for something that simply cannot work.
---
 .../AutomaticNavigationConfigurationsTest.php | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ffe21af1e42..f9452fbfca1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,27 +82,6 @@ public function testInMemoryPagesIsAddedToNavigationMenu()
         ]);
     }
 
-    public function testOnlyFirstItemWithDuplicateIdentifierIsUsed()
-    {
-        $this->assertMenuEquals(['Markdown'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown']),
-            new BladePage('foo', ['navigation.label' => 'Blade']),
-        ]);
-    }
-
-    public function testItemWithHighestPriorityIsUsedForDuplicateIdentifier()
-    {
-        $this->assertMenuEquals(['Markdown'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 1]),
-            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 2]),
-        ]);
-
-        $this->assertMenuEquals(['Blade'], [
-            new MarkdownPage('foo', ['navigation.label' => 'Markdown', 'navigation.priority' => 2]),
-            new BladePage('foo', ['navigation.label' => 'Blade', 'navigation.priority' => 1]),
-        ]);
-    }
-
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From d7d75aba994e14f913b0233542ada3a3ee2ec78f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:47:50 +0100
Subject: [PATCH 0337/2811] Fix test method name grammar

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f9452fbfca1..a64fc927423 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,7 +75,7 @@ public function testOnlyRootTypePagesAreAddedToNavigationMenu()
         ]);
     }
 
-    public function testInMemoryPagesIsAddedToNavigationMenu()
+    public function testInMemoryPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['In Memory Page'], [
             new InMemoryPage('in-memory-page'),

From 376278b5ef5f04eb36237c78becccb8783eddfc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:51:37 +0100
Subject: [PATCH 0338/2811] Test default navigation priorities

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a64fc927423..fb643574990 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -82,6 +82,19 @@ public function testInMemoryPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testDefaultNavigationPriorities()
+    {
+        $this->assertMenuEquals([
+            ['priority' => 0],
+            ['priority' => 10],
+            ['priority' => 100],
+        ], [
+            new MarkdownPage('index'),
+            new MarkdownPage('posts'),
+            new MarkdownPage('docs/index'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From eba2918733f0b2e45de9e8ac7281a89cb08294af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 16 Feb 2024 20:51:46 +0100
Subject: [PATCH 0339/2811] Test default navigation labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fb643574990..b7477191832 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -95,6 +95,17 @@ public function testDefaultNavigationPriorities()
         ]);
     }
 
+    public function testDefaultNavigationLabels()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Home'],
+            ['label' => 'Docs'],
+        ], [
+            new MarkdownPage('index'),
+            new MarkdownPage('docs/index'),
+        ]);
+    }
+
     public function testMainNavigationMenuWithFrontMatterPriority()
     {
         $this->assertMenuEquals(['First', 'Second', 'Third'], [

From 90bbd6b79c6a15d4f999f146fba08b99c1f3b004 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:51:37 +0100
Subject: [PATCH 0340/2811] Test documentation index pages are added to
 navigation menu

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index b7477191832..af380e02e2d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -75,6 +75,13 @@ public function testOnlyRootTypePagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testDocumentationIndexPagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Docs'], [
+            new DocumentationPage('index'),
+        ]);
+    }
+
     public function testInMemoryPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['In Memory Page'], [

From 42fefd6170760bcc579e1c4464b4342134c0b580 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:52:09 +0100
Subject: [PATCH 0341/2811] Add auxiliary assertion

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index af380e02e2d..177cbfc9b70 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -79,6 +79,7 @@ public function testDocumentationIndexPagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['Docs'], [
             new DocumentationPage('index'),
+            new DocumentationPage('foo'),
         ]);
     }
 

From 7c87eddcba9015e5975175184becb615608fd592 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:55:00 +0100
Subject: [PATCH 0342/2811] Reorder test methods

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 177cbfc9b70..ac60f39af5a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -59,11 +59,6 @@ public function testMainNavigationMenuWithPages()
         ]);
     }
 
-    public function testMainNavigationDoesNotInclude404Page()
-    {
-        $this->assertMenuEquals([], [new MarkdownPage('404')]);
-    }
-
     public function testOnlyRootTypePagesAreAddedToNavigationMenu()
     {
         $this->assertMenuEquals(['Html Page', 'Blade Page', 'Markdown Page'], [
@@ -90,6 +85,11 @@ public function testInMemoryPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    public function testMainNavigationDoesNotInclude404Page()
+    {
+        $this->assertMenuEquals([], [new MarkdownPage('404')]);
+    }
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([

From ed59f2c74edfba4fac53ffb4f00bf7b7a7c89533 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 11:55:22 +0100
Subject: [PATCH 0343/2811] Test redirect pages are added to navigation menu

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ac60f39af5a..73d5451985b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\Redirect;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -90,6 +91,13 @@ public function testMainNavigationDoesNotInclude404Page()
         $this->assertMenuEquals([], [new MarkdownPage('404')]);
     }
 
+    public function testRedirectPagesAreAddedToNavigationMenu()
+    {
+        $this->assertMenuEquals(['Redirect'], [
+            new Redirect('redirect', 'destination'),
+        ]);
+    }
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([

From 2ff05f5d5630348f0c910db7426bb46fa9960940 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:01:27 +0100
Subject: [PATCH 0344/2811] Remove unused assertion helper

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 73d5451985b..d5c5af688a6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -403,13 +403,6 @@ public function assertEquals(array $expected, bool $strict = false): static
 
         return $this;
     }
-
-    public function assertHasItem(string $label): static
-    {
-        $this->test->assertNotEmpty($this->items->first(fn ($item) => $item->getLabel() === $label), "Item with label '$label' not found in the main navigation menu");
-
-        return $this;
-    }
 }
 
 class TestKernel extends HydeKernel

From bab57f1ced4e6dafe86936a2876f60b4e59c7fa3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:14:27 +0100
Subject: [PATCH 0345/2811] Update sidebar testing helper to allow pages

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d5c5af688a6..152d79c1c55 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -311,8 +311,12 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function sidebar(): AssertableNavigationMenu
+    protected function sidebar(?array $withPages = null): AssertableNavigationMenu
     {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
         return new AssertableNavigationMenu($this, true);
     }
 }

From d48c4b2c90b51be915eb5aaa8ad970c2bad5ef9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:14:55 +0100
Subject: [PATCH 0346/2811] Add sidebar assertion helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 152d79c1c55..84de380a864 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -290,6 +290,11 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    protected function assertSidebarEquals(array $expected, array $menuPages): void
+    {
+        $this->sidebar($menuPages)->assertEquals($expected);
+    }
+
     protected function assertMenuEquals(array $expected, array $menuPages): void
     {
         $this->menu($menuPages)->assertEquals($expected);

From 26fb57b001ba807c582c255bbf2ee9b96e289c1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 12:15:08 +0100
Subject: [PATCH 0347/2811] Test sidebar with pages

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 84de380a864..f85f320f098 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -290,6 +290,15 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 34c9c2e0fcb20962f0e4e2d3c594018208dee41a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:27:16 +0100
Subject: [PATCH 0348/2811] Test only documentation pages are added to sidebar

---
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f85f320f098..f79d2577573 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -299,6 +299,19 @@ public function testSidebarWithPages()
         ]);
     }
 
+    public function testOnlyDocumentationPagesAreAddedToSidebar()
+    {
+        $this->assertSidebarEquals(['Documentation Page'], [
+            new HtmlPage('html-page'),
+            new BladePage('blade-page'),
+            new MarkdownPage('markdown-page'),
+            new MarkdownPost('markdown-post'),
+            new DocumentationPage('documentation-page'),
+            new InMemoryPage('in-memory-page'),
+            new Redirect('redirect', 'destination'),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 7abfce51728dfbec9cdba57ff8079cd36a6eba78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:53:25 +0100
Subject: [PATCH 0349/2811] Add base sidebar front matter tests

---
 .../AutomaticNavigationConfigurationsTest.php | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f79d2577573..824c0409641 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -312,6 +312,75 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    public function testSidebarWithFrontMatterPriority()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first', ['navigation.priority' => 1]),
+            new DocumentationPage('second', ['navigation.priority' => 2]),
+            new DocumentationPage('third', ['navigation.priority' => 3]),
+        ]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first', ['navigation.priority' => 3]),
+            new DocumentationPage('second', ['navigation.priority' => 2]),
+            new DocumentationPage('third', ['navigation.priority' => 1]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterOrder()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first', ['navigation.order' => 1]),
+            new DocumentationPage('second', ['navigation.order' => 2]),
+            new DocumentationPage('third', ['navigation.order' => 3]),
+        ]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first', ['navigation.order' => 3]),
+            new DocumentationPage('second', ['navigation.order' => 2]),
+            new DocumentationPage('third', ['navigation.order' => 1]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterLabel()
+    {
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('foo', ['navigation.label' => 'First']),
+            new DocumentationPage('bar', ['navigation.label' => 'Second']),
+            new DocumentationPage('baz', ['navigation.label' => 'Third']),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterHidden()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => false]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterVisible()
+    {
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.visible' => false]),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From f9df95aff83817e3791eb4b204f990c26a2c530b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:57:30 +0100
Subject: [PATCH 0350/2811] Add sidebar category front matter tests

---
 .../AutomaticNavigationConfigurationsTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 824c0409641..cd93444832a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -381,6 +381,36 @@ public function testSidebarWithFrontMatterVisible()
         ]);
     }
 
+    public function testSidebarWithFrontMatterGroup()
+    {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('baz', ['navigation.group' => 'Group 1']),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterCategory()
+    {
+        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Bar', 'group' => 'group-1'],
+            ['label' => 'Baz', 'group' => 'group-1'],
+        ], [
+            new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.category' => 'Group 1']),
+            new DocumentationPage('baz', ['navigation.category' => 'Group 1']),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From 199360ae10dbdb5334804ce943df6af9cb9e3b4b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 13:58:31 +0100
Subject: [PATCH 0351/2811] Add sidebar front matter precedence tests

---
 .../AutomaticNavigationConfigurationsTest.php | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cd93444832a..5881a571428 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -411,6 +411,75 @@ public function testSidebarWithFrontMatterCategory()
         ]);
     }
 
+    public function testSidebarWithFrontMatterPriorityAndOrder()
+    {
+        // Since the main key in the navigation schema is 'priority', that takes precedence over its 'order' alias
+
+        $expected = [
+            ['label' => 'Foo', 'priority' => 1],
+            ['label' => 'Bar', 'priority' => 2],
+            ['label' => 'Baz', 'priority' => 3],
+        ];
+
+        $this->assertSidebarEquals($expected, [
+            new DocumentationPage('foo', ['navigation.priority' => 1, 'navigation.order' => 10]),
+            new DocumentationPage('bar', ['navigation.priority' => 2, 'navigation.order' => 20]),
+            new DocumentationPage('baz', ['navigation.priority' => 3, 'navigation.order' => 30]),
+        ]);
+
+        $this->assertSidebarEquals($expected, [
+            new DocumentationPage('foo', ['navigation.order' => 10, 'navigation.priority' => 1]),
+            new DocumentationPage('bar', ['navigation.order' => 20, 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.order' => 30, 'navigation.priority' => 3]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterHiddenAndVisible()
+    {
+        // Since the main key in the navigation schema is 'hidden', that takes precedence over its 'visible' alias
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => false, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new DocumentationPage('bar', ['navigation.hidden' => true, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => true]),
+        ]);
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('foo', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => false]),
+            new DocumentationPage('baz', ['navigation.hidden' => false, 'navigation.visible' => false]),
+        ]);
+
+        $this->assertSidebarEquals(['Bar'], [
+            new DocumentationPage('foo', ['navigation.hidden' => true, 'navigation.visible' => false]),
+            new DocumentationPage('bar', ['navigation.hidden' => false, 'navigation.visible' => true]),
+            new DocumentationPage('baz', ['navigation.hidden' => true, 'navigation.visible' => false]),
+        ]);
+    }
+
+    public function testSidebarWithFrontMatterGroupAndCategory()
+    {
+        // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
+
+        $this->assertSidebarEquals(array_fill(0, 3, ['group' => 'group-1']), [
+            new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new DocumentationPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+            new DocumentationPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
+        ]);
+    }
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From cd4e77f7602526ef8df475fb1d9a01ad5637e6d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 14:07:30 +0100
Subject: [PATCH 0352/2811] Add section comments to test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5881a571428..a9253494fb7 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -39,6 +39,8 @@ protected function setUp(): void
         HydeKernel::setInstance($this->kernel);
     }
 
+    // Base tests
+
     public function testMainNavigationMenu()
     {
         $this->menu()->assertEquals(['Home']);
@@ -49,6 +51,8 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()->assertEquals([]);
     }
 
+    // Main navigation menu tests
+
     public function testMainNavigationMenuWithPages()
     {
         $this->withPages([
@@ -290,6 +294,8 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Documentation sidebar menu tests
+
     public function testSidebarWithPages()
     {
         $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
@@ -480,6 +486,8 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Testing helpers
+
     protected function assertSidebarEquals(array $expected, array $menuPages): void
     {
         $this->sidebar($menuPages)->assertEquals($expected);

From f6b3564d6af6283b9de9c80679fae97f2842ced2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 14:17:16 +0100
Subject: [PATCH 0353/2811] Add base main navigation subdirectory handling
 tests

---
 .../AutomaticNavigationConfigurationsTest.php | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a9253494fb7..20d36b0cdc4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -294,6 +294,42 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Main navigation subdirectory handling tests
+
+    public function testPagesInSubdirectoriesAreNotAddedToNavigation()
+    {
+        $this->assertMenuEquals([], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedToNavigationWhenNavigationSubdirectoriesIsSetToFlat()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+
+        $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdirectoriesIsSetToDropdown()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['Foo', 'Bar', 'Baz'],
+            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+        ], [
+            new MarkdownPage('about/foo'),
+            new MarkdownPage('about/bar'),
+            new MarkdownPage('about/baz'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 388b31faa74a89c7729dea0424c8803f79561a29 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 15:05:49 +0100
Subject: [PATCH 0354/2811] Add base sidebar subdirectory handling tests

---
 .../AutomaticNavigationConfigurationsTest.php | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 20d36b0cdc4..4941d20feb3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -522,6 +522,46 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Sidebar subdirectory handling tests
+
+    public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'about'],
+            ['label' => 'Bar', 'group' => 'about'],
+            ['label' => 'Baz', 'group' => 'about'],
+        ], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedToSidebarWhenSidebarSubdirectoriesIsSetToFlat()
+    {
+        config(['hyde.navigation.subdirectories' => 'flat']);
+
+        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
+    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenSidebarSubdirectoriesIsSetToDropdown()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertSidebarEquals([
+            'Foo', 'Bar', 'Baz',
+            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+        ], [
+            new DocumentationPage('about/foo'),
+            new DocumentationPage('about/bar'),
+            new DocumentationPage('about/baz'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 58d25c186c9a389dc7505188206e887022c12776 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:27:42 +0100
Subject: [PATCH 0355/2811] Proof of concept for using index pages as dropdown
 parent

See https://github.com/hydephp/develop/pull/1568#issuecomment-1950223514
---
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0131bf34f31..bbc972966f0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,8 +71,20 @@ protected function moveGroupedItemsIntoDropdowns(): void
         }
 
         foreach ($dropdowns as $group => $items) {
+            // If items contain an index page, we use that as the dropdown root (TODO handle external links)
+            $hasIndex = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
+
+            if ($hasIndex) {
+                /** @var NavItem $index */
+                $index = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
+                $items = collect($items)->reject(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index')->values();
+                $dropdown = new NavItem($index->getDestination(), $index->getLabel(), $index->getPriority(), $group, $items->all());
+            } else {
+                $dropdown = NavItem::dropdown($group, $items);
+            }
+
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown($group, $items));
+            $this->items->add($dropdown);
         }
     }
 

From 74684acb54c3299e72381f846538930a97ebfccf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:03 +0100
Subject: [PATCH 0356/2811] Add todo

---
 packages/framework/resources/views/layouts/navigation.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 899ccd75f31..6884496f0d4 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,4 +1,5 @@
 @php
+    // Todo consider passing from shared view data?
     $navigation = app('navigation')->getMenu('main');
 @endphp
 

From 8f1511d7972cab40c03acb4fac60b43529588a74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:06 +0100
Subject: [PATCH 0357/2811] Revert "Add todo"

This reverts commit 74684acb54c3299e72381f846538930a97ebfccf.
---
 packages/framework/resources/views/layouts/navigation.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 6884496f0d4..899ccd75f31 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,4 @@
 @php
-    // Todo consider passing from shared view data?
     $navigation = app('navigation')->getMenu('main');
 @endphp
 

From b00c434bd45986e606e1ffd17498fbc506d8c8d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:28:15 +0100
Subject: [PATCH 0358/2811] Revert "Proof of concept for using index pages as
 dropdown parent"

This reverts commit 58d25c186c9a389dc7505188206e887022c12776 as it has issues on mobile UX. See https://twitter.com/CodeWithCaen/status/1758864331083489579
---
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index bbc972966f0..0131bf34f31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,20 +71,8 @@ protected function moveGroupedItemsIntoDropdowns(): void
         }
 
         foreach ($dropdowns as $group => $items) {
-            // If items contain an index page, we use that as the dropdown root (TODO handle external links)
-            $hasIndex = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
-
-            if ($hasIndex) {
-                /** @var NavItem $index */
-                $index = collect($items)->first(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index');
-                $items = collect($items)->reject(fn (NavItem $item): bool => basename($item->getDestination()->getPageIdentifier()) === 'index')->values();
-                $dropdown = new NavItem($index->getDestination(), $index->getLabel(), $index->getPriority(), $group, $items->all());
-            } else {
-                $dropdown = NavItem::dropdown($group, $items);
-            }
-
             // Create a new dropdown item containing the buffered items
-            $this->items->add($dropdown);
+            $this->items->add(NavItem::dropdown($group, $items));
         }
     }
 

From 1224416c283b24897295e02d4764d60b7438b493 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:31:32 +0100
Subject: [PATCH 0359/2811] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8aa758eb100..77d2403a3e6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -92,6 +92,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
+        // TODO resolve label from config here instead of view
         return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 

From 4b4a9abab5960dcfe0c93676f0403f0d8d7da48a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:38:54 +0100
Subject: [PATCH 0360/2811] Normalize navigation item group keys at construct
 time

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 2 +-
 packages/framework/tests/Unit/NavItemTest.php               | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77d2403a3e6..c01de3a004b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->destination = $destination;
         $this->label = $label;
         $this->priority = $priority;
-        $this->group = $group;
+        $this->group = static::normalizeGroupKey($group);
         $this->children = $children;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 78e3407b0f7..c3996365c55 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -342,4 +342,10 @@ public function testGetGroupForRouteWithGroup()
     {
         $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroup());
     }
+
+    public function testGroupKeysAreNormalized()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
+        $this->assertSame('foo-bar', $item->getGroup());
+    }
 }

From 6905c631ba5532d1cda75bbd111e1888a4e7c9aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:42:47 +0100
Subject: [PATCH 0361/2811] Simplify static helper for logic now handled in
 constructor

---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c01de3a004b..ce0f247ed48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,7 +58,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? static::getRouteGroup($route),
+            $group ?? $route->getPage()->data('navigation.group'),
         );
     }
 
@@ -174,14 +174,6 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
-    protected static function getRouteGroup(Route $route): ?string
-    {
-        /** @var string|null $group */
-        $group = $route->getPage()->data('navigation.group');
-
-        return static::normalizeGroupKey($group);
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From 42ab213a44a94ee24d28640c5d6a00b889e7b800 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 18:44:10 +0100
Subject: [PATCH 0362/2811] Remove title logic from view

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 899ccd75f31..d7f8edcde5b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item->hasChildren())
-                        <x-hyde::navigation.dropdown :label="\Hyde\Hyde::makeTitle($item->label)" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->label" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From 0d4897b23f1b508d146a0c83a8f2348cec03003c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:21:51 +0100
Subject: [PATCH 0363/2811] Add section comments

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4941d20feb3..78d218ed38c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -102,6 +102,8 @@ public function testRedirectPagesAreAddedToNavigationMenu()
         ]);
     }
 
+    // Main navigation front matter tests
+
     public function testDefaultNavigationPriorities()
     {
         $this->assertMenuEquals([
@@ -354,6 +356,8 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    // Documentation sidebar front matter tests
+
     public function testSidebarWithFrontMatterPriority()
     {
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [

From 193f0b597f8d0d81e3848b1e8f319bf5a4f09fde Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:38:40 +0100
Subject: [PATCH 0364/2811] Add main navigation configuration tests section

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 78d218ed38c..e7918deabdd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -296,6 +296,8 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Main navigation configuration tests
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 1381d299695c71bf81fe3cc2421716fbeedb3454 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:40:03 +0100
Subject: [PATCH 0365/2811] Add config order tests

---
 .../AutomaticNavigationConfigurationsTest.php | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e7918deabdd..a26691191f1 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -298,6 +298,96 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
 
     // Main navigation configuration tests
 
+    public function testMainNavigationMenuWithConfigOrder()
+    {
+        config(['hyde.navigation.order' => ['first', 'second', 'third']]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['third', 'second', 'first']]);
+
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithConfigOrderHasInferredPriorities()
+    {
+        $this->assertMenuEquals([
+            ['priority' => 999],
+            ['priority' => 999],
+            ['priority' => 999],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first', 'second', 'third']]);
+
+        $this->assertMenuEquals([
+            ['priority' => 500],
+            ['priority' => 501],
+            ['priority' => 502],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithExplicitConfigOrder()
+    {
+        config(['hyde.navigation.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+
+        $this->assertMenuEquals(['Third', 'Second', 'First'], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+
+        config(['hyde.navigation.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertMenuEquals([
+            ['label' => 'First', 'priority' => 1],
+            ['label' => 'Second', 'priority' => 2],
+            ['label' => 'Third', 'priority' => 3],
+        ], [
+            new MarkdownPage('first'),
+            new MarkdownPage('second'),
+            new MarkdownPage('third'),
+        ]);
+    }
+
+    public function testMainNavigationMenuWithMixedConfigOrders()
+    {
+        config(['hyde.navigation.order' => ['foo', 'bar' => 650]]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'priority' => 500],
+            ['label' => 'Bar', 'priority' => 650],
+            ['label' => 'Baz', 'priority' => 999],
+        ], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 71d12989ea5d35230852fa5f050ec607def889c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:51:25 +0100
Subject: [PATCH 0366/2811] Test main navigation menu with config labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a26691191f1..c1d3ecfd633 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -388,6 +388,17 @@ public function testMainNavigationMenuWithMixedConfigOrders()
         ]);
     }
 
+    public function testMainNavigationMenuWithConfigLabels()
+    {
+        config(['hyde.navigation.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
+
+        $this->assertMenuEquals(['First', 'Second', 'Third'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 9f3b40c20f789deb9d6a67f5b2aa94b9daaf7dc0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:52:59 +0100
Subject: [PATCH 0367/2811] Test main navigation menu with config hidden

---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c1d3ecfd633..959464b80c0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,6 +399,17 @@ public function testMainNavigationMenuWithConfigLabels()
         ]);
     }
 
+    public function testMainNavigationMenuWithConfigHidden()
+    {
+        config(['hyde.navigation.exclude' => ['foo', 'bar', 'baz']]);
+
+        $this->assertMenuEquals([], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+        ]);
+    }
+
     // Main navigation subdirectory handling tests
 
     public function testPagesInSubdirectoriesAreNotAddedToNavigation()

From 4ce527a6d6f64e66421fbce4416c6a1b5b80be2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 17 Feb 2024 21:58:36 +0100
Subject: [PATCH 0368/2811] Add test placeholders

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 959464b80c0..d502b09d0ed 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,6 +399,16 @@ public function testMainNavigationMenuWithConfigLabels()
         ]);
     }
 
+    public function testMainNavigationDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testMainNavigationAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
     public function testMainNavigationMenuWithConfigHidden()
     {
         config(['hyde.navigation.exclude' => ['foo', 'bar', 'baz']]);

From 9ceeda415b52148dea2b0d7dedeb01777ad58fc1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 13:16:08 +0100
Subject: [PATCH 0369/2811] Add sidebar config tests

---
 .../AutomaticNavigationConfigurationsTest.php | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d502b09d0ed..7a757b9e48c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -650,6 +650,136 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         ]);
     }
 
+    // Sidebar configuration tests
+
+    public function testSidebarWithConfigOrder()
+    {
+        // TODO should be sidebar.order instead of docs.sidebar_order
+
+        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['third', 'second', 'first']]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithConfigOrderHasInferredPriorities()
+    {
+        $this->assertSidebarEquals([
+            ['priority' => 999],
+            ['priority' => 999],
+            ['priority' => 999],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+
+        $this->assertSidebarEquals([
+            ['priority' => 500],
+            ['priority' => 501],
+            ['priority' => 502],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithExplicitConfigOrder()
+    {
+        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+
+        $this->assertSidebarEquals(['Third', 'Second', 'First'], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+
+        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'First', 'priority' => 1],
+            ['label' => 'Second', 'priority' => 2],
+            ['label' => 'Third', 'priority' => 3],
+        ], [
+            new DocumentationPage('first'),
+            new DocumentationPage('second'),
+            new DocumentationPage('third'),
+        ]);
+    }
+
+    public function testSidebarWithMixedConfigOrders()
+    {
+        config(['docs.sidebar_order' => ['foo', 'bar' => 650]]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'priority' => 500],
+            ['label' => 'Bar', 'priority' => 650],
+            ['label' => 'Baz', 'priority' => 999],
+        ], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
+    public function testSidebarWithConfigLabels()
+    {
+        $this->markTestSkipped('Not supported (yet?)');
+
+        config(['docs.sidebar.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
+
+        $this->assertSidebarEquals(['First', 'Second', 'Third'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
+    public function testSidebarDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testSidebarAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        $this->markTestSkipped('Not yet implemented');
+    }
+
+    public function testSidebarWithConfigHidden()
+    {
+        $this->markTestSkipped('Not supported (yet?)');
+
+        config(['docs.sidebar.exclude' => ['foo', 'bar', 'baz']]);
+
+        $this->assertSidebarEquals([], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ]);
+    }
+
     // Sidebar subdirectory handling tests
 
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()

From afd5e6c265ba3414ce63b62f8f843f161a245fcf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:49:00 +0100
Subject: [PATCH 0370/2811] Merge tests to use loop providing better clarity

---
 .../AutomaticNavigationConfigurationsTest.php | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7a757b9e48c..d9687910ee4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -795,29 +795,23 @@ public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
         ]);
     }
 
-    public function testPagesInSubdirectoriesAreAddedToSidebarWhenSidebarSubdirectoriesIsSetToFlat()
-    {
-        config(['hyde.navigation.subdirectories' => 'flat']);
-
-        $this->assertSidebarEquals(['Foo', 'Bar', 'Baz'], [
-            new DocumentationPage('about/foo'),
-            new DocumentationPage('about/bar'),
-            new DocumentationPage('about/baz'),
-        ]);
-    }
-
-    public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenSidebarSubdirectoriesIsSetToDropdown()
-    {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
-
-        $this->assertSidebarEquals([
-            'Foo', 'Bar', 'Baz',
-            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
-        ], [
-            new DocumentationPage('about/foo'),
-            new DocumentationPage('about/bar'),
-            new DocumentationPage('about/baz'),
-        ]);
+    public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfiguration()
+    {
+        $options = ['dropdown', 'flat', 'hidden'];
+
+        foreach ($options as $option) {
+            config(['docs.sidebar.subdirectories' => $option]);
+
+            $this->assertSidebarEquals([
+                ['label' => 'Foo', 'group' => 'about'],
+                ['label' => 'Bar', 'group' => 'about'],
+                ['label' => 'Baz', 'group' => 'about'],
+            ], [
+                new DocumentationPage('about/foo'),
+                new DocumentationPage('about/bar'),
+                new DocumentationPage('about/baz'),
+            ]);
+        }
     }
 
     // Testing helpers

From c639ccce8faef690d9729721d3a32315844dbc8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:50:52 +0100
Subject: [PATCH 0371/2811] Temporarily commit broken Idea file (WI-76125)

Getting tired of having to unstage this file all the time, so committing it to be removed before PR merge. This is due to a known bug that does not have high enough priority. See https://youtrack.jetbrains.com/issue/WI-76125/PhpStorm-has-started-to-add-an-undesired-line-to-.idea-php-test-framework.xml-when-running-Pest-PHPUnit-tests
---
 .idea/php-test-framework.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
index f990e0a96bb..8ecfa3b3072 100644
--- a/.idea/php-test-framework.xml
+++ b/.idea/php-test-framework.xml
@@ -17,6 +17,7 @@
         <cache>
           <versions>
             <info id="Local" version="9.5.21" />
+            <info id="LocalH:\monorepo\vendor\autoload.php" version="10.4.2" />
           </versions>
         </cache>
       </tool>

From 5fd8344328541b5c30eb3555364d105dba72d4de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 14:55:23 +0100
Subject: [PATCH 0372/2811] Add crosslinks between related actions

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 3221bfa3ada..77562aabef1 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,8 @@
  * @experimental This class may change significantly before its release.
  *
  * @todo Consider making into a service which can create the sidebar as well.
+ *
+ * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0131bf34f31..832248bd43f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -16,6 +16,8 @@
  * @experimental This class may change significantly before its release.
  *
  * @todo Consider making into a service which can create the sidebar as well.
+ *
+ * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu
 {

From de4bedaab4c707d94bf26488f3157b746ee39b36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 15:24:32 +0100
Subject: [PATCH 0373/2811] Add navigation item label filtering tests

---
 .../AutomaticNavigationConfigurationsTest.php | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d9687910ee4..320f10d73d2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -456,6 +456,34 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         ]);
     }
 
+    public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
+    {
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('foo'),
+        ]);
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo', ['navigation.label' => 'Foo']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
+    public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    {
+        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('FOO'),
+        ]);
+
+        $this->assertMenuEquals(['Foo'], [
+            new MarkdownPage('foo', ['navigation.label' => 'foo']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -814,6 +842,34 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         }
     }
 
+    public function testSidebarItemsWithTheSameLabelAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('foo'),
+        ]);
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo', ['navigation.label' => 'Foo']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
+    public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    {
+        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo'),
+            new DocumentationPage('FOO'),
+        ]);
+
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('foo', ['navigation.label' => 'foo']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From c9ab278724299fe9884ce72f9d193ac94553ba2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 16:05:05 +0100
Subject: [PATCH 0374/2811] Add navigation group filtering tests

---
 .../AutomaticNavigationConfigurationsTest.php | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 320f10d73d2..6f01a7fc931 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -484,6 +484,45 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsens
         ]);
     }
 
+    public function testMainNavigationMenuItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new MarkdownPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
+            new MarkdownPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
+        ], [
+            new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
+            new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            // Todo: Should use proper group name
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
+        ], [
+            new MarkdownPage('one/foo'),
+            new MarkdownPage('two/foo'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -870,6 +909,60 @@ public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
         ]);
     }
 
+    public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
+            new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
+    {
+        $this->assertSidebarEquals(['Foo'], [
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
+        ]);
+    }
+
+    public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFilteredWithFlattenedOutputPaths()
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'group' => 'group-1'],
+            ['label' => 'Foo', 'group' => 'group-2'],
+        ], [
+            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
+            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+        ]);
+    }
+
+    public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreNotFilteredWithFlattenedOutputPaths()
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'Foo', 'group' => 'one'],
+            ['label' => 'Foo', 'group' => 'two'],
+        ], [
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 3088d902a16c3face3739938721dd1a6f1bea5b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 17:58:28 +0100
Subject: [PATCH 0375/2811] Make navigation item duplicate filtering case
 insensitive

As identifiers on some systems are case insensitive, and it makes sense to match that to labels
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php |  3 ++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  3 ++-
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 77562aabef1..9b254c75e31 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -60,7 +61,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
+            return $item->getGroup().Str::slug($item->getLabel());
         });
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 832248bd43f..a6edfdafa83 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -97,7 +98,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().$item->label;
+            return $item->getGroup().Str::slug($item->getLabel());
         });
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6f01a7fc931..fe8ffd13a65 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -471,16 +471,16 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
 
     public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
     {
-        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
-
         $this->assertMenuEquals(['Foo'], [
             new MarkdownPage('foo'),
+            new MarkdownPage('Foo'),
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
+            new MarkdownPage('baz', ['navigation.label' => 'FOO']),
         ]);
     }
 
@@ -896,16 +896,16 @@ public function testSidebarItemsWithTheSameLabelAreFiltered()
 
     public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
     {
-        $this->markTestSkipped('Not yet implemented, but we should, as identifiers on some systems are case insensitive, and it makes sense to match that to labels');
-
         $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo'),
+            new DocumentationPage('Foo'),
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
+            new DocumentationPage('baz', ['navigation.label' => 'FOO']),
         ]);
     }
 

From 2ca0ec6b6917639ca5ff70fba093683595255974 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 19:04:07 +0100
Subject: [PATCH 0376/2811] Remove unused test helpers

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fe8ffd13a65..d4e6df9af5b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1049,18 +1049,6 @@ public function getState(int $index): ?TestNavItem
         return $this->state()[$index] ?? null;
     }
 
-    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function dd(): void
-    {
-        dd($this->items);
-    }
-
-    /** @noinspection PhpUnused, PhpNoReturnAttributeCanBeAddedInspection */
-    public function ddState(): void
-    {
-        dd($this->state());
-    }
-
     /**
      * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored

From b0a7e94dd14518eb78fff27a85960723c9fb337a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 20:00:40 +0100
Subject: [PATCH 0377/2811] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 9b254c75e31..cc9b9e25488 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -61,7 +61,7 @@ protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
             // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel());
+            return $item->getGroup().Str::slug($item->getLabel()); // Todo we could use this as the "identifier" for the item, as it uniquely identifies it
         });
     }
 

From b773f12ab653267108c10678f9ee0d4f47b380f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:05:29 +0100
Subject: [PATCH 0378/2811] Add testing helper

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d4e6df9af5b..c866603b2ee 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -11,6 +11,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
+use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\Redirect;
@@ -975,6 +976,12 @@ protected function assertMenuEquals(array $expected, array $menuPages): void
         $this->menu($menuPages)->assertEquals($expected);
     }
 
+    #[NoReturn]
+    protected function ddMenu(?array $menuPages = null): void
+    {
+        dd($this->menu($menuPages)->state());
+    }
+
     protected function menu(?array $withPages = null): AssertableNavigationMenu
     {
         if ($withPages) {

From f03eb689f862900f32d58a55e6762c6ceaca6ccc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:05:58 +0100
Subject: [PATCH 0379/2811] Assert on the new state

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c866603b2ee..f42c61c8d3a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -448,8 +448,8 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['Foo', 'Bar', 'Baz'],
-            // TODO: New state will be ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
+            ['label' => 'about', 'children' => ['Foo', 'Bar', 'Baz']],
+            // TODO: Label should be About
         ], [
             new MarkdownPage('about/foo'),
             new MarkdownPage('about/bar'),

From 66a4b903988297f58e0cfcd7ed8ba02d95b3c40a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:19:15 +0100
Subject: [PATCH 0380/2811] Update testing helper

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f42c61c8d3a..971dfd11f9c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -977,8 +977,12 @@ protected function assertMenuEquals(array $expected, array $menuPages): void
     }
 
     #[NoReturn]
-    protected function ddMenu(?array $menuPages = null): void
+    protected function ddMenu(?array $menuPages = null, ?string $menu = 'menu'): void
     {
+        if ($menu === 'sidebar') {
+            dd($this->sidebar($menuPages)->state());
+        }
+
         dd($this->menu($menuPages)->state());
     }
 

From 74c9fd0b70310557af36ec3d1ee468f344004073 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:24:44 +0100
Subject: [PATCH 0381/2811] Push group as null

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cc9b9e25488..1275944aebf 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,7 +48,7 @@ protected function generate(): void
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: 'other'));
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: null));
         }
     }
 

From 1eb8a5aed8ee386e778fe0f450e4dd3c639dd07a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:25:16 +0100
Subject: [PATCH 0382/2811] Compare against null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index eba36a0d3ac..7ac9725e22d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -39,7 +39,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== ['other']);
+        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== [null]);
     }
 
     /** @return array<string> */
@@ -89,7 +89,7 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === 'other';
+        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
         $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;

From 9ef346504686484aa5725c5e8c0918061a753590 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:30:57 +0100
Subject: [PATCH 0383/2811] Compare against null

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 packages/framework/tests/Feature/HydePageTest.php               | 2 +-
 .../framework/tests/Unit/Pages/DocumentationPageUnitTest.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 51827a4d0a0..12f6267a6fc 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -211,7 +211,7 @@ private function canUseSubdirectoryForGroups(): bool
     private function defaultGroup(): ?string
     {
         // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
-        return $this->isInstanceOf(DocumentationPage::class) ? 'other' : null;
+        return $this->isInstanceOf(DocumentationPage::class) ? null : null;
     }
 
     private function pageIsInSubdirectory(): bool
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index dde95fffb96..4e545c1a9d6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -239,7 +239,7 @@ public function testNavigationMenuGroup()
         $this->assertNull((new MarkdownPage())->navigationMenuGroup());
         $this->assertNull((new MarkdownPost())->navigationMenuGroup());
         $this->assertNull((new HtmlPage())->navigationMenuGroup());
-        $this->assertSame('other', (new DocumentationPage())->navigationMenuGroup());
+        $this->assertSame(null, (new DocumentationPage())->navigationMenuGroup());
         $this->assertSame('foo', DocumentationPage::make(matter: ['navigation' => ['group' => 'foo']])->navigationMenuGroup());
     }
 
diff --git a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
index 2ef2ae376ed..f24ded96215 100644
--- a/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
+++ b/packages/framework/tests/Unit/Pages/DocumentationPageUnitTest.php
@@ -98,7 +98,7 @@ public function testNavigationMenuLabel()
 
     public function testNavigationMenuGroup()
     {
-        $this->assertSame('other', (new DocumentationPage('foo'))->navigationMenuGroup());
+        $this->assertSame(null, (new DocumentationPage('foo'))->navigationMenuGroup());
     }
 
     public function testNavigationMenuGroupWithData()

From 8b66dd025c5b268fbe37479c45032934016f217e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:35:02 +0100
Subject: [PATCH 0384/2811] Expect null

---
 packages/framework/tests/Unit/HydePageSerializableUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/HydePageSerializableUnitTest.php b/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
index 9462f29728c..149e184dee6 100644
--- a/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
+++ b/packages/framework/tests/Unit/HydePageSerializableUnitTest.php
@@ -347,7 +347,7 @@ public function testJsonSerializedDocumentationPageContents()
                     "label": "",
                     "priority": 999,
                     "hidden": false,
-                    "group": "other"
+                    "group": null
                 },
                 "title": ""
             }

From 8cd042487ef22371cca574f9a6f147d1784bae3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:33:37 +0100
Subject: [PATCH 0385/2811] Allow nullable return

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 7ac9725e22d..06f8e12286a 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -45,7 +45,7 @@ public function hasGroups(): bool
     /** @return array<string> */
     public function getGroups(): array
     {
-        return $this->items->map(function (NavItem $item): string {
+        return $this->items->map(function (NavItem $item): ?string {
             return $item->getGroup();
         })->unique()->toArray();
     }

From 4dca8c5fc75cf85413385890429a75efd07d2f54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:47:38 +0100
Subject: [PATCH 0386/2811] Test sidebar with mixed grouped and ungrouped items

---
 .../tests/Feature/SidebarViewTest.php         | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 44840e6440e..2dcd7646d91 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -169,6 +169,31 @@ public function testSidebarWithNonCollapsibleGroupedItems()
         $this->assertViewWasNotRendered(view('hyde::components.docs.sidebar-group-toggle-button'));
     }
 
+    public function testSidebarWithMixedGroupedAndUngroupedItems()
+    {
+        $this->mockRoute();
+        $this->mockPage();
+        $this->file('_docs/index.md');
+        $this->markdown('_docs/first.md', matter: ['navigation.group' => 'Group 1']);
+        $this->markdown('_docs/second.md');
+
+        $this->renderComponent(view('hyde::components.docs.sidebar'))
+            ->assertSeeText('Group 1')
+            ->assertSeeText('First')
+            ->assertSeeText('Other')
+            ->assertSeeText('Second')
+            ->assertSeeHtml('href="docs/first.html"')
+            ->assertSeeHtml('href="docs/second.html"')
+            ->allGood();
+
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
+            'sidebar' => DocumentationSidebar::create(),
+            'grouped' => true,
+        ]));
+
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-group-toggle-button'));
+    }
+
     protected function renderComponent(View $view): self
     {
         try {

From deb0e57cb18eafc8610753ec517e0bd0cf50c81e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:00 +0100
Subject: [PATCH 0387/2811] Allow null group in parameter

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 06f8e12286a..5cd4893cb34 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,7 +64,7 @@ public function getItemsInGroup(?string $group): Collection
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(string $group): bool
+    public function isGroupActive(?string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);

From 66d250b72b21c9064786693017da4b05ee29788d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:15 +0100
Subject: [PATCH 0388/2811] Return false if group is null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5cd4893cb34..13fdfd4469b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,6 +66,10 @@ public function getItemsInGroup(?string $group): Collection
      */
     public function isGroupActive(?string $group): bool
     {
+        if ($group === null) {
+            return false;
+        }
+
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
 

From 67422aee238d1a0bd4ae3bbbe3c5e4744d0911fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:50:59 +0100
Subject: [PATCH 0389/2811] Null coalesce to other when making group title

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 13fdfd4469b..596b1aba075 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -81,9 +81,9 @@ public function isGroupActive(?string $group): bool
      *
      * @todo Get title from instance
      */
-    public function makeGroupTitle(string $group): string
+    public function makeGroupTitle(?string $group): string
     {
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
+        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group ?? 'Other');
     }
 
     private function isPageIndexPage(): bool

From 960415b72ef6991292190ef4ba93dc5959459c46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:54:56 +0100
Subject: [PATCH 0390/2811] Remove resolved todo

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 12f6267a6fc..2eaede36b70 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,7 +210,6 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
-        // TODO: It would be better if this was null in all cases, considering 'other' is used a a sort of confusing pseudo-null
         return $this->isInstanceOf(DocumentationPage::class) ? null : null;
     }
 

From db4166b9bd6040bd0d35c4f3e3df19a3b8891dac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:55:43 +0100
Subject: [PATCH 0391/2811] Evaluate conditional with same operands

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 2eaede36b70..1bedb99c117 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -210,7 +210,7 @@ private function canUseSubdirectoryForGroups(): bool
 
     private function defaultGroup(): ?string
     {
-        return $this->isInstanceOf(DocumentationPage::class) ? null : null;
+        return null;
     }
 
     private function pageIsInSubdirectory(): bool

From 03ce8261dad7083672e6999a47587d31718a38aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:55:58 +0100
Subject: [PATCH 0392/2811] Inline constant private helper method

---
 .../src/Framework/Factories/NavigationDataFactory.php      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1bedb99c117..26c230cdada 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -84,7 +84,7 @@ protected function makeGroup(): ?string
             return $this->getSubdirectoryName();
         }
 
-        return $this->searchForGroupInFrontMatter() ?? $this->defaultGroup();
+        return $this->searchForGroupInFrontMatter() ?? null;
     }
 
     protected function makeHidden(): bool
@@ -208,11 +208,6 @@ private function canUseSubdirectoryForGroups(): bool
             || $this->isInstanceOf(DocumentationPage::class);
     }
 
-    private function defaultGroup(): ?string
-    {
-        return null;
-    }
-
     private function pageIsInSubdirectory(): bool
     {
         return Str::contains($this->identifier, '/');

From 4be1a4550837702952a83166711f9bee41728aaa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:56:09 +0100
Subject: [PATCH 0393/2811] Remove unnecessary null coalesce to null

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 26c230cdada..0fb46e79da2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -84,7 +84,7 @@ protected function makeGroup(): ?string
             return $this->getSubdirectoryName();
         }
 
-        return $this->searchForGroupInFrontMatter() ?? null;
+        return $this->searchForGroupInFrontMatter();
     }
 
     protected function makeHidden(): bool

From 3ce096794b831e348b3dcec0bd0a4f077d667bc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 21:57:46 +0100
Subject: [PATCH 0394/2811] Use null assertion helper helper

---
 packages/framework/tests/Feature/HydePageTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 4e545c1a9d6..158e06e56c6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -239,7 +239,7 @@ public function testNavigationMenuGroup()
         $this->assertNull((new MarkdownPage())->navigationMenuGroup());
         $this->assertNull((new MarkdownPost())->navigationMenuGroup());
         $this->assertNull((new HtmlPage())->navigationMenuGroup());
-        $this->assertSame(null, (new DocumentationPage())->navigationMenuGroup());
+        $this->assertNull((new DocumentationPage())->navigationMenuGroup());
         $this->assertSame('foo', DocumentationPage::make(matter: ['navigation' => ['group' => 'foo']])->navigationMenuGroup());
     }
 

From 89f32fb98c34041fe2345aca4a36c2225281a652 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 22:05:25 +0100
Subject: [PATCH 0395/2811] Update navigation provider to register the sidebar
 generation

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index edb8ee9bf13..6b10ab8d13f 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -21,6 +22,7 @@ public function register(): void
 
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('sidebar', GeneratesDocumentationSidebarMenu::handle());
         });
     }
 }

From a63e293bb43bf880086e5fc4355914f223905b2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 18 Feb 2024 22:08:24 +0100
Subject: [PATCH 0396/2811] Update DocumentationSidebar class to extend
 NavigationMenu

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 596b1aba075..f62493b6164 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,7 +15,7 @@
 use function collect;
 
 /** @deprecated Use the new NavigationMenu class instead */
-class DocumentationSidebar
+class DocumentationSidebar extends NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From a5f8378cb059ac3f6057ea069ea6e251fb92dbc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:14:59 +0100
Subject: [PATCH 0397/2811] Use constructor from parent

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f62493b6164..d899d4acf38 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -10,7 +10,6 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use Illuminate\Contracts\Support\Arrayable;
 
 use function collect;
 
@@ -20,11 +19,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    public function __construct(Arrayable|array $items = [])
-    {
-        $this->items = new Collection($items);
-    }
-
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItems(): Collection
     {

From 5bd62d529c45948b8c7337ef3c5a8c991803dc46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:19:50 +0100
Subject: [PATCH 0398/2811] Update sidebar component to get menu from container

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 04b9857a1d5..f4f3d9c2cb3 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -4,7 +4,7 @@
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::create(),
+            'sidebar' => app('navigation')->getMenu('sidebar'),
         ])
     </nav>
     @if(config('docs.sidebar.footer', true) !== false)

From daf092af323cf0146c606c2c27d3b3f7e9ed4cf3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:23:01 +0100
Subject: [PATCH 0399/2811] Get items from the parent method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d899d4acf38..b5b1fb74e1e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -19,12 +19,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->values();
-    }
-
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {

From 9765785bc12ca80169888b8403a63a791fa3540b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 10:33:58 +0100
Subject: [PATCH 0400/2811] Expand on method description

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b5b1fb74e1e..d6faae266f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -48,7 +48,7 @@ public function getItemsInGroup(?string $group): Collection
     }
 
     /**
-     * Is a page within the group the current page?
+     * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */

From c05b8b3a1f6ad97f0115b91e7b8dd15e4acc4e5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:37:44 +0100
Subject: [PATCH 0401/2811] Simplify conditional

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d6faae266f4..e0346aacc8c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,7 +27,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return (count($this->getGroups()) >= 1) && ($this->getGroups() !== [null]);
+        return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 
     /** @return array<string> */

From f16ed77c9d8ecb40e501285d4bc12002d379c829 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:42:06 +0100
Subject: [PATCH 0402/2811] Rename factory helper method to be more clear

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index a6edfdafa83..dcc88fe5878 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -54,7 +54,7 @@ protected function generate(): void
             $this->items->push($item);
         });
 
-        if ($this->dropdownsEnabled()) {
+        if ($this->useSubdirectoriesAsDropdowns()) {
             $this->moveGroupedItemsIntoDropdowns();
         }
     }
@@ -89,7 +89,7 @@ protected function canAddItemToDropdown(NavItem $item): bool
         return $item->getGroup() !== null;
     }
 
-    protected function dropdownsEnabled(): bool
+    protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }

From aebee358014fa628ffbe6140d4f801f64232985e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:42:27 +0100
Subject: [PATCH 0403/2811] Remove redundant argument

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1275944aebf..dd017b21772 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,7 +48,7 @@ protected function generate(): void
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home(), group: null));
+            $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
     }
 

From 896f8e19d0b6431694ae701d7fe6894e580dfc8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:45:47 +0100
Subject: [PATCH 0404/2811] Introduce local variable for loop routes

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index dd017b21772..70eca4faef0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -40,7 +40,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        Routes::getRoutes(DocumentationPage::class)->each(function (Route $route): void {
+        $routes = Routes::getRoutes(DocumentationPage::class);
+
+        $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From b577ccc3f46b137cd09f1b9eaf170b13bdbe2bb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:50:17 +0100
Subject: [PATCH 0405/2811] Add helper to prefind sidebar groups

---
 .../GeneratesDocumentationSidebarMenu.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 70eca4faef0..7c16e7b6f1c 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,6 +9,7 @@
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -54,6 +55,22 @@ protected function generate(): void
         }
     }
 
+    protected function findSidebarGroups(RouteCollection $routes): array
+    {
+        // In order to know if we should use groups in the sidebar,
+        // we need to loop through all the pages and see if they have a group set
+
+        $groups = [];
+
+        $routes->each(function (Route $route) use (&$groups): void {
+            if ($route->getPage()->data('navigation.group')) {
+                $groups[Str::slug($route->getPage()->data('navigation.group'))] = true;
+            }
+        });
+
+        return array_keys($groups);
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From f41a5450897c70748c38591c0a1f7018a539ce2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:51:18 +0100
Subject: [PATCH 0406/2811] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e0346aacc8c..1e639981876 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,6 +27,8 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
+        // Todo check if any items have children
+
         return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 

From 2d160af61c566b8a5d3fb00950865d7b455b23c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 11:51:41 +0100
Subject: [PATCH 0407/2811] Deprecate group accessor

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1e639981876..d87bcbd2313 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,7 +32,11 @@ public function hasGroups(): bool
         return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
     }
 
-    /** @return array<string> */
+    /**
+     * @deprecated Use children instead
+     *
+     * @return array<string>
+     */
     public function getGroups(): array
     {
         return $this->items->map(function (NavItem $item): ?string {

From 7579dfdc6f1fb99173119963c21cfe904a7c04c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:08:01 +0100
Subject: [PATCH 0408/2811] Mark new method as experimental

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7c16e7b6f1c..cc7a7d832e4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,6 +55,7 @@ protected function generate(): void
         }
     }
 
+    /** @experimental Might not actually be needed now that groups default to null */
     protected function findSidebarGroups(RouteCollection $routes): array
     {
         // In order to know if we should use groups in the sidebar,

From c6a0e406d6ad14299ef4ae147300acb0ec0ec097 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:08:15 +0100
Subject: [PATCH 0409/2811] Find the sidebar groups

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cc7a7d832e4..e54bfd93570 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -43,6 +43,8 @@ protected function generate(): void
     {
         $routes = Routes::getRoutes(DocumentationPage::class);
 
+        $groups = $this->findSidebarGroups($routes);
+
         $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From f4e21dfee8393d6077bdc8f7aa33ae5347c2adea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:09:09 +0100
Subject: [PATCH 0410/2811] Introduce local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e54bfd93570..55fd915ff38 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -47,7 +47,9 @@ protected function generate(): void
 
         $routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                $item = NavItem::fromRoute($route);
+
+                $this->items->put($route->getRouteKey(), $item);
             }
         });
 

From a06508435b46f7fe036817fd42179630318e8b0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:10:17 +0100
Subject: [PATCH 0411/2811] Add groups to closure use construct

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 55fd915ff38..ddf00b8e159 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -45,7 +45,7 @@ protected function generate(): void
 
         $groups = $this->findSidebarGroups($routes);
 
-        $routes->each(function (Route $route): void {
+        $routes->each(function (Route $route) use ($groups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
 

From 6d780915edafc73ad71bd7168b78753e3d38129d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:11:03 +0100
Subject: [PATCH 0412/2811] Get the item group

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ddf00b8e159..1d4d7130dee 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,6 +48,7 @@ protected function generate(): void
         $routes->each(function (Route $route) use ($groups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
+                $group = $item->getGroup();
 
                 $this->items->put($route->getRouteKey(), $item);
             }

From bf8abd8c1caef9d180347c0bf7b31a2af099c5bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:11:19 +0100
Subject: [PATCH 0413/2811] Check for group state

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1d4d7130dee..fcb2d850eba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -50,6 +50,10 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
+                if ($groups && $group === null) {
+                    // Todo: Add item
+                }
+
                 $this->items->put($route->getRouteKey(), $item);
             }
         });

From afa61fd1bfc7541330225e31b10e28f44edcd52f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:13:21 +0100
Subject: [PATCH 0414/2811] Add navigation item identifier property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce0f247ed48..80f32711fed 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,6 +30,8 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    public readonly string $identifier;
+
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     public readonly array $children;
 

From 9e016e8206e2c9d669d00a30ee29c680a66b6df2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:15:23 +0100
Subject: [PATCH 0415/2811] Set identifier to route key

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 80f32711fed..396092a9690 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,6 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
+        $this->identifier = $destination->getRouteKey();
         $this->children = $children;
     }
 

From 406cd50f9a0d765d15423a25296b058c1b369ed5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:16:33 +0100
Subject: [PATCH 0416/2811] Coerce falsy route keys to label slug

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 396092a9690..5ba78965564 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $destination->getRouteKey();
+        $this->identifier = $destination->getRouteKey() ?: Str::slug($label);
         $this->children = $children;
     }
 

From 82f59e883b310691c0e26a82fed2726a57a7c6d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:17:44 +0100
Subject: [PATCH 0417/2811] Replace '?:' with if

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5ba78965564..8c6aee51ee5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,11 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $destination->getRouteKey() ?: Str::slug($label);
+        if ($destination->getRouteKey()) {
+            $this->identifier = $destination->getRouteKey();
+        } else {
+            $this->identifier = Str::slug($label);
+        }
         $this->children = $children;
     }
 

From d8a97d915ea9ae51bc3508e5b81cf1d5473315d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:18:23 +0100
Subject: [PATCH 0418/2811] Add type check

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8c6aee51ee5..aa0b504d5bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        if ($destination->getRouteKey()) {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
             $this->identifier = $destination->getRouteKey();
         } else {
             $this->identifier = Str::slug($label);

From fd20252088fb31a23992e4d75663173e6f527f07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:20:06 +0100
Subject: [PATCH 0419/2811] Extract helper method

---
 .../Framework/Features/Navigation/NavItem.php   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index aa0b504d5bc..2a5e2249565 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,11 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $this->identifier = $destination->getRouteKey();
-        } else {
-            $this->identifier = Str::slug($label);
-        }
+        $this->identifier = $this->makeIdentifier($destination, $label);
         $this->children = $children;
     }
 
@@ -197,4 +193,15 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
+
+    protected static function makeIdentifier(Route|ExternalRoute $destination, string $label): string
+    {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
+            $identifier = $destination->getRouteKey();
+        } else {
+            $identifier = Str::slug($label);
+        }
+
+        return $identifier;
+    }
 }

From 06d3fdfa3c9279c30fed3d2d49454c7c9b086803 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:21:56 +0100
Subject: [PATCH 0420/2811] Remove already evaluated union type

Right hand is inherited by left hand parent
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2a5e2249565..d6169ebc322 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -194,7 +194,7 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
-    protected static function makeIdentifier(Route|ExternalRoute $destination, string $label): string
+    protected static function makeIdentifier(Route $destination, string $label): string
     {
         if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
             $identifier = $destination->getRouteKey();

From aac2e9c95e470e698f284bc55c0406c552ef8220 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:24:31 +0100
Subject: [PATCH 0421/2811] Move up helper method

---
 .../Framework/Features/Navigation/NavItem.php | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d6169ebc322..583632d07b2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -182,6 +182,17 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
+    protected static function makeIdentifier(Route $destination, string $label): string
+    {
+        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
+            $identifier = $destination->getRouteKey();
+        } else {
+            $identifier = Str::slug($label);
+        }
+
+        return $identifier;
+    }
+
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
@@ -193,15 +204,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
-
-    protected static function makeIdentifier(Route $destination, string $label): string
-    {
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $identifier = $destination->getRouteKey();
-        } else {
-            $identifier = Str::slug($label);
-        }
-
-        return $identifier;
-    }
 }

From 4b803f01d2107684c054abb2bc7eca46a40d4c56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:24:43 +0100
Subject: [PATCH 0422/2811] Refactor control flow

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 583632d07b2..a675b9bd679 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -185,12 +185,10 @@ protected static function normalizeGroupKey(?string $group): ?string
     protected static function makeIdentifier(Route $destination, string $label): string
     {
         if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            $identifier = $destination->getRouteKey();
+            return $destination->getRouteKey();
         } else {
-            $identifier = Str::slug($label);
+            return Str::slug($label);
         }
-
-        return $identifier;
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From a388822f38272dbf8c884cac22d03f245e9f1d3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 12:25:09 +0100
Subject: [PATCH 0423/2811] Simplify if with ternary return

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a675b9bd679..6c125864430 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -184,11 +184,9 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(Route $destination, string $label): string
     {
-        if (! $destination instanceof ExternalRoute && $destination->getRouteKey()) {
-            return $destination->getRouteKey();
-        } else {
-            return Str::slug($label);
-        }
+        return ! $destination instanceof ExternalRoute && $destination->getRouteKey()
+            ? $destination->getRouteKey()
+            : Str::slug($label);
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From 50afd828ddafb25ab4ed23a079d887bdacdc01a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:35:03 +0100
Subject: [PATCH 0424/2811] Add identifier tests

---
 packages/framework/tests/Unit/NavItemTest.php | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index c3996365c55..56748364ee8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -348,4 +348,40 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroup());
     }
+
+    public function testIdentifier()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Test', 500);
+
+        $this->assertSame('test', $item->identifier);
+    }
+
+    public function testIdentifierWithCustomLabel()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Foo Bar', 500);
+
+        $this->assertSame('foo-bar', $item->identifier);
+    }
+
+    public function testIdentifierFromRouteKey()
+    {
+        $item = NavItem::fromRoute(Routes::get('index'));
+        $this->assertSame('index', $item->identifier);
+    }
+
+    public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
+    {
+        $route = new Route(new MarkdownPage());
+        $item = new NavItem($route, 'Foo Bar', 500);
+
+        $this->assertSame('foo-bar', $item->identifier);
+    }
+
+    public function testIdentifierUsesLabelForExternalRoute()
+    {
+        $item = NavItem::forLink('https://example.com', 'Foo Bar');
+        $this->assertSame('foo-bar', $item->identifier);
+    }
 }

From b94d684ff557887838723731db04ec4560c5c905 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:43:05 +0100
Subject: [PATCH 0425/2811] Document identifier property

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6c125864430..e6226f87626 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,6 +30,7 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
+    /** The route key, or a "slugified" version of the label if the route has no key, for example external links and dropdowns items. */
     public readonly string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */

From 06605a0b4fcfb70535026075eebdb1a1488ec9b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:43:37 +0100
Subject: [PATCH 0426/2811] Use the item identifier to determine uniqueness

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index fcb2d850eba..8ca04be8895 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -89,8 +89,8 @@ protected function canAddRoute(Route $route): bool
     protected function removeDuplicateItems(): void
     {
         $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel()); // Todo we could use this as the "identifier" for the item, as it uniquely identifies it
+            // Filter using a combination of the group and identifier to allow duplicate labels in different groups
+            return $item->getGroup().$item->identifier;
         });
     }
 

From 6137a7df04a91107c4f55f8968dea2da26bdf89f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:46:00 +0100
Subject: [PATCH 0427/2811] Remove resolved todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e6226f87626..622f2c9a712 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -16,7 +16,6 @@
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
  * @todo Consider splitting facade methods to actual facade class.
- * @todo Consider adding an "identifier" property to make it more visible how items are identified, for example when modifying sidebars in the config.
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor

From 22979d4a6944882579d8dcd5a22f7fa84476628d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:50:23 +0100
Subject: [PATCH 0428/2811] Generate navigation item identifier solely on label

Originally added route keys so that page labels can be set in config and provide compatibility for that, but realized that that happens way earlier, so at this point we only need to sort against labels.
---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ++++------
 packages/framework/tests/Unit/NavItemTest.php          |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 622f2c9a712..e89d293efad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -29,7 +29,7 @@ class NavItem implements Stringable
     public readonly int $priority;
     public readonly ?string $group;
 
-    /** The route key, or a "slugified" version of the label if the route has no key, for example external links and dropdowns items. */
+    /** The "slugified" version of the label. */
     public readonly string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
@@ -48,7 +48,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $this->makeIdentifier($destination, $label);
+        $this->identifier = $this->makeIdentifier($label);
         $this->children = $children;
     }
 
@@ -182,11 +182,9 @@ protected static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
-    protected static function makeIdentifier(Route $destination, string $label): string
+    protected static function makeIdentifier(string $label): string
     {
-        return ! $destination instanceof ExternalRoute && $destination->getRouteKey()
-            ? $destination->getRouteKey()
-            : Str::slug($label);
+        return Str::slug($label);
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 56748364ee8..71f6697fc7a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -368,7 +368,7 @@ public function testIdentifierWithCustomLabel()
     public function testIdentifierFromRouteKey()
     {
         $item = NavItem::fromRoute(Routes::get('index'));
-        $this->assertSame('index', $item->identifier);
+        $this->assertSame('home', $item->identifier);
     }
 
     public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()

From 1f149a435c6368658355dbaaa40b1b7005d4dee5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:50:28 +0100
Subject: [PATCH 0429/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e89d293efad..a885d3eb9ad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -184,7 +184,7 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label);
+        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int

From c8a145b1bbd831dd82613e5f3acc27da392337fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 13:54:21 +0100
Subject: [PATCH 0430/2811] Remove duplicate item filtering from navigation
 menu generator

---
 .../Navigation/GeneratesMainNavigationMenu.php        | 10 ----------
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++++-----
 .../framework/tests/Feature/NavigationMenuTest.php    |  7 +++++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index dcc88fe5878..de4e5af2503 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -36,7 +35,6 @@ public static function handle(): NavigationMenu
 
         $menu->generate();
         $menu->sortByPriority();
-        $menu->removeDuplicateItems();
 
         return new NavigationMenu($menu->items);
     }
@@ -94,14 +92,6 @@ protected function useSubdirectoriesAsDropdowns(): bool
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and label to allow duplicate labels in different groups
-            return $item->getGroup().Str::slug($item->getLabel());
-        });
-    }
-
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 971dfd11f9c..fc10f0ec95f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -457,28 +457,29 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         ]);
     }
 
-    public function testMainNavigationMenuItemsWithTheSameLabelAreFiltered()
+    public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicates()
     {
+        // Since the route key is the same, only one route is actually added
         $this->assertMenuEquals(['Foo'], [
             new MarkdownPage('foo'),
             new MarkdownPage('foo'),
         ]);
 
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['Foo', 'Foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
         ]);
     }
 
-    public function testMainNavigationMenuItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicatesRegardlessOfCase()
     {
-        $this->assertMenuEquals(['Foo'], [
+        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo'),
             new MarkdownPage('Foo'),
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['foo'], [
+        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 83c10b62dd5..e19f0039018 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -119,7 +119,7 @@ public function testPathLinkCanBeAddedInConfig()
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testDuplicatesAreRemovedWhenAddingInConfig()
+    public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
             NavItem::forLink('foo', 'foo'),
@@ -131,13 +131,14 @@ public function testDuplicatesAreRemovedWhenAddingInConfig()
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
     }
 
-    public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestination()
+    public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
             NavItem::forLink('foo', 'foo'),
@@ -149,6 +150,7 @@ public function testDuplicatesAreRemovedWhenAddingInConfigRegardlessOfDestinatio
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
+            NavItem::forLink('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -166,6 +168,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::forLink('bar', 'Foo'),
+            NavItem::fromRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());

From 03f0f94cf3ee9be5a10d67663e3bd45b754f3ce7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:04:01 +0100
Subject: [PATCH 0431/2811] Remove duplicate item filtering from documentation
 sidebar generator

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php  |  9 ---------
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 ++++++-----
 .../Feature/Services/DocumentationSidebarTest.php     |  9 ++++++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 8ca04be8895..ef28dd5457d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,7 +34,6 @@ public static function handle(): DocumentationSidebar
 
         $menu->generate();
         $menu->sortByPriority();
-        $menu->removeDuplicateItems();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -86,14 +85,6 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function removeDuplicateItems(): void
-    {
-        $this->items = $this->items->unique(function (NavItem $item): string {
-            // Filter using a combination of the group and identifier to allow duplicate labels in different groups
-            return $item->getGroup().$item->identifier;
-        });
-    }
-
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy('priority')->values();
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fc10f0ec95f..6849d3e23e0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -883,28 +883,29 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         }
     }
 
-    public function testSidebarItemsWithTheSameLabelAreFiltered()
+    public function testSidebarItemsWithTheSameLabelAreNotFiltered()
     {
+        // Since the route key is the same, only one route is actually added
         $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo'),
             new DocumentationPage('foo'),
         ]);
 
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['Foo', 'Foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
         ]);
     }
 
-    public function testSidebarItemsWithTheSameLabelAreFilteredCaseInsensitive()
+    public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegardlessOfCase()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo'),
             new DocumentationPage('Foo'),
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['foo'], [
+        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index e27a832ab3b..4d09e812e2c 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -372,16 +372,19 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         );
     }
 
-    public function testDuplicateLabelsWithinTheSameGroupIsRemoved()
+    public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
     {
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(1, $sidebar->getItems());
+        $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/bar'), priority: 999)]),
+            collect([
+                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+            ]),
             $sidebar->getItems()
         );
     }

From bd90f9386e197798dc2577965347e9660c2faa31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:06:36 +0100
Subject: [PATCH 0432/2811] Clean up tests

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6849d3e23e0..6cb83ced334 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -459,12 +459,6 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
 
     public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDuplicates()
     {
-        // Since the route key is the same, only one route is actually added
-        $this->assertMenuEquals(['Foo'], [
-            new MarkdownPage('foo'),
-            new MarkdownPage('foo'),
-        ]);
-
         $this->assertMenuEquals(['Foo', 'Foo'], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
@@ -885,12 +879,6 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
 
     public function testSidebarItemsWithTheSameLabelAreNotFiltered()
     {
-        // Since the route key is the same, only one route is actually added
-        $this->assertSidebarEquals(['Foo'], [
-            new DocumentationPage('foo'),
-            new DocumentationPage('foo'),
-        ]);
-
         $this->assertSidebarEquals(['Foo', 'Foo'], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),

From a3cd45330e3e5175e8f4c577301917a71dec1747 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:06:40 +0100
Subject: [PATCH 0433/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3ff8919c416..6e4e58d51d3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -18,6 +18,7 @@ This serves two purposes:
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
 - Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
 

From b018e7d73e300b6b39c003717fd2f1364d1007f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:17:04 +0100
Subject: [PATCH 0434/2811] Fix boolean logic

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ef28dd5457d..178dfe4b5f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -49,7 +49,7 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups && $group === null) {
+                if ($groups && $group !== null) {
                     // Todo: Add item
                 }
 

From 26b263237ffb95a505833e679ef392329723c99e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:21:25 +0100
Subject: [PATCH 0435/2811] Remove readonly modifiers from NavItem class
 properties

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a885d3eb9ad..c2b35be9acc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -24,16 +24,16 @@
  */
 class NavItem implements Stringable
 {
-    public readonly Route $destination;
-    public readonly string $label;
-    public readonly int $priority;
-    public readonly ?string $group;
+    public Route $destination;
+    public string $label;
+    public int $priority;
+    public ?string $group;
 
     /** The "slugified" version of the label. */
-    public readonly string $identifier;
+    public string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    public readonly array $children;
+    public array $children;
 
     /**
      * Create a new navigation menu item.

From e2a8f366d93326e2039e073179f4eb6cf4396a0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:27:05 +0100
Subject: [PATCH 0436/2811] Breaking: Make `NavItem::$destination` property
 protected

---
 .../components/docs/sidebar-item.blade.php    |  4 +--
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 30 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index a6da983c180..98e259d0950 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -5,7 +5,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
     ]) role="listitem">
     @if($item->isCurrent())
-        <a href="{{ $item->destination }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getDestination() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -17,7 +17,7 @@
             {!! ($page->getTableOfContents()) !!}
         @endif
     @else
-        <a href="{{ $item->destination }}" @class([$grouped
+        <a href="{{ $item->getDestination() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c2b35be9acc..7b996af28c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -24,7 +24,7 @@
  */
 class NavItem implements Stringable
 {
-    public Route $destination;
+    protected Route $destination;
     public string $label;
     public int $priority;
     public ?string $group;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 71f6697fc7a..3832cec8874 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -44,36 +44,36 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
     }
 
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->destination);
+        $this->assertSame($route, (new NavItem($route, 'Home'))->getDestination());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->destination);
+        $this->assertSame($route, (new NavItem('index', 'Home'))->getDestination());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->destination);
-        $this->assertSame('https://example.com', (string) $item->destination);
+        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getDestination());
+        $this->assertSame('https://example.com', (string) $item->getDestination());
     }
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
         $item = new NavItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->destination);
-        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
-        $this->assertSame('foo', (string) $item->destination);
+        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
+        $this->assertSame('foo', (string) $item->getDestination());
     }
 
     public function testCanConstructWithChildren()
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->label);
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->priority);
 
         $this->assertCount(2, $item->children);
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->label);
-        $this->assertSame('', $item->destination->getLink());
+        $this->assertSame('', $item->getDestination()->getLink());
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
@@ -171,7 +171,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::fromRoute($route);
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
     }
 
     public function testToString()
@@ -185,7 +185,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->destination);
+        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
         $this->assertSame('bar', $item->label);
         $this->assertSame(500, $item->priority);
     }
@@ -200,7 +200,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->label);
         $this->assertSame(999, $item->priority);
     }
@@ -210,7 +210,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->destination);
+        $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->label);
         $this->assertSame(0, $item->priority);
     }

From 5fa2bb206844314bfa97431e37815acb7cf3e6ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 14:32:52 +0100
Subject: [PATCH 0437/2811] Breaking: Make `NavItem::$label` property protected

---
 .../views/components/docs/sidebar-item.blade.php |  4 ++--
 .../navigation/navigation-link.blade.php         |  2 +-
 .../Framework/Features/Navigation/NavItem.php    |  2 +-
 .../tests/Feature/NavigationMenuTest.php         |  6 +++---
 packages/framework/tests/Unit/NavItemTest.php    | 16 ++++++++--------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 98e259d0950..012947357c0 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -9,7 +9,7 @@
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
-            {{ $item->label }}
+            {{ $item->getLabel() }}
         </a>
 
         @if(config('docs.table_of_contents.enabled', true))
@@ -21,7 +21,7 @@
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
-            {{ $item->label }}
+            {{ $item->getLabel() }}
         </a>
     @endif
 </li>
\ No newline at end of file
diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index cfad8bdb1e2..dbb5407245a 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
 <a href="{{ $item }}" {!! $item->isCurrent() ? 'aria-current="page"' : '' !!} @class([
     'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isCurrent()
-])>{{ $item->label }}</a>
\ No newline at end of file
+])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7b996af28c3..1bd1fe61505 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -25,7 +25,7 @@
 class NavItem implements Stringable
 {
     protected Route $destination;
-    public string $label;
+    protected string $label;
     public int $priority;
     public ?string $group;
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index e19f0039018..31bb0ad3f19 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -46,7 +46,7 @@ public function testItemsAreSortedByPriority()
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.priority' => 2])));
         Routes::addRoute(new Route(new MarkdownPage('baz', ['navigation.priority' => 3])));
 
-        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Foo', 'Bar', 'Baz'], $this->createNavigationMenu()->getItems()->map(fn ($item) => $item->getLabel())->toArray());
     }
 
     public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
@@ -54,7 +54,7 @@ public function testItemsWithHiddenPropertySetToTrueAreNotAdded()
         Routes::addRoute(new Route(new MarkdownPage('foo', ['navigation.hidden' => true])));
         Routes::addRoute(new Route(new MarkdownPage('bar', ['navigation.hidden' => false])));
 
-        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->pluck('label')->toArray());
+        $this->assertSame(['Home', 'Bar'], $this->createNavigationMenu()->getItems()->map(fn ($item) => $item->getLabel())->toArray());
     }
 
     public function testCreatedCollectionIsSortedByNavigationMenuPriority()
@@ -266,7 +266,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
-        $this->assertSame('Foo', $navigation->getItems()->last()->label);
+        $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
     protected function createNavigationMenu(): NavigationMenu
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 3832cec8874..dd28a2d6e24 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -85,15 +85,15 @@ public function testCanConstructWithChildren()
         ];
         $item = new NavItem($route, 'Test', 500, null, $children);
 
-        $this->assertSame('Test', $item->label);
+        $this->assertSame('Test', $item->getLabel());
         $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->priority);
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
 
-        $this->assertSame('Foo', $item->children[0]->label);
-        $this->assertSame('Bar', $item->children[1]->label);
+        $this->assertSame('Foo', $item->children[0]->getLabel());
+        $this->assertSame('Bar', $item->children[1]->getLabel());
 
         $this->assertSame('foo.html', $item->children[0]->getLink());
         $this->assertSame('bar.html', $item->children[1]->getLink());
@@ -110,7 +110,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         ];
         $item = new NavItem('', 'Test', 500, null, $children);
 
-        $this->assertSame('Test', $item->label);
+        $this->assertSame('Test', $item->getLabel());
         $this->assertSame('', $item->getDestination()->getLink());
 
         $this->assertCount(2, $item->children);
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('bar', $item->label);
+        $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->priority);
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->priority);
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->priority);
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->label);
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->priority);
     }

From d51186d4f902bca0889e3cf2d8e06852df801baf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:20:13 +0100
Subject: [PATCH 0438/2811] Breaking: Make `NavItem::$priority` property
 protected

---
 .../GeneratesDocumentationSidebarMenu.php     |  2 +-
 .../GeneratesMainNavigationMenu.php           |  2 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../Services/DocumentationSidebarTest.php     |  4 ++--
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++----------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 178dfe4b5f9..43ca0b929db 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,6 +87,6 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy('priority')->values();
+        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index de4e5af2503..b3dda7b9f73 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -94,6 +94,6 @@ protected function useSubdirectoriesAsDropdowns(): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy('priority')->values();
+        $this->items = $this->items->sortBy(fn (NavItem $item): int => $item->getPriority())->values();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 1bd1fe61505..bc0c7694fd7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,7 +26,7 @@ class NavItem implements Stringable
 {
     protected Route $destination;
     protected string $label;
-    public int $priority;
+    protected int $priority;
     public ?string $group;
 
     /** The "slugified" version of the label. */
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index ca3021f1336..0c1e610a0e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -36,7 +36,7 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
-        return $this->items->sortBy('priority')->values();
+        return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 4d09e812e2c..ed2df0ba297 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -114,7 +114,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -123,7 +123,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->priority);
+        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index dd28a2d6e24..b908101810d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -87,7 +87,7 @@ public function testCanConstructWithChildren()
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->children);
         $this->assertSame($children, $item->children);
@@ -98,8 +98,8 @@ public function testCanConstructWithChildren()
         $this->assertSame('foo.html', $item->children[0]->getLink());
         $this->assertSame('bar.html', $item->children[1]->getLink());
 
-        $this->assertSame(500, $item->children[0]->priority);
-        $this->assertSame(500, $item->children[1]->priority);
+        $this->assertSame(500, $item->children[0]->getPriority());
+        $this->assertSame(500, $item->children[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -187,12 +187,12 @@ public function testForLink()
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
         $this->assertSame('bar', $item->getLabel());
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testForLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->priority);
+        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
     public function testForRoute()
@@ -202,7 +202,7 @@ public function testForRoute()
 
         $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testForIndexRoute()
@@ -212,7 +212,7 @@ public function testForIndexRoute()
 
         $this->assertSame($route, $item->getDestination());
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame(0, $item->priority);
+        $this->assertSame(0, $item->getPriority());
     }
 
     public function testForRouteWithRouteKey()
@@ -231,7 +231,7 @@ public function testForRouteWithMissingRouteKey()
 
     public function testForRouteWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->priority);
+        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
     public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
@@ -267,7 +267,7 @@ public function testDropdownFacade()
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithChildren()
@@ -278,14 +278,14 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(999, $item->priority);
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
         $item = NavItem::dropdown('foo', [], 500);
 
-        $this->assertSame(500, $item->priority);
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testHasChildren()

From 597e6c6e7cf6fdc9e56588b0605be354fc0db603 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:40:00 +0100
Subject: [PATCH 0439/2811] Breaking: Make `NavItem::$group` property protected

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bc0c7694fd7..3f096d557ed 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -27,7 +27,7 @@ class NavItem implements Stringable
     protected Route $destination;
     protected string $label;
     protected int $priority;
-    public ?string $group;
+    protected ?string $group;
 
     /** The "slugified" version of the label. */
     public string $identifier;

From 55da9624572e1ab2ec1e97425b40e567067cecf5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:44:01 +0100
Subject: [PATCH 0440/2811] Breaking: Make `NavItem::$children` property
 protected

---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3f096d557ed..ce42587f8f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,7 +33,7 @@ class NavItem implements Stringable
     public string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    public array $children;
+    protected array $children;
 
     /**
      * Create a new navigation menu item.
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b908101810d..82a4023243d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -89,17 +89,17 @@ public function testCanConstructWithChildren()
         $this->assertSame($route, $item->getDestination());
         $this->assertSame(500, $item->getPriority());
 
-        $this->assertCount(2, $item->children);
-        $this->assertSame($children, $item->children);
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
 
-        $this->assertSame('Foo', $item->children[0]->getLabel());
-        $this->assertSame('Bar', $item->children[1]->getLabel());
+        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
+        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
 
-        $this->assertSame('foo.html', $item->children[0]->getLink());
-        $this->assertSame('bar.html', $item->children[1]->getLink());
+        $this->assertSame('foo.html', $item->getChildren()[0]->getLink());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getLink());
 
-        $this->assertSame(500, $item->children[0]->getPriority());
-        $this->assertSame(500, $item->children[1]->getPriority());
+        $this->assertSame(500, $item->getChildren()[0]->getPriority());
+        $this->assertSame(500, $item->getChildren()[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -113,8 +113,8 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame('Test', $item->getLabel());
         $this->assertSame('', $item->getDestination()->getLink());
 
-        $this->assertCount(2, $item->children);
-        $this->assertSame($children, $item->children);
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
     }
 
     public function testGetDestination()

From 482ac8a32f48accef23f334ab8b6e683be11baf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 15:46:15 +0100
Subject: [PATCH 0441/2811] Add accessor for the identifier and protect the
 property

Not breaking as it is a new property
---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 +++++++++-
 packages/framework/tests/Unit/NavItemTest.php          | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce42587f8f3..0b290e3ca32 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     protected ?string $group;
 
     /** The "slugified" version of the label. */
-    public string $identifier;
+    protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $children;
@@ -149,6 +149,14 @@ public function getGroup(): ?string
         return $this->group;
     }
 
+    /**
+     * Get the identifier of the navigation item.
+     */
+    public function getIdentifier(): string
+    {
+        return $this->identifier;
+    }
+
     /**
      * Get the children of the navigation item.
      *
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 82a4023243d..49670868bb9 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -354,7 +354,7 @@ public function testIdentifier()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame('test', $item->identifier);
+        $this->assertSame('test', $item->getIdentifier());
     }
 
     public function testIdentifierWithCustomLabel()
@@ -362,13 +362,13 @@ public function testIdentifierWithCustomLabel()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Foo Bar', 500);
 
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 
     public function testIdentifierFromRouteKey()
     {
         $item = NavItem::fromRoute(Routes::get('index'));
-        $this->assertSame('home', $item->identifier);
+        $this->assertSame('home', $item->getIdentifier());
     }
 
     public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
@@ -376,12 +376,12 @@ public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Foo Bar', 500);
 
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 
     public function testIdentifierUsesLabelForExternalRoute()
     {
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
-        $this->assertSame('foo-bar', $item->identifier);
+        $this->assertSame('foo-bar', $item->getIdentifier());
     }
 }

From 7b5cabc08ed53bd5a5da846f692e869f746477e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:07:16 +0100
Subject: [PATCH 0442/2811] Remove unnecessary priority sorting from navigation
 generator

We don't need to sort this as the accessor sorts it on retrieval
---
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index b3dda7b9f73..9ed815aa01d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -34,7 +34,6 @@ public static function handle(): NavigationMenu
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new NavigationMenu($menu->items);
     }
@@ -91,9 +90,4 @@ protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy(fn (NavItem $item): int => $item->getPriority())->values();
-    }
 }

From fe3a4ceb8e7f751145f7ac7fd4aa8c4a6b05836d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:08:55 +0100
Subject: [PATCH 0443/2811] Use the item accessor to get groups

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d87bcbd2313..ad92eaa31c9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -39,7 +39,7 @@ public function hasGroups(): bool
      */
     public function getGroups(): array
     {
-        return $this->items->map(function (NavItem $item): ?string {
+        return $this->getItems()->map(function (NavItem $item): ?string {
             return $item->getGroup();
         })->unique()->toArray();
     }
@@ -47,7 +47,7 @@ public function getGroups(): array
     /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItemsInGroup(?string $group): Collection
     {
-        return $this->items->filter(function (NavItem $item) use ($group): bool {
+        return $this->getItems()->filter(function (NavItem $item) use ($group): bool {
             // Todo: Use identifier instead of slug
             return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
         })->sortBy('navigation.priority')->values();

From 4c3fd2c03826b3681b58bc7eaebf2176afd08f65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:09:07 +0100
Subject: [PATCH 0444/2811] Remove unnecessary priority sorting from sidebar
 generator

We don't need to sort this as the accessor sorts it on retrieval
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 43ca0b929db..88602279c7e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -33,7 +33,6 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -84,9 +83,4 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
-
-    protected function sortByPriority(): void
-    {
-        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
-    }
 }

From 9b0cb0f0d370038f58fb7f9b62bd97de1f4e5e32 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 16:13:08 +0100
Subject: [PATCH 0445/2811] Add helper to add child items to navigation items

---
 .../src/Framework/Features/Navigation/NavItem.php    |  8 ++++++++
 packages/framework/tests/Unit/NavItemTest.php        | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0b290e3ca32..2b16f03cfff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -185,6 +185,14 @@ public function isCurrent(): bool
         return Hyde::currentRoute()->getLink() === (string) $this->destination;
     }
 
+    /**
+     * Add a navigation item to the children of the navigation item.
+     */
+    public function addChild(NavItem $item): void
+    {
+        $this->children[] = $item;
+    }
+
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 49670868bb9..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -384,4 +384,16 @@ public function testIdentifierUsesLabelForExternalRoute()
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
         $this->assertSame('foo-bar', $item->getIdentifier());
     }
+
+    public function testCanAddItemToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChild($child);
+
+        $this->assertSame([$child], $parent->getChildren());
+    }
 }

From 744b2722a034a725baedc66936e31aed1d6b90f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 17:49:19 +0100
Subject: [PATCH 0446/2811] Update testing helper to dump state

---
 .../AutomaticNavigationConfigurationsTest.php      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6cb83ced334..7e095aa4ef3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1064,7 +1064,19 @@ public function assertEquals(array $expected, bool $strict = false): static
             foreach (TestNavItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {
-                        $this->test->assertSame($item[$property], $this->getState($index)->$property, "Failed to match the expected value for '$property'");
+                        $a = $item[$property];
+                        $b = $this->getState($index)->$property;
+
+                        if ($a !== $b) {
+                            dump([
+                                'error' => "Failed to match the expected value for '$property'",
+                                'expected' => $a,
+                                'actual' => $b,
+                                'menu' => $this->state(),
+                            ]);
+                        }
+
+                        $this->test->assertSame($a, $b, "Failed to match the expected value for '$property'");
                     } elseif ($strict) {
                         $this->test->fail("Missing array key '$property' in the expected state");
                     }

From 9f675e1c9680f19a69073faf40fa1766cee28041 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 18:01:17 +0100
Subject: [PATCH 0447/2811] Begin making sidebar group assembly deterministic

Changes how sidebar groups are assembled so that they conform to the new dropdown system
---
 .../Navigation/DocumentationSidebar.php       | 30 ++++++---
 .../GeneratesDocumentationSidebarMenu.php     | 21 +++++-
 .../AutomaticNavigationConfigurationsTest.php | 67 ++++++++++---------
 .../Services/DocumentationSidebarTest.php     | 19 ++++--
 4 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ad92eaa31c9..a35bbd9d94b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,9 +27,14 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        // Todo check if any items have children
+        /** @deprecated */
+        $legacyCompat = (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
 
-        return (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
+        $newLogic = $this->getItems()->filter(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })->isNotEmpty();
+
+        return $legacyCompat || $newLogic;
     }
 
     /**
@@ -39,18 +44,25 @@ public function hasGroups(): bool
      */
     public function getGroups(): array
     {
-        return $this->getItems()->map(function (NavItem $item): ?string {
-            return $item->getGroup();
-        })->unique()->toArray();
+        return $this->getItems()->filter(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })->sortBy(function (NavItem $item): int {
+            // Sort by lowest priority found in each group
+            return collect($item->getChildren())->min(
+                fn (NavItem $child): int => $child->getPriority()
+            );
+        })->map(function (NavItem $item): string {
+            return $item->getIdentifier();
+        })->values()->toArray();
     }
 
     /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     public function getItemsInGroup(?string $group): Collection
     {
-        return $this->getItems()->filter(function (NavItem $item) use ($group): bool {
-            // Todo: Use identifier instead of slug
-            return ($item->getGroup() === $group) || ($item->getGroup() === Str::slug($group));
-        })->sortBy('navigation.priority')->values();
+        // Todo might not need collections here
+        return collect($this->getItems()->first(function (NavItem $item) use ($group): bool {
+            return $item->getIdentifier() === Str::slug($group);
+        })?->getChildren() ?? []);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 88602279c7e..c0856952ff2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -48,8 +48,25 @@ protected function generate(): void
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups && $group !== null) {
-                    // Todo: Add item
+                if ($groups) {
+                    if (! $group) {
+                        $group = 'Other';
+                    }
+
+                    $groupItem = $this->items->get($group);
+
+                    if ($groupItem === null) {
+                        // Todo get group label
+                        $groupItem = NavItem::dropdown($group, []);
+                    }
+
+                    $groupItem->addChild($item);
+
+                    if (! $this->items->has($group)) {
+                        $this->items->put($group, $groupItem);
+                    }
+
+                    return;
                 }
 
                 $this->items->put($route->getRouteKey(), $item);
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7e095aa4ef3..2a38498ec23 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -616,12 +616,9 @@ public function testSidebarWithFrontMatterVisible()
 
     public function testSidebarWithFrontMatterGroup()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.group' => 'Group 1']),
@@ -631,12 +628,9 @@ public function testSidebarWithFrontMatterGroup()
 
     public function testSidebarWithFrontMatterCategory()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.category' => 'Group 1']),
@@ -706,7 +700,10 @@ public function testSidebarWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertSidebarEquals(array_fill(0, 3, ['group' => 'group-1']), [
+        $this->assertSidebarEquals([[
+            'label' => 'group-1', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new DocumentationPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new DocumentationPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -847,11 +844,10 @@ public function testSidebarWithConfigHidden()
 
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
     {
-        $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'about'],
-            ['label' => 'Bar', 'group' => 'about'],
-            ['label' => 'Baz', 'group' => 'about'],
-        ], [
+        $this->assertSidebarEquals([[
+            'label' => 'about', // Todo: Should use proper group name
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new DocumentationPage('about/foo'),
             new DocumentationPage('about/bar'),
             new DocumentationPage('about/baz'),
@@ -865,11 +861,10 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
         foreach ($options as $option) {
             config(['docs.sidebar.subdirectories' => $option]);
 
-            $this->assertSidebarEquals([
-                ['label' => 'Foo', 'group' => 'about'],
-                ['label' => 'Bar', 'group' => 'about'],
-                ['label' => 'Baz', 'group' => 'about'],
-            ], [
+            $this->assertSidebarEquals([[
+                'label' => 'about', // Todo: Should use proper group name
+                'children' => ['Foo', 'Bar', 'Baz'],
+            ]], [
                 new DocumentationPage('about/foo'),
                 new DocumentationPage('about/bar'),
                 new DocumentationPage('about/baz'),
@@ -903,8 +898,9 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
     public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
@@ -913,7 +909,11 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
 
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
+        ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
         ]);
@@ -921,7 +921,11 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFilter
 
     public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
-        $this->assertSidebarEquals(['Foo'], [
+        $this->assertSidebarEquals([
+            // Todo: Should use proper group name
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
+        ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
         ]);
@@ -932,8 +936,9 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            // Todo: Should use proper group name
+            ['label' => 'group-1', 'children' => ['Foo']],
+            ['label' => 'group-2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -946,8 +951,8 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
 
         $this->assertSidebarEquals([
             // Todo: Should use proper group name
-            ['label' => 'Foo', 'group' => 'one'],
-            ['label' => 'Foo', 'group' => 'two'],
+            ['label' => 'one', 'children' => ['Foo']],
+            ['label' => 'two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index ed2df0ba297..76ca6abe6f9 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -152,8 +152,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-
-        $this->assertEquals('bar', DocumentationSidebar::create()->getItems()->first()->getGroup());
+        $this->assertEquals('bar', collect(DocumentationSidebar::create()->getItems()->first()->getChildren())->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
@@ -365,8 +364,12 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                NavItem::dropdown('bar', [
+                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                ]),
+                NavItem::dropdown('foo', [
+                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                ]),
             ]),
             $sidebar->getItems()
         );
@@ -378,12 +381,14 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
         $sidebar = DocumentationSidebar::create();
-        $this->assertCount(2, $sidebar->getItems());
+        $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                NavItem::dropdown('foo', [
+                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                ]),
             ]),
             $sidebar->getItems()
         );

From 78ff763bacb3ab2f1aa8cfc15b09325e373660cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 18:54:42 +0100
Subject: [PATCH 0448/2811] Remove temporary legacy compat

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a35bbd9d94b..7427c1df10b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -27,14 +27,9 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        /** @deprecated */
-        $legacyCompat = (! empty($this->getGroups())) && ($this->getGroups() !== [null]);
-
-        $newLogic = $this->getItems()->filter(function (NavItem $item): bool {
+        return $this->getItems()->filter(function (NavItem $item): bool {
             return $item->hasChildren();
         })->isNotEmpty();
-
-        return $legacyCompat || $newLogic;
     }
 
     /**

From 4646103a74a3a9482c6c9ce7582a55d5aa6761f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:00:54 +0100
Subject: [PATCH 0449/2811] Revert "Remove unnecessary priority sorting from
 sidebar generator"

This reverts commit 4c3fd2c03826b3681b58bc7eaebf2176afd08f65.
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c0856952ff2..c3579ed29dd 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -33,6 +33,7 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
+        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -100,4 +101,9 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
     }
+
+    protected function sortByPriority(): void
+    {
+        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+    }
 }

From 5b099efd90446f784b037a70a18874e9e5df15d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:10:52 +0100
Subject: [PATCH 0450/2811] Handle complex sidebar sorting in generator action

---
 .../Features/Navigation/DocumentationSidebar.php    |  5 -----
 .../GeneratesDocumentationSidebarMenu.php           | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 7427c1df10b..bce1b607ddf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -41,11 +41,6 @@ public function getGroups(): array
     {
         return $this->getItems()->filter(function (NavItem $item): bool {
             return $item->hasChildren();
-        })->sortBy(function (NavItem $item): int {
-            // Sort by lowest priority found in each group
-            return collect($item->getChildren())->min(
-                fn (NavItem $child): int => $child->getPriority()
-            );
         })->map(function (NavItem $item): string {
             return $item->getIdentifier();
         })->values()->toArray();
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c3579ed29dd..7b1265c121b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,6 +11,8 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function collect;
+
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -104,6 +106,15 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
-        $this->items = $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+        $this->items = $this->items->sortBy(function (NavItem $item): int {
+            if ($item->getChildren()) {
+                // Sort by lowest priority found in each group
+                return collect($item->getChildren())->min(
+                    fn (NavItem $child): int => $child->getPriority()
+                );
+            } else {
+                return $item->getPriority();
+            }
+        })->values();
     }
 }

From e687790c53db49dcd5c85bba2df15b34191076a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:14:21 +0100
Subject: [PATCH 0451/2811] Deprecate helper method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bce1b607ddf..32cafd492d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -46,7 +46,11 @@ public function getGroups(): array
         })->values()->toArray();
     }
 
-    /** @return Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * @deprecated Use children instead
+     *
+     * @return Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     public function getItemsInGroup(?string $group): Collection
     {
         // Todo might not need collections here

From 7269ecb51f7ee0483b5ff7d67f328752e6870ac8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:15:34 +0100
Subject: [PATCH 0452/2811] Extract helper method

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7b1265c121b..3edfdaa41b9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -108,13 +108,15 @@ protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
             if ($item->getChildren()) {
-                // Sort by lowest priority found in each group
-                return collect($item->getChildren())->min(
-                    fn (NavItem $child): int => $child->getPriority()
-                );
+                return $this->getLowestPriorityInGroup($item);
             } else {
                 return $item->getPriority();
             }
         })->values();
     }
+
+    protected function getLowestPriorityInGroup(NavItem $item): int
+    {
+        return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
+    }
 }

From ea67d1d762d402d09958b3e8932a4cb732a58feb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:18:06 +0100
Subject: [PATCH 0453/2811] Use clearer helper method

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 3edfdaa41b9..4305672648a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -107,7 +107,7 @@ protected function canAddRoute(Route $route): bool
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            if ($item->getChildren()) {
+            if ($item->hasChildren()) {
                 return $this->getLowestPriorityInGroup($item);
             } else {
                 return $item->getPriority();

From 792e1d7a1a50d82a5e9582cc7867c12aa5c04ee0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 19:18:36 +0100
Subject: [PATCH 0454/2811] Simplify conditional returns with simple ternary
 return expression

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 4305672648a..bf445ddce9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -107,11 +107,9 @@ protected function canAddRoute(Route $route): bool
     protected function sortByPriority(): void
     {
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            if ($item->hasChildren()) {
-                return $this->getLowestPriorityInGroup($item);
-            } else {
-                return $item->getPriority();
-            }
+            return $item->hasChildren()
+                ? $this->getLowestPriorityInGroup($item)
+                : $item->getPriority();
         })->values();
     }
 

From 397de0086d51b19230f12854f967ed8d1fcba790 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:18:36 +0100
Subject: [PATCH 0455/2811] Get items directly as all items are evaluated to be
 groups at this point

If there is a single group, the generator puts all null groups into "Other".
---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index cebd57f4833..b05aad8f57b 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @php ($collapsible = config('docs.sidebar.collapsible', true))
-        @foreach ($sidebar->getGroups() as $group)
+        @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
                     <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $sidebar->makeGroupTitle($group) }}</h4>

From 2235f56164e5b5bba66882c5648f1a4dc12f64f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:27:33 +0100
Subject: [PATCH 0456/2811] Update sidebar view to use new navigation item
 format

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b05aad8f57b..a0acc5d1b3a 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -11,13 +11,13 @@
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $sidebar->makeGroupTitle($group) }}</h4>
+                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
                 </header>
                 <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($collapsible) x-show="groupOpen" @endif>
-                    @foreach ($sidebar->getItemsInGroup($group) as $item)
+                    @foreach ($group->getChildren() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach
                 </ul>

From 57c425450ca426ec3b6b79a81160e37caed441ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:44:17 +0100
Subject: [PATCH 0457/2811] Inline granular collection logic

We only need part of the getGroups method, so this inlines those semantics
---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 32cafd492d2..477105eb864 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -94,7 +94,10 @@ private function isPageIndexPage(): bool
     private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
-        $groupIsTheFirstOneInSidebar = $group === collect($this->getGroups())->first();
+
+        $groupIsTheFirstOneInSidebar = $group === $this->getItems()->firstWhere(function (NavItem $item): bool {
+            return $item->hasChildren();
+        })?->getIdentifier();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From c554ad2268aaad964d0d2bbff2eebe4b16964ccd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:49:34 +0100
Subject: [PATCH 0458/2811] Use the identifier for comparison

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index a0acc5d1b3a..b2c6832f828 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -9,7 +9,7 @@
     <ul id="sidebar-items" role="list">
         @php ($collapsible = config('docs.sidebar.collapsible', true))
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
                     <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
                     @if($collapsible)

From ba11d33b31b47dd4b32ca71366a8aa7ffbb491cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 20:59:10 +0100
Subject: [PATCH 0459/2811] Test sidebar groups are sorted by lowest found
 priority in each group

Moves test for method being deleted
---
 .../AutomaticNavigationConfigurationsTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2a38498ec23..f926616f632 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -959,6 +959,34 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         ]);
     }
 
+    public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
+    {
+        $this->assertSidebarEquals([
+            'a', 'b', 'c',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 1]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 3]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'c', 'b', 'a',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 3]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 1]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'c', 'a', 'b',
+        ], [
+            new DocumentationPage('a', ['navigation.group' => 'a', 'navigation.priority' => 100]),
+            new DocumentationPage('b', ['navigation.group' => 'b', 'navigation.priority' => 200]),
+            new DocumentationPage('c', ['navigation.group' => 'c', 'navigation.priority' => 300]),
+            new DocumentationPage('d', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 035dcd18ed9ee863bcf59eb6c7a3a3de4394b294 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:01:29 +0100
Subject: [PATCH 0460/2811] Breaking: Remove `DocumentationSidebar::getGroups`
 method

---
 .../Navigation/DocumentationSidebar.php       | 14 ---------
 .../Services/DocumentationSidebarTest.php     | 30 -------------------
 2 files changed, 44 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 477105eb864..59b8adf58a4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,20 +32,6 @@ public function hasGroups(): bool
         })->isNotEmpty();
     }
 
-    /**
-     * @deprecated Use children instead
-     *
-     * @return array<string>
-     */
-    public function getGroups(): array
-    {
-        return $this->getItems()->filter(function (NavItem $item): bool {
-            return $item->hasChildren();
-        })->map(function (NavItem $item): string {
-            return $item->getIdentifier();
-        })->values()->toArray();
-    }
-
     /**
      * @deprecated Use children instead
      *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 76ca6abe6f9..4339193631a 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -184,36 +184,6 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->assertTrue(DocumentationSidebar::create()->hasGroups());
     }
 
-    public function testGetGroupsReturnsEmptyArrayWhenThereAreNoGroups()
-    {
-        $this->assertEquals([], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGetGroupsReturnsArrayOfGroupsWhenThereAreGroups()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-
-        $this->assertEquals(['bar'], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGetGroupsReturnsArrayWithNoDuplicates()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->makePage('bar', ['navigation.group' => 'bar']);
-        $this->makePage('baz', ['navigation.group' => 'baz']);
-
-        $this->assertEquals(['bar', 'baz'], DocumentationSidebar::create()->getGroups());
-    }
-
-    public function testGroupsAreSortedByLowestFoundPriorityInEachGroup()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar', 'navigation.priority' => 100]);
-        $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.priority' => 200]);
-        $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 10]);
-
-        $this->assertEquals(['baz', 'bar'], DocumentationSidebar::create()->getGroups());
-    }
-
     public function testGetItemsInGroupReturnsEmptyCollectionWhenThereAreNoItems()
     {
         $this->assertEquals(collect(), DocumentationSidebar::create()->getItemsInGroup('foo'));

From e623d7b05d0cb60f82c2a3dd5c7db4b444ee747c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:06:50 +0100
Subject: [PATCH 0461/2811] Add additional sidebar grouping test

Test all sidebar items are placed in groups when at least one item is grouped
---
 .../Feature/AutomaticNavigationConfigurationsTest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f926616f632..cd9dc14ecca 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -987,6 +987,17 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
     }
 
+    public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'foo', 'children' => ['Grouped']],
+            ['label' => 'Other', 'children' => ['Ungrouped']],
+        ], [
+            new DocumentationPage('grouped', ['navigation.group' => 'foo']),
+            new DocumentationPage('ungrouped'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From d4849778504d519e984d516511be0fd2e2dcd9e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:25:32 +0100
Subject: [PATCH 0462/2811] Test documentation index page is not added to
 sidebar

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cd9dc14ecca..de132b726ae 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -543,6 +543,11 @@ public function testOnlyDocumentationPagesAreAddedToSidebar()
         ]);
     }
 
+    public function testDocumentationIndexPageIsNotAddedToSidebar()
+    {
+        $this->assertSidebarEquals([], [new DocumentationPage('index')]);
+    }
+
     // Documentation sidebar front matter tests
 
     public function testSidebarWithFrontMatterPriority()

From ae2d500309b643fbb213ff5cd58aae84d1b2253f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:28:02 +0100
Subject: [PATCH 0463/2811] Test sidebar item grouping is case insensitive

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index de132b726ae..25c7eecf10c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -964,6 +964,15 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         ]);
     }
 
+    public function testSidebarItemGroupingIsCaseInsensitive()
+    {
+        $this->assertSidebarEquals(['foo'], [
+            new DocumentationPage('foo', ['navigation.group' => 'foo']),
+            new DocumentationPage('bar', ['navigation.group' => 'Foo']),
+            new DocumentationPage('baz', ['navigation.group' => 'FOO']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From c302496d24c0d1e5e762a05bbfdad55122a3891a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:30:23 +0100
Subject: [PATCH 0464/2811] Breaking: Remove
 `DocumentationSidebar::getItemsInGroup` method

---
 .../Navigation/DocumentationSidebar.php       | 15 ------
 .../Services/DocumentationSidebarTest.php     | 54 -------------------
 2 files changed, 69 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 59b8adf58a4..c7139248ef8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -11,8 +11,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-use function collect;
-
 /** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends NavigationMenu
 {
@@ -32,19 +30,6 @@ public function hasGroups(): bool
         })->isNotEmpty();
     }
 
-    /**
-     * @deprecated Use children instead
-     *
-     * @return Collection<\Hyde\Framework\Features\Navigation\NavItem>
-     */
-    public function getItemsInGroup(?string $group): Collection
-    {
-        // Todo might not need collections here
-        return collect($this->getItems()->first(function (NavItem $item) use ($group): bool {
-            return $item->getIdentifier() === Str::slug($group);
-        })?->getChildren() ?? []);
-    }
-
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 4339193631a..06ec3c00223 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -184,60 +184,6 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->assertTrue(DocumentationSidebar::create()->hasGroups());
     }
 
-    public function testGetItemsInGroupReturnsEmptyCollectionWhenThereAreNoItems()
-    {
-        $this->assertEquals(collect(), DocumentationSidebar::create()->getItemsInGroup('foo'));
-    }
-
-    public function testGetItemsInGroupReturnsCollectionOfItemsInGroup()
-    {
-        $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->makePage('bar', ['navigation.group' => 'bar']);
-        $this->makePage('baz', ['navigation.group' => 'baz']);
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('bar')
-        );
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/baz'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('baz')
-        );
-    }
-
-    public function testGetItemsInGroupNormalizesGroupNameToSlugFormat()
-    {
-        $this->makePage('a', ['navigation.group' => 'foo bar']);
-        $this->makePage('b', ['navigation.group' => 'Foo Bar']);
-        $this->makePage('c', ['navigation.group' => 'foo-bar']);
-
-        $this->assertEquals(
-            collect([
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
-            ]),
-            DocumentationSidebar::create()->getItemsInGroup('Foo bar')
-        );
-    }
-
-    public function testGetItemsInGroupDoesNotIncludeItemsWithHiddenFrontMatter()
-    {
-        $this->makePage('a', ['navigation.hidden' => true, 'navigation.group' => 'foo']);
-        $this->makePage('b', ['navigation.group' => 'foo']);
-
-        $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/b'), priority: 999)]),
-            DocumentationSidebar::create()->getItemsInGroup('foo')
-        );
-    }
-
     public function testGetItemsInGroupDoesNotIncludeDocsIndex()
     {
         Filesystem::touch('_docs/foo.md');

From 403e2bf175041a3130dea368518743eda92f2a44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:40:54 +0100
Subject: [PATCH 0465/2811] Refactor to simplify internal logic

---
 .../GeneratesDocumentationSidebarMenu.php     | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index bf445ddce9b..e45d4816eec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -44,14 +43,14 @@ protected function generate(): void
     {
         $routes = Routes::getRoutes(DocumentationPage::class);
 
-        $groups = $this->findSidebarGroups($routes);
+        $useGroups = $this->usesSidebarGroups($routes);
 
-        $routes->each(function (Route $route) use ($groups): void {
+        $routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
 
-                if ($groups) {
+                if ($useGroups) {
                     if (! $group) {
                         $group = 'Other';
                     }
@@ -82,21 +81,14 @@ protected function generate(): void
         }
     }
 
-    /** @experimental Might not actually be needed now that groups default to null */
-    protected function findSidebarGroups(RouteCollection $routes): array
+    protected function usesSidebarGroups(RouteCollection $routes): bool
     {
         // In order to know if we should use groups in the sidebar,
-        // we need to loop through all the pages and see if they have a group set
+        // we need to loop through the pages and see if they have a group set
 
-        $groups = [];
-
-        $routes->each(function (Route $route) use (&$groups): void {
-            if ($route->getPage()->data('navigation.group')) {
-                $groups[Str::slug($route->getPage()->data('navigation.group'))] = true;
-            }
-        });
-
-        return array_keys($groups);
+        return $routes->first(function (Route $route): bool {
+            return filled($route->getPage()->data('navigation.group'));
+        }) !== null;
     }
 
     protected function canAddRoute(Route $route): bool

From 5ae82eadce173c1aa6afec3e89ac404a3e58077c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:43:21 +0100
Subject: [PATCH 0466/2811] Support category matter for comparison

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e45d4816eec..5ed8e86708b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group'));
+            return filled($route->getPage()->data('navigation.group')) || filled($route->getPage()->data('navigation.category'));
         }) !== null;
     }
 

From 27c5b2d97f2467e78ad4dddf9cac9c5cd2daa201 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:44:43 +0100
Subject: [PATCH 0467/2811] Revert "Support category matter for comparison"

This reverts commit 5ae82eadce173c1aa6afec3e89ac404a3e58077c as it is not necessary since we are actually checking the already normalized navigation data
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5ed8e86708b..e45d4816eec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group')) || filled($route->getPage()->data('navigation.category'));
+            return filled($route->getPage()->data('navigation.group'));
         }) !== null;
     }
 

From 622f63520deb0d021382f4eb056adc366804b306 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 21:45:44 +0100
Subject: [PATCH 0468/2811] Use specific accessor to get same data

Makes it clearer where the data is coming from
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e45d4816eec..63f629f8024 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -87,7 +87,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         // we need to loop through the pages and see if they have a group set
 
         return $routes->first(function (Route $route): bool {
-            return filled($route->getPage()->data('navigation.group'));
+            return filled($route->getPage()->navigationMenuGroup());
         }) !== null;
     }
 

From 9d5162adeb27da27f524fc4fd2c0edf9aea69d5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:42:06 +0100
Subject: [PATCH 0469/2811] Update todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 63f629f8024..4000d84900e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -58,7 +58,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo get group label
+                        // Todo search for group label in config
                         $groupItem = NavItem::dropdown($group, []);
                     }
 

From d55fa5c309066ae901532f0a44e54061cc8f7e5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:42:32 +0100
Subject: [PATCH 0470/2811] Add to todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 4000d84900e..41a1e53658a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -58,7 +58,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo search for group label in config
+                        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
                         $groupItem = NavItem::dropdown($group, []);
                     }
 

From 05c391b7e850b3ec0f83fa8b676ebd0197a762ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:46:38 +0100
Subject: [PATCH 0471/2811] Format back the grouped navigation item titles

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../GeneratesDocumentationSidebarMenu.php     |  3 +-
 .../AutomaticNavigationConfigurationsTest.php | 45 +++++++++----------
 .../Services/DocumentationSidebarTest.php     |  6 +--
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b2c6832f828..37a416bdc89 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -11,7 +11,7 @@
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ Hyde::makeTitle($group->getLabel()) }}</h4>
+                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $group->getLabel() }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 41a1e53658a..1168c20d964 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -59,7 +60,7 @@ protected function generate(): void
 
                     if ($groupItem === null) {
                         // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
-                        $groupItem = NavItem::dropdown($group, []);
+                        $groupItem = NavItem::dropdown(Hyde::makeTitle($group), []);
                     }
 
                     $groupItem->addChild($item);
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 25c7eecf10c..c88df773866 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -622,7 +622,7 @@ public function testSidebarWithFrontMatterVisible()
     public function testSidebarWithFrontMatterGroup()
     {
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1']),
@@ -634,7 +634,7 @@ public function testSidebarWithFrontMatterGroup()
     public function testSidebarWithFrontMatterCategory()
     {
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new DocumentationPage('foo', ['navigation.category' => 'Group 1']),
@@ -706,7 +706,7 @@ public function testSidebarWithFrontMatterGroupAndCategory()
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
         $this->assertSidebarEquals([[
-            'label' => 'group-1', // Todo: Should use proper group name
+            'label' => 'Group 1',
             'children' => ['Foo', 'Bar', 'Baz'],
         ]], [
             new DocumentationPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -850,7 +850,7 @@ public function testSidebarWithConfigHidden()
     public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
     {
         $this->assertSidebarEquals([[
-            'label' => 'about', // Todo: Should use proper group name
+            'label' => 'About',
             'children' => ['Foo', 'Bar', 'Baz'],
         ]], [
             new DocumentationPage('about/foo'),
@@ -867,7 +867,7 @@ public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfigurat
             config(['docs.sidebar.subdirectories' => $option]);
 
             $this->assertSidebarEquals([[
-                'label' => 'about', // Todo: Should use proper group name
+                'label' => 'About',
                 'children' => ['Foo', 'Bar', 'Baz'],
             ]], [
                 new DocumentationPage('about/foo'),
@@ -903,9 +903,8 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
     public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),
@@ -915,9 +914,8 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -927,9 +925,8 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFilter
     public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
@@ -941,9 +938,8 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
             new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -955,9 +951,8 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new DocumentationPage('one/foo'),
             new DocumentationPage('two/foo'),
@@ -966,7 +961,7 @@ public function testSidebarAutomaticDropdownItemsWithSameLabelButDifferentGroups
 
     public function testSidebarItemGroupingIsCaseInsensitive()
     {
-        $this->assertSidebarEquals(['foo'], [
+        $this->assertSidebarEquals(['Foo'], [
             new DocumentationPage('foo', ['navigation.group' => 'foo']),
             new DocumentationPage('bar', ['navigation.group' => 'Foo']),
             new DocumentationPage('baz', ['navigation.group' => 'FOO']),
@@ -976,7 +971,7 @@ public function testSidebarItemGroupingIsCaseInsensitive()
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([
-            'a', 'b', 'c',
+            'A', 'B', 'C',
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 1]),
             new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
@@ -984,7 +979,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
 
         $this->assertSidebarEquals([
-            'c', 'b', 'a',
+            'C', 'B', 'A',
         ], [
             new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 3]),
             new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 2]),
@@ -992,7 +987,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
 
         $this->assertSidebarEquals([
-            'c', 'a', 'b',
+            'C', 'A', 'B',
         ], [
             new DocumentationPage('a', ['navigation.group' => 'a', 'navigation.priority' => 100]),
             new DocumentationPage('b', ['navigation.group' => 'b', 'navigation.priority' => 200]),
@@ -1004,7 +999,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
     {
         $this->assertSidebarEquals([
-            ['label' => 'foo', 'children' => ['Grouped']],
+            ['label' => 'Foo', 'children' => ['Grouped']],
             ['label' => 'Other', 'children' => ['Ungrouped']],
         ], [
             new DocumentationPage('grouped', ['navigation.group' => 'foo']),
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 06ec3c00223..e6bb1b17868 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -280,10 +280,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('bar', [
+                NavItem::dropdown('Bar', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::dropdown('foo', [
+                NavItem::dropdown('Foo', [
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -301,7 +301,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('foo', [
+                NavItem::dropdown('Foo', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),

From 0562e13df0f4fc8b4854202e9849ca67108308fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 19 Feb 2024 22:54:18 +0100
Subject: [PATCH 0472/2811] Refactor view to use dynamic class directives

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 37a416bdc89..615ea53dcd4 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -10,8 +10,8 @@
         @php ($collapsible = config('docs.sidebar.collapsible', true))
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
-                <header class="sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center @if($collapsible) group hover:bg-black/10 @endif" @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 class="sidebar-group-heading text-base font-semibold @if($collapsible) cursor-pointer dark:group-hover:text-white @endif">{{ $group->getLabel() }}</h4>
+                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
+                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $collapsible])>{{ $group->getLabel() }}</h4>
                     @if($collapsible)
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif

From 17441a679ca3d7e923c2c7aa3ed9237022f459dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:18:31 +0100
Subject: [PATCH 0473/2811] Print states on assertion fail

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c88df773866..9243f775ebd 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1137,7 +1137,7 @@ public function assertEquals(array $expected, bool $strict = false): static
             }
         }
 
-        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state');
+        $this->test->assertCount(count($expected), $this->state(), 'The expected state has a different count than the actual state'."\n".json_encode($this->state(), JSON_PRETTY_PRINT));
 
         return $this;
     }

From 71e44c3b9284ec9ca3c75ba5239eb56b5769e297 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:19:15 +0100
Subject: [PATCH 0474/2811] Test sidebar item grouping is normalized

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 9243f775ebd..ac84dbcc47f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -968,6 +968,16 @@ public function testSidebarItemGroupingIsCaseInsensitive()
         ]);
     }
 
+    public function testSidebarItemGroupingIsNormalized()
+    {
+        $this->assertSidebarEquals(['Hello World'], [
+            new DocumentationPage('foo', ['navigation.group' => 'hello world']),
+            new DocumentationPage('bar', ['navigation.group' => 'hello-world']),
+            new DocumentationPage('baz', ['navigation.group' => 'hello_world']),
+            new DocumentationPage('qux', ['navigation.group' => 'Hello World']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From 758cb3762acb0f0fdbf5d205ff1e42b682383627 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:26:06 +0100
Subject: [PATCH 0475/2811] Sketch out test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ac84dbcc47f..5a7205c1d10 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -978,6 +978,16 @@ public function testSidebarItemGroupingIsNormalized()
         ]);
     }
 
+    public function testSidebarLabelsRetainBestFormatting()
+    {
+        $this->markTestSkipped('Not yet implemented');
+
+        $this->assertSidebarEquals(['GitHub'], [
+            new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
+            new DocumentationPage('bar', ['navigation.group' => 'github']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([

From cca7269f57b8f0f74621710b7c2bf99fa8622812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:30:48 +0100
Subject: [PATCH 0476/2811] Extract helper method

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1168c20d964..28c89a78325 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -59,8 +59,7 @@ protected function generate(): void
                     $groupItem = $this->items->get($group);
 
                     if ($groupItem === null) {
-                        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
-                        $groupItem = NavItem::dropdown(Hyde::makeTitle($group), []);
+                        $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
                     }
 
                     $groupItem->addChild($item);
@@ -92,6 +91,13 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
         }) !== null;
     }
 
+    protected function makeTitleForGroup(string $group): string
+    {
+        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
+
+        return Hyde::makeTitle($group);
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From ed9701aec2eee78be175c921f76fc893826e205d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:37:09 +0100
Subject: [PATCH 0477/2811] Move sidebar group title generation to action

---
 .../GeneratesDocumentationSidebarMenu.php      |  3 ++-
 .../AutomaticNavigationConfigurationsTest.php  |  9 +++++++++
 .../Services/DocumentationSidebarTest.php      | 18 ------------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 28c89a78325..20becf179de 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
+use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -95,7 +96,7 @@ protected function makeTitleForGroup(string $group): string
     {
         // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
 
-        return Hyde::makeTitle($group);
+        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }
 
     protected function canAddRoute(Route $route): bool
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5a7205c1d10..03fc8d38a94 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -988,6 +988,15 @@ public function testSidebarLabelsRetainBestFormatting()
         ]);
     }
 
+    public function testSidebarLabelsCanBeSetInConfig()
+    {
+        config(['docs.sidebar_group_labels' => ['foo' => 'Hello world!']]);
+
+        $this->assertSidebarEquals(['Hello world!'], [
+            new DocumentationPage('foo', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
     {
         $this->assertSidebarEquals([
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index e6bb1b17868..c7d79c3faad 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -252,24 +252,6 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->assertTrue(DocumentationSidebar::create()->isGroupActive('baz'));
     }
 
-    public function testMakeGroupTitleTurnsGroupKeyIntoTitle()
-    {
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello-world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('hello_world'));
-        $this->assertSame('Hello World', DocumentationSidebar::create()->makeGroupTitle('helloWorld'));
-    }
-
-    public function testMakeGroupTitleUsesConfiguredSidebarGroupLabelsWhenAvailable()
-    {
-        Config::set('docs.sidebar_group_labels', [
-            'example' => 'Hello world!',
-        ]);
-
-        $this->assertSame('Hello world!', DocumentationSidebar::create()->makeGroupTitle('example'));
-        $this->assertSame('Default', DocumentationSidebar::create()->makeGroupTitle('default'));
-    }
-
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
     {
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);

From 047950508cf76354e1a1c67b3e5c17dd93be1a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 08:38:17 +0100
Subject: [PATCH 0478/2811] Breaking: Remove method
 `DocumentationSidebar::makeGroupTitle`

---
 .../Features/Navigation/DocumentationSidebar.php     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c7139248ef8..413bf51d736 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
-use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Collection;
@@ -47,16 +45,6 @@ public function isGroupActive(?string $group): bool
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    /**
-     * @deprecated With the new NavItem system this should not be necessary, as the parent has a title
-     *
-     * @todo Get title from instance
-     */
-    public function makeGroupTitle(?string $group): string
-    {
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group ?? 'Other');
-    }
-
     private function isPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());

From d3b858089c773d435327b947edf180aaa7818d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:47:57 +0100
Subject: [PATCH 0479/2811] Simplify collection state check

It's about 0.001ms faster which does not matter at all, but it is more readable I think
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 413bf51d736..8c32ef768c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,9 +23,9 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->filter(function (NavItem $item): bool {
+        return $this->getItems()->contains(function (NavItem $item): bool {
             return $item->hasChildren();
-        })->isNotEmpty();
+        });
     }
 
     /**

From 869676f98464377c6a3db5a96e7d59583e6f166b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:48:10 +0100
Subject: [PATCH 0480/2811] Convert closure to arrow function

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8c32ef768c8..5c079ea2804 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,9 +23,7 @@ public static function create(): static
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(function (NavItem $item): bool {
-            return $item->hasChildren();
-        });
+        return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
     }
 
     /**

From 290664e9efe466c10e84000d373805c465ef2024 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:49:45 +0100
Subject: [PATCH 0481/2811] Introduce local variable to make operation clearer

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5c079ea2804..95b2d87abe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -52,9 +52,11 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $groupIsTheFirstOneInSidebar = $group === $this->getItems()->firstWhere(function (NavItem $item): bool {
+        $firstGroupInSidebar = $this->getItems()->firstWhere(function (NavItem $item): bool {
             return $item->hasChildren();
-        })?->getIdentifier();
+        });
+
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 271f05a150b65f6132c7f8503a1a37eba8ab8ce0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:53:43 +0100
Subject: [PATCH 0482/2811] Document why item sorting is needed here

We could also trigger a resort when items are added, but I don't think it's that big of a problem (Sorting takes ~0.003ms)
---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0c1e610a0e2..48427b978f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -36,6 +36,10 @@ public function __construct(Arrayable|array $items = [])
      */
     public function getItems(): Collection
     {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
         return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
     }
 

From 84b5e27bc15d3aee0abd60dad1e2d69900e7a6ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 11:55:35 +0100
Subject: [PATCH 0483/2811] Document why items are added in a loop

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 48427b978f9..d7a1a92d221 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -23,6 +23,10 @@ public function __construct(Arrayable|array $items = [])
         $this->items = new Collection();
 
         foreach ($items as $item) {
+            // Instead of adding the items directly, we iterate through them and
+            // add them through the helper. This ensures that all the items are
+            // of the correct type, bringing type safety to the menu's items.
+
             $this->add($item);
         }
     }

From 2a2dbb8dd922989002c6cd3bc7ddf76e928be71e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:16:54 +0100
Subject: [PATCH 0484/2811] Expand on class documentation

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d7a1a92d221..23e3ba7b3f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -9,6 +9,11 @@
 
 /**
  * Represents a site navigation menu, and contains all of its navigation items.
+ *
+ * The automatic navigation menus are stored within the service container and can be resolved by their identifiers.
+ *
+ * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
+ * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
  */
 class NavigationMenu
 {

From a66e1ae11243240be34462ad3a71436b067024ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:17:46 +0100
Subject: [PATCH 0485/2811] Convert closure to arrow function

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 95b2d87abe9..4a0cbd53e46 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -52,9 +52,7 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(function (NavItem $item): bool {
-            return $item->hasChildren();
-        });
+        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 

From 1ecc60c4edc757f337c8e0045da15fd5256ed16b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:19:25 +0100
Subject: [PATCH 0486/2811] Document method feature

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4a0cbd53e46..67fa6ae3c99 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -50,6 +50,8 @@ private function isPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
+        // Unless the index page has a specific group set, the first group in the sidebar should be active.
+
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());

From 6d02202ae55f06342fbc558c4c08895030ca63c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 12:34:57 +0100
Subject: [PATCH 0487/2811] Remove null handling as type is evaluated at this
 point

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 67fa6ae3c99..cb9433ed093 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -31,12 +31,8 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(?string $group): bool
+    public function isGroupActive(string $group): bool
     {
-        if ($group === null) {
-            return false;
-        }
-
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
 

From b50d06d47fb69e267dcea8993044a8a46c094885 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:31:43 +0100
Subject: [PATCH 0488/2811] Remove resolved part of todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 20becf179de..c26319125bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,7 +94,7 @@ protected function usesSidebarGroups(RouteCollection $routes): bool
 
     protected function makeTitleForGroup(string $group): string
     {
-        // Todo search for group label in config (we can also search for other labels in the group before slugifying them)
+        // Todo search for other labels in the group before slugifying them
 
         return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
     }

From 9b683e6f22ef187114d82caf3a4fd9ca83b72a06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:38:53 +0100
Subject: [PATCH 0489/2811] Document reasoning behind extra sort

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c26319125bb..2af8b9626e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -106,6 +106,9 @@ protected function canAddRoute(Route $route): bool
 
     protected function sortByPriority(): void
     {
+        // While the items accessor sorts the items upon retrieval,
+        // we do an initial sorting here to order any groups.
+
         $this->items = $this->items->sortBy(function (NavItem $item): int {
             return $item->hasChildren()
                 ? $this->getLowestPriorityInGroup($item)

From 26b28d12dc61ca99ddf384c5ed3d23d5c0c12f8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:44:27 +0100
Subject: [PATCH 0490/2811] Break up coalesce return

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 2af8b9626e8..66cabdca506 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -96,7 +96,13 @@ protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them
 
-        return Config::getNullableString("docs.sidebar_group_labels.$group") ?? Hyde::makeTitle($group);
+        $configLabel = Config::getNullableString("docs.sidebar_group_labels.$group");
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
+        return Hyde::makeTitle($group);
     }
 
     protected function canAddRoute(Route $route): bool

From 97f74c3799e4d156b31f4f3f2a7b13ab6079789a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:48:32 +0100
Subject: [PATCH 0491/2811] Refactor local variable to instance property

---
 .../GeneratesDocumentationSidebarMenu.php          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 66cabdca506..024aeb7e5a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -26,9 +26,13 @@ class GeneratesDocumentationSidebarMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
+    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    protected RouteCollection $routes;
+
     protected function __construct()
     {
         $this->items = new Collection();
+        $this->routes = Routes::getRoutes(DocumentationPage::class);
     }
 
     public static function handle(): DocumentationSidebar
@@ -43,11 +47,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $routes = Routes::getRoutes(DocumentationPage::class);
-
-        $useGroups = $this->usesSidebarGroups($routes);
+        $useGroups = $this->usesSidebarGroups();
 
-        $routes->each(function (Route $route) use ($useGroups): void {
+        $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 $group = $item->getGroup();
@@ -82,12 +84,12 @@ protected function generate(): void
         }
     }
 
-    protected function usesSidebarGroups(RouteCollection $routes): bool
+    protected function usesSidebarGroups(): bool
     {
         // In order to know if we should use groups in the sidebar,
         // we need to loop through the pages and see if they have a group set
 
-        return $routes->first(function (Route $route): bool {
+        return $this->routes->first(function (Route $route): bool {
             return filled($route->getPage()->navigationMenuGroup());
         }) !== null;
     }

From ae14037e332fc06449a87187f4b858e88d9eecc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:53:37 +0100
Subject: [PATCH 0492/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 2b16f03cfff..5e5b18588d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -89,6 +89,8 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
+     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups.
+     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.

From 2ad01e4979a5fb450b728e8b293683ba680294af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:56:23 +0100
Subject: [PATCH 0493/2811] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 024aeb7e5a0..1153d1cad9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,6 +94,7 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
+    /** Todo: Refactor to move label resolver to model classRefactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them

From 7ca644fefd2620d6848f1fc023cedbb3a5dfaf41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:58:20 +0100
Subject: [PATCH 0494/2811] Add todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5e5b18588d5..26c6a634350 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -205,6 +205,7 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */

From 6ef6f70e3c90f3c83612d474c4e345d3f8034129 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 13:59:17 +0100
Subject: [PATCH 0495/2811] Test default dropdown item priority

---
 packages/framework/tests/Unit/NavItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..2039c4b93d8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,4 +396,9 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
+
+    public function testDefaultDropdownItemPriority()
+    {
+        $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
+    }
 }

From dc68cadb846540a7f38167e33787ded90fb0fa89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:01:46 +0100
Subject: [PATCH 0496/2811] Test can resolve dropdown item priority from config

---
 packages/framework/tests/Unit/NavItemTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2039c4b93d8..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -401,4 +401,11 @@ public function testDefaultDropdownItemPriority()
     {
         $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
     }
+
+    public function testCanResolveDropdownItemPriorityFromConfig()
+    {
+        $this->mockConfig(['hyde.navigation.order' => ['foo' => 500]]);
+
+        $this->assertSame(500, NavItem::dropdown('foo', [])->getPriority());
+    }
 }

From 80d5644c89f80d81ecf789661b5398a12ca986a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:02:40 +0100
Subject: [PATCH 0497/2811] Extract new method for normalizing group labels

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 26c6a634350..6c010022ee5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 
     /**
@@ -205,6 +205,11 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        return $label;
+    }
+
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {

From 0a1c29cccc7499c74b642ae9215ea22cffd2c560 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:07:16 +0100
Subject: [PATCH 0498/2811] Fix todo comment

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 1153d1cad9b..e7751e47826 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -94,7 +94,7 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    /** Todo: Refactor to move label resolver to model classRefactor to move label resolver to model class */
+    /** Todo: Refactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them

From d3a0a59175dc30243b05a64b702b3efe8a56f62e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:08:18 +0100
Subject: [PATCH 0499/2811] Refactor to move config label resolver to model
 class

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 .../src/Framework/Features/Navigation/NavItem.php         | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e7751e47826..9a964b53f1a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
-use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -94,17 +93,10 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    /** Todo: Refactor to move label resolver to model class */
     protected function makeTitleForGroup(string $group): string
     {
         // Todo search for other labels in the group before slugifying them
 
-        $configLabel = Config::getNullableString("docs.sidebar_group_labels.$group");
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
         return Hyde::makeTitle($group);
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6c010022ee5..317d11eda6e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,6 +207,12 @@ protected static function makeIdentifier(string $label): string
 
     protected static function normalizeGroupLabel(string $label): string
     {
+        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($label));
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
         return $label;
     }
 

From 64f663491e23489983e4fec88d6d5f031d984a94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:34:22 +0100
Subject: [PATCH 0500/2811] Add accessor hook to make the group label

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 317d11eda6e..9900b45f62f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -130,6 +130,10 @@ public function getLink(): string
      */
     public function getLabel(): string
     {
+        if ($this->hasChildren()) {
+            return $this->makeGroupLabel();
+        }
+
         return $this->label;
     }
 

From 54a82d048a3ca6efbc62884066e61c7f2a37f4cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:35:05 +0100
Subject: [PATCH 0501/2811] Sketch out group label generator method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9900b45f62f..bb70406f858 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -232,4 +232,10 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
         return $config[$groupKey] ?? null;
     }
+
+    /** Find the best label for the group. */
+    protected function makeGroupLabel(): string
+    {
+        return static::normalizeGroupLabel($this->label);
+    }
 }

From 0cb1fad3a812131b6c21aab7843f2ed9a67ef7b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:37:33 +0100
Subject: [PATCH 0502/2811] Inline adapted normalization method

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bb70406f858..7e354f4ba7f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -236,6 +236,12 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return static::normalizeGroupLabel($this->label);
+        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier));
+
+        if ($configLabel) {
+            return $configLabel;
+        }
+
+        return $this->label;
     }
 }

From 6e858fcea79b14e422805ad2cc8ebe2e95a665c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:39:29 +0100
Subject: [PATCH 0503/2811] Remove label normalization at create time

We don't have all the context at this point
---
 .../src/Framework/Features/Navigation/NavItem.php   | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7e354f4ba7f..e0246f4d5db 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
     }
 
     /**
@@ -209,17 +209,6 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($label));
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
-        return $label;
-    }
-
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {

From 9e5dc91f7676470eb30439e1470adf4c75e77d2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:43:08 +0100
Subject: [PATCH 0504/2811] Pass label as group key even for group parents

Can allow us to have two states, one pretty for labels, and one normalized internal one
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e0246f4d5db..a5cc738a5cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, null, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**

From 7fd874e8c519e2c96a9c6bd9404dfe281bf8972a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:47:00 +0100
Subject: [PATCH 0505/2811] Use group identifier for internal generator state

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 9a964b53f1a..87a1311647e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -58,7 +59,7 @@ protected function generate(): void
                         $group = 'Other';
                     }
 
-                    $groupItem = $this->items->get($group);
+                    $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
                         $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
@@ -66,8 +67,8 @@ protected function generate(): void
 
                     $groupItem->addChild($item);
 
-                    if (! $this->items->has($group)) {
-                        $this->items->put($group, $groupItem);
+                    if (! $this->items->has($groupItem->getIdentifier())) {
+                        $this->items->put($groupItem->getIdentifier(), $groupItem);
                     }
 
                     return;

From 29f78ea5e50f13cbef354f661aee6b1ef035b695 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 14:54:55 +0100
Subject: [PATCH 0506/2811] Add auxiliary assertion case to improve accuracy

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 03fc8d38a94..53f9093b410 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -986,6 +986,11 @@ public function testSidebarLabelsRetainBestFormatting()
             new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
             new DocumentationPage('bar', ['navigation.group' => 'github']),
         ]);
+
+        $this->assertSidebarEquals(['GitHub'], [
+            new DocumentationPage('foo', ['navigation.group' => 'github']),
+            new DocumentationPage('bar', ['navigation.group' => 'GitHub']),
+        ]);
     }
 
     public function testSidebarLabelsCanBeSetInConfig()

From edd20ab28c9ec42dede280e8ca9f330c81baa6e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:11:00 +0100
Subject: [PATCH 0507/2811] Create titles when necessary

---
 .../src/Framework/Features/Navigation/NavItem.php   |  5 +++++
 .../AutomaticNavigationConfigurationsTest.php       | 13 +++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a5cc738a5cf..adc18ad7b2a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -231,6 +231,11 @@ protected function makeGroupLabel(): string
             return $configLabel;
         }
 
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($this->group === $this->label && $this->group === strtolower($this->group)) {
+            return Hyde::makeTitle($this->group);
+        }
+
         return $this->label;
     }
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 53f9093b410..6377a29d95b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -448,8 +448,7 @@ public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdir
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['label' => 'about', 'children' => ['Foo', 'Bar', 'Baz']],
-            // TODO: Label should be About
+            ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('about/foo'),
             new MarkdownPage('about/bar'),
@@ -496,9 +495,8 @@ public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGrou
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            // Todo: Should use proper group name
-            ['label' => 'group-1', 'children' => ['Foo']],
-            ['label' => 'group-2', 'children' => ['Foo']],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
             new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
@@ -510,9 +508,8 @@ public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDiff
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            // Todo: Should use proper group name
-            ['label' => 'one', 'children' => ['Foo']],
-            ['label' => 'two', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
             new MarkdownPage('one/foo'),
             new MarkdownPage('two/foo'),

From 9ab9700774c161f890ab343c05e8b3a64521b6b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:22:17 +0100
Subject: [PATCH 0508/2811] Extract helper method

---
 .../src/Framework/Features/Navigation/NavItem.php     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index adc18ad7b2a..ed5ad39cfdb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -232,10 +232,15 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        if ($this->group === $this->label && $this->group === strtolower($this->group)) {
-            return Hyde::makeTitle($this->group);
+        return $this->normalizeLabel($this->group);
+    }
+
+    protected function normalizeLabel(string $label): ?string
+    {
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
         }
 
-        return $this->label;
+        return $label;
     }
 }

From 2a1c38fa9094906daff4f933c5a434b7fe9c87c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:23:32 +0100
Subject: [PATCH 0509/2811] Normalize label at construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ed5ad39cfdb..d9b48554a2d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         }
 
         $this->destination = $destination;
-        $this->label = $label;
+        $this->label = $this->normalizeLabel($label);
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = $this->makeIdentifier($label);

From a9638ab3b6b67715d3f3626bdf32500a90e5f338 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:23:36 +0100
Subject: [PATCH 0510/2811] Remove redundant title generation

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 87a1311647e..a82d86721ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -62,7 +61,7 @@ protected function generate(): void
                     $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown($this->makeTitleForGroup($group), []);
+                        $groupItem = NavItem::dropdown($group, []);
                     }
 
                     $groupItem->addChild($item);
@@ -94,13 +93,6 @@ protected function usesSidebarGroups(): bool
         }) !== null;
     }
 
-    protected function makeTitleForGroup(string $group): string
-    {
-        // Todo search for other labels in the group before slugifying them
-
-        return Hyde::makeTitle($group);
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());

From b7e858825e553a26f0568a167a74ab7ef731b6cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:25:35 +0100
Subject: [PATCH 0511/2811] Handle null case as property can be explicitly set
 to null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d9b48554a2d..01c7ccaf4d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -235,9 +235,9 @@ protected function makeGroupLabel(): string
         return $this->normalizeLabel($this->group);
     }
 
-    protected function normalizeLabel(string $label): ?string
+    protected function normalizeLabel(?string $label): ?string
     {
-        if ($label === strtolower($label)) {
+        if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);
         }
 

From 9a228f160d38b7088b801816347243c3c717cd79 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:26:24 +0100
Subject: [PATCH 0512/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 01c7ccaf4d8..891e8ddbadd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -196,6 +196,8 @@ public function isCurrent(): bool
      */
     public function addChild(NavItem $item): void
     {
+        // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
+
         $this->children[] = $item;
     }
 

From 18e2511b870ece71b953bb11621ebf6867405112 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:29:57 +0100
Subject: [PATCH 0513/2811] Coalesce to try label

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 891e8ddbadd..ac4d5dc3e6a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -234,7 +234,7 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeLabel($this->group);
+        return $this->normalizeLabel($this->group ?? $this->label);
     }
 
     protected function normalizeLabel(?string $label): ?string

From bb46d130f84cb0ce14cdcb72690305a63ad6be1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 15:31:11 +0100
Subject: [PATCH 0514/2811] Update to expect pretty labels

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 6377a29d95b..85ae4436594 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -472,7 +472,7 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
+        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
@@ -890,7 +890,7 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
+        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..957ec88cbca 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('bar', $item->getLabel());
+        $this->assertSame('Bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 30373f7685de7146a3687473fa3997fcdbf0a0a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:08:40 +0100
Subject: [PATCH 0515/2811] Add label casing tests

---
 .../AutomaticNavigationConfigurationsTest.php | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 85ae4436594..8118ba124bb 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1038,6 +1038,68 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    // Label casing tests
+
+    public function testMainMenuNavigationItemCasing()
+    {
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world')]);
+    }
+
+    public function testMainMenuNavigationItemCasingUsingFrontMatter()
+    {
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'Hello World'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
+    }
+
+    public function testMainMenuNavigationGroupCasing()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World/foo')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world/foo')]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world/foo')]);
+    }
+
+    public function testMainMenuNavigationGroupCasingUsingFrontMatter()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello-world'])]);
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello world'])]);
+    }
+
+    public function testSidebarItemCasing()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world')]);
+    }
+
+    public function testSidebarItemCasingUsingFrontMatter()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'Hello World'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
+    }
+
+    public function testSidebarGroupCasing()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World/foo')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world/foo')]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world/foo')]);
+    }
+
+    public function testSidebarGroupCasingUsingFrontMatter()
+    {
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'Hello World'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello-world'])]);
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void

From 649142b78a521f4d82b4b71242db014a92383f60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:11:25 +0100
Subject: [PATCH 0516/2811] Revert "Normalize label at construct"

This reverts commit 2a1c38fa9094906daff4f933c5a434b7fe9c87c9.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ac4d5dc3e6a..99b7fc3414e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         }
 
         $this->destination = $destination;
-        $this->label = $this->normalizeLabel($label);
+        $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = $this->makeIdentifier($label);

From ffe7314cbe80a325af56859e33be428ae8b7d96a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:12:03 +0100
Subject: [PATCH 0517/2811] Normalize group label at construct

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 99b7fc3414e..abadee85f53 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -237,7 +237,7 @@ protected function makeGroupLabel(): string
         return $this->normalizeLabel($this->group ?? $this->label);
     }
 
-    protected function normalizeLabel(?string $label): ?string
+    protected static function normalizeLabel(?string $label): ?string
     {
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);

From e283b5a76e4f44bc5914057edd136459b4b9a66e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:12:07 +0100
Subject: [PATCH 0518/2811] Revert "Update to expect pretty labels"

This reverts commit bb46d130f84cb0ce14cdcb72690305a63ad6be1d.
---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8118ba124bb..c683ba1cf1d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -472,7 +472,7 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
             new MarkdownPage('FOO'),
         ]);
 
-        $this->assertMenuEquals(['Foo', 'Foo', 'FOO'], [
+        $this->assertMenuEquals(['foo', 'Foo', 'FOO'], [
             new MarkdownPage('foo', ['navigation.label' => 'foo']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo']),
             new MarkdownPage('baz', ['navigation.label' => 'FOO']),
@@ -890,7 +890,7 @@ public function testSidebarItemsWithTheSameLabelAreNotFilteredForDuplicatesRegar
             new DocumentationPage('FOO'),
         ]);
 
-        $this->assertSidebarEquals(['Foo', 'Foo', 'FOO'], [
+        $this->assertSidebarEquals(['foo', 'Foo', 'FOO'], [
             new DocumentationPage('foo', ['navigation.label' => 'foo']),
             new DocumentationPage('bar', ['navigation.label' => 'Foo']),
             new DocumentationPage('baz', ['navigation.label' => 'FOO']),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 957ec88cbca..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -186,7 +186,7 @@ public function testForLink()
         $item = NavItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('Bar', $item->getLabel());
+        $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
 
@@ -201,7 +201,7 @@ public function testForRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -211,7 +211,7 @@ public function testForIndexRoute()
         $item = NavItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getDestination());
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 008910c6c92690d73a2be9e684cbf64fc6b63e12 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:17:23 +0100
Subject: [PATCH 0519/2811] Expect explicitly set front matter to be what the
 user wants

See https://github.com/hydephp/develop/pull/1576#issuecomment-1954364613
---
 .../AutomaticNavigationConfigurationsTest.php | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c683ba1cf1d..eaba945cf0c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1042,6 +1042,8 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
 
     public function testMainMenuNavigationItemCasing()
     {
+        // These labels are based on the page titles, which are made from the file names, so we try to format them
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world')]);
@@ -1049,15 +1051,23 @@ public function testMainMenuNavigationItemCasing()
 
     public function testMainMenuNavigationItemCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the label, we should respect that and assume it's already formatted correctly
+
+        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['title' => 'Hello World'])]);
+        $this->assertMenuEquals(['hello-world'], [new MarkdownPage('foo', ['title' => 'hello-world'])]);
+        $this->assertMenuEquals(['hello world'], [new MarkdownPage('foo', ['title' => 'hello world'])]);
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'Hello World'])]);
-        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
-        $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
+        $this->assertMenuEquals(['hello-world'], [new MarkdownPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertMenuEquals(['hello world'], [new MarkdownPage('foo', ['navigation.label' => 'hello world'])]);
     }
 
     public function testMainMenuNavigationGroupCasing()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
+        // When using subdirectory groupings, we try to format them the same way as the page titles
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('Hello World/foo')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello-world/foo')]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('hello world/foo')]);
@@ -1067,6 +1077,8 @@ public function testMainMenuNavigationGroupCasingUsingFrontMatter()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
 
+        // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
+
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello-world'])]);
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'hello world'])]);
@@ -1074,6 +1086,8 @@ public function testMainMenuNavigationGroupCasingUsingFrontMatter()
 
     public function testSidebarItemCasing()
     {
+        // These labels are based on the page titles, which are made from the file names, so we try to format them
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world')]);
@@ -1081,13 +1095,21 @@ public function testSidebarItemCasing()
 
     public function testSidebarItemCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the label, we should respect that and assume it's already formatted correctly
+
+        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['title' => 'Hello World'])]);
+        $this->assertSidebarEquals(['hello-world'], [new DocumentationPage('foo', ['title' => 'hello-world'])]);
+        $this->assertSidebarEquals(['hello world'], [new DocumentationPage('foo', ['title' => 'hello world'])]);
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'Hello World'])]);
-        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
-        $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
+        $this->assertSidebarEquals(['hello-world'], [new DocumentationPage('foo', ['navigation.label' => 'hello-world'])]);
+        $this->assertSidebarEquals(['hello world'], [new DocumentationPage('foo', ['navigation.label' => 'hello world'])]);
     }
 
     public function testSidebarGroupCasing()
     {
+        // When using subdirectory groupings, we try to format them the same way as the page titles
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('Hello World/foo')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello-world/foo')]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('hello world/foo')]);
@@ -1095,6 +1117,8 @@ public function testSidebarGroupCasing()
 
     public function testSidebarGroupCasingUsingFrontMatter()
     {
+        // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
+
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'Hello World'])]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello-world'])]);
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);

From fceca310591d6543e16e98065d962d0f6f0cfe24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:18:19 +0100
Subject: [PATCH 0520/2811] Expect dropdown label to be formatted

---
 packages/framework/tests/Unit/NavItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..9dab7732acb 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame('Foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 2296d30734dd79793d2e563263a69b028bbf9aba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:26:30 +0100
Subject: [PATCH 0521/2811] Rename back helper method name

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index abadee85f53..9ca73f04645 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
         // TODO resolve label from config here instead of view
-        return new static('', static::normalizeLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -234,10 +234,10 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeLabel($this->group ?? $this->label);
+        return $this->normalizeGroupLabel($this->group ?? $this->label);
     }
 
-    protected static function normalizeLabel(?string $label): ?string
+    protected static function normalizeGroupLabel(?string $label): ?string
     {
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);

From be556710bd289c38cfd5fb10acafa96de50e01fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:26:59 +0100
Subject: [PATCH 0522/2811] Switch order of helpers to group static methods

---
 .../Framework/Features/Navigation/NavItem.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9ca73f04645..08b50714aee 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -224,6 +224,15 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
+    protected static function normalizeGroupLabel(?string $label): ?string
+    {
+        if ($label && ($label === strtolower($label))) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
+
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
@@ -236,13 +245,4 @@ protected function makeGroupLabel(): string
         // If there is no label, and the group is a slug, we can make a title from it
         return $this->normalizeGroupLabel($this->group ?? $this->label);
     }
-
-    protected static function normalizeGroupLabel(?string $label): ?string
-    {
-        if ($label && ($label === strtolower($label))) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }

From ed383406f91dc3426887622f2cb48214490444cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:27:37 +0100
Subject: [PATCH 0523/2811] Call static method statically

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 08b50714aee..93ea71bf326 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -243,6 +243,6 @@ protected function makeGroupLabel(): string
         }
 
         // If there is no label, and the group is a slug, we can make a title from it
-        return $this->normalizeGroupLabel($this->group ?? $this->label);
+        return static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From a297250eec5699adfa6bb65a2083fc24f687b34c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:27:54 +0100
Subject: [PATCH 0524/2811] Move comment to more relevant location

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 93ea71bf326..924270c8847 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -226,6 +226,7 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
 
     protected static function normalizeGroupLabel(?string $label): ?string
     {
+        // If there is no label, and the group is a slug, we can make a title from it
         if ($label && ($label === strtolower($label))) {
             return Hyde::makeTitle($label);
         }
@@ -242,7 +243,6 @@ protected function makeGroupLabel(): string
             return $configLabel;
         }
 
-        // If there is no label, and the group is a slug, we can make a title from it
         return static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From c6324bce2d2b74b32d58eb4dad4e2e9450f3517f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:28:10 +0100
Subject: [PATCH 0525/2811] Import used functions

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 924270c8847..0fdad4e0e32 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -12,6 +12,9 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function is_string;
+use function strtolower;
+
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *

From 36177faaf02a696e51b686559463550e2afe03b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:29:10 +0100
Subject: [PATCH 0526/2811] Simplify method return

---
 .../src/Framework/Features/Navigation/NavItem.php        | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0fdad4e0e32..ef9665fbafe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -240,12 +240,7 @@ protected static function normalizeGroupLabel(?string $label): ?string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        $configLabel = Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier));
-
-        if ($configLabel) {
-            return $configLabel;
-        }
-
-        return static::normalizeGroupLabel($this->group ?? $this->label);
+        return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
+            ?? static::normalizeGroupLabel($this->group ?? $this->label);
     }
 }

From 303562067d1d91b8dfc5eda0d80215d4cef694a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:30:55 +0100
Subject: [PATCH 0527/2811] Remove unnecessary method call for already executed
 operation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ef9665fbafe..bad6e1af237 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -241,6 +241,6 @@ protected static function normalizeGroupLabel(?string $label): ?string
     protected function makeGroupLabel(): string
     {
         return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
-            ?? static::normalizeGroupLabel($this->group ?? $this->label);
+            ?? $this->label;
     }
 }

From 913e8b9c7a36cb522350a79360d9e96cb747046c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:32:35 +0100
Subject: [PATCH 0528/2811] Revert "Handle null case as property can be
 explicitly set to null"

This reverts commit b7e858825e553a26f0568a167a74ab7ef731b6cf as a group without a title indicates an issue that should be thrown.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bad6e1af237..c69719b5dce 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -227,10 +227,10 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
         return $config[$groupKey] ?? null;
     }
 
-    protected static function normalizeGroupLabel(?string $label): ?string
+    protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it
-        if ($label && ($label === strtolower($label))) {
+        if ($label === strtolower($label)) {
             return Hyde::makeTitle($label);
         }
 

From 0e55c2b55134e4ff9d543c3421a06d5b60a8f761 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:34:50 +0100
Subject: [PATCH 0529/2811] Remove unnecessary default values from config call

There is no reason to expect things like "index" to be a dropdown group. Posts maybe, if for some reason a user wants to list all posts in a dropdown but at that point they need to make other changes so I see no reason to have an extra line for something so uncommon.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c69719b5dce..6d9d80970f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -218,11 +218,7 @@ protected static function makeIdentifier(string $label): string
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', [
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ]);
+        $config = Config::getArray('hyde.navigation.order', []);
 
         return $config[$groupKey] ?? null;
     }

From 8e1ab831b4c162925138492d750d78033f77f322 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:43:39 +0100
Subject: [PATCH 0530/2811] Simplify config return

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6d9d80970f3..020f7883101 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -217,10 +217,7 @@ protected static function makeIdentifier(string $label): string
     // TODO: Consider moving all of these to a dropdown factory
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
-        /** @var array<string, int> $config */
-        $config = Config::getArray('hyde.navigation.order', []);
-
-        return $config[$groupKey] ?? null;
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
 
     protected static function normalizeGroupLabel(string $label): string

From 8398351eeecc3a92ef96cd85103038f959d46faf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:44:56 +0100
Subject: [PATCH 0531/2811] Normalize config access

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 020f7883101..a4df1fe75c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,7 +233,7 @@ protected static function normalizeGroupLabel(string $label): string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return Config::getNullableString('docs.sidebar_group_labels.'.Str::slug($this->identifier))
+        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)]
             ?? $this->label;
     }
 }

From 8cc5bd6eb29bdebab698cc5e7b7a4e3510ebc687 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 16:45:33 +0100
Subject: [PATCH 0532/2811] Format to single line

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a4df1fe75c8..e7c6cc10dbb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,7 +233,6 @@ protected static function normalizeGroupLabel(string $label): string
     /** Find the best label for the group. */
     protected function makeGroupLabel(): string
     {
-        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)]
-            ?? $this->label;
+        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)] ?? $this->label;
     }
 }

From 2c06b5241f132aef35d3b1a754c9afe5bfa12b2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:46:26 +0100
Subject: [PATCH 0533/2811] Remove resolved todo

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e7c6cc10dbb..e4275b37fbb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -100,7 +100,6 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        // TODO resolve label from config here instead of view
         return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 

From 17a992ace5043396ed228a8e0196b557547c42a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:49:39 +0100
Subject: [PATCH 0534/2811] Remove complex logic from roadmap

This is not worth it as it adds a lot of complexity. For these cases, the user will have to add a custom label.
---
 .../AutomaticNavigationConfigurationsTest.php     | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index eaba945cf0c..51f873fbe18 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -975,21 +975,6 @@ public function testSidebarItemGroupingIsNormalized()
         ]);
     }
 
-    public function testSidebarLabelsRetainBestFormatting()
-    {
-        $this->markTestSkipped('Not yet implemented');
-
-        $this->assertSidebarEquals(['GitHub'], [
-            new DocumentationPage('foo', ['navigation.group' => 'GitHub']),
-            new DocumentationPage('bar', ['navigation.group' => 'github']),
-        ]);
-
-        $this->assertSidebarEquals(['GitHub'], [
-            new DocumentationPage('foo', ['navigation.group' => 'github']),
-            new DocumentationPage('bar', ['navigation.group' => 'GitHub']),
-        ]);
-    }
-
     public function testSidebarLabelsCanBeSetInConfig()
     {
         config(['docs.sidebar_group_labels' => ['foo' => 'Hello world!']]);

From e2b04d4f1269936c1d69d7e27d6c823273ee264e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:51:31 +0100
Subject: [PATCH 0535/2811] Move back group label logic to generator

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   |  3 ++-
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a82d86721ba..eeaa0e11ee3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -61,7 +62,7 @@ protected function generate(): void
                     $groupItem = $this->items->get(Str::slug($group));
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown($group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[Str::slug($group)] ?? $group, []);
                     }
 
                     $groupItem->addChild($item);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e4275b37fbb..8096142db28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -132,10 +132,6 @@ public function getLink(): string
      */
     public function getLabel(): string
     {
-        if ($this->hasChildren()) {
-            return $this->makeGroupLabel();
-        }
-
         return $this->label;
     }
 
@@ -228,10 +224,4 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
-
-    /** Find the best label for the group. */
-    protected function makeGroupLabel(): string
-    {
-        return Config::getArray('docs.sidebar_group_labels', [])[Str::slug($this->identifier)] ?? $this->label;
-    }
 }

From cde50ca0205117c910c845f44b73cd7d47c1808b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:52:47 +0100
Subject: [PATCH 0536/2811] Introduce local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index eeaa0e11ee3..32045ace739 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -59,10 +59,11 @@ protected function generate(): void
                         $group = 'Other';
                     }
 
-                    $groupItem = $this->items->get(Str::slug($group));
+                    $groupIdentifier = Str::slug($group);
+                    $groupItem = $this->items->get($groupIdentifier);
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[Str::slug($group)] ?? $group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $group, []);
                     }
 
                     $groupItem->addChild($item);

From 4e1521f96c15e3e4ef32ec90acc47c5ec47abd7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:53:04 +0100
Subject: [PATCH 0537/2811] Rename local variable to be clearer

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 32045ace739..56598f838ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,18 +52,18 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                $group = $item->getGroup();
+                $groupName = $item->getGroup();
 
                 if ($useGroups) {
-                    if (! $group) {
-                        $group = 'Other';
+                    if (! $groupName) {
+                        $groupName = 'Other';
                     }
 
-                    $groupIdentifier = Str::slug($group);
+                    $groupIdentifier = Str::slug($groupName);
                     $groupItem = $this->items->get($groupIdentifier);
 
                     if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $group, []);
+                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
                     }
 
                     $groupItem->addChild($item);

From 08d7783db5878d7a38614232db05306bd331a956 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:54:50 +0100
Subject: [PATCH 0538/2811] Extract helper method

---
 .../GeneratesDocumentationSidebarMenu.php     | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 56598f838ea..fdedaf41e6d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,16 +55,7 @@ protected function generate(): void
                 $groupName = $item->getGroup();
 
                 if ($useGroups) {
-                    if (! $groupName) {
-                        $groupName = 'Other';
-                    }
-
-                    $groupIdentifier = Str::slug($groupName);
-                    $groupItem = $this->items->get($groupIdentifier);
-
-                    if ($groupItem === null) {
-                        $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
-                    }
+                    $groupItem = $this->createGroupItem($groupName);
 
                     $groupItem->addChild($item);
 
@@ -116,4 +107,20 @@ protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
+
+    protected function createGroupItem(?string $groupName): NavItem
+    {
+        if (! $groupName) {
+            $groupName = 'Other';
+        }
+
+        $groupIdentifier = Str::slug($groupName);
+        $groupItem = $this->items->get($groupIdentifier);
+
+        if ($groupItem === null) {
+            $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
+        }
+
+        return $groupItem;
+    }
 }

From 78039310c608708bad70884c0c836924f9b9e66e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:56:50 +0100
Subject: [PATCH 0539/2811] Inline local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index fdedaf41e6d..5049dad7808 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,10 +52,8 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                $groupName = $item->getGroup();
-
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($groupName);
+                    $groupItem = $this->createGroupItem($item->getGroup());
 
                     $groupItem->addChild($item);
 

From 21076ecb8685a9d271e2fbb27e1fa2c84daf4e25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:57:24 +0100
Subject: [PATCH 0540/2811] Shift fallback to parameter coalesce

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5049dad7808..7fcab729355 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -53,7 +53,7 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($item->getGroup());
+                    $groupItem = $this->createGroupItem($item->getGroup() ?? 'Other');
 
                     $groupItem->addChild($item);
 
@@ -106,12 +106,8 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(?string $groupName): NavItem
+    protected function createGroupItem(string $groupName): NavItem
     {
-        if (! $groupName) {
-            $groupName = 'Other';
-        }
-
         $groupIdentifier = Str::slug($groupName);
         $groupItem = $this->items->get($groupIdentifier);
 

From f98333f552df932a1b66fd8a22d43f6fad9f757b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:57:59 +0100
Subject: [PATCH 0541/2811] Rename helper method to be clearer and more correct

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7fcab729355..cde08b69220 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -53,7 +53,7 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
                 if ($useGroups) {
-                    $groupItem = $this->createGroupItem($item->getGroup() ?? 'Other');
+                    $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
 
                     $groupItem->addChild($item);
 
@@ -106,7 +106,7 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(string $groupName): NavItem
+    protected function getOrCreateGroupItem(string $groupName): NavItem
     {
         $groupIdentifier = Str::slug($groupName);
         $groupItem = $this->items->get($groupIdentifier);

From 3e827976685eff77f592ce3486124dcfff9dd98a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 17:59:03 +0100
Subject: [PATCH 0542/2811] Remove unnecessary qualifiers from narrowed scope

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cde08b69220..6cb507713fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -108,13 +108,13 @@ protected function getLowestPriorityInGroup(NavItem $item): int
 
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
-        $groupIdentifier = Str::slug($groupName);
-        $groupItem = $this->items->get($groupIdentifier);
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
 
-        if ($groupItem === null) {
-            $groupItem = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$groupIdentifier] ?? $groupName, []);
+        if ($group === null) {
+            $group = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
         }
 
-        return $groupItem;
+        return $group;
     }
 }

From cb4cf0d28d63f79fffd31aec50e0e0d415c896d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:00:09 +0100
Subject: [PATCH 0543/2811] Simplify conditional return with coalescing return
 expression

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6cb507713fe..493d7e520d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -111,10 +111,6 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         $identifier = Str::slug($groupName);
         $group = $this->items->get($identifier);
 
-        if ($group === null) {
-            $group = NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
-        }
-
-        return $group;
+        return $group ?? NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
     }
 }

From 8365d594b0b22d44672848e37260ee20bfeb5b76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:01:20 +0100
Subject: [PATCH 0544/2811] Extract helper

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 493d7e520d4..a4c9b74031e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -111,6 +111,11 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         $identifier = Str::slug($groupName);
         $group = $this->items->get($identifier);
 
-        return $group ?? NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        return NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
     }
 }

From 17f4a265af2cf001bf418e2ecec83e0c1b2ec3e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:02:52 +0100
Subject: [PATCH 0545/2811] Extract helper

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a4c9b74031e..f5a23cc7bc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -116,6 +116,11 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        return NavItem::dropdown(Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? $groupName, []);
+        return NavItem::dropdown($this->searchForGroupLabelInConfig($identifier) ?? $groupName, []);
+    }
+
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
 }

From 4ab40d50af5b1cc462d6dcd672d328e128872e6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:04:24 +0100
Subject: [PATCH 0546/2811] Introduce local variable

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f5a23cc7bc0..f339458686b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -116,7 +116,9 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        return NavItem::dropdown($this->searchForGroupLabelInConfig($identifier) ?? $groupName, []);
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+
+        return NavItem::dropdown($label, []);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string

From c1fdebb3ff006330b1df9cd4117daafa52e74f55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:07:36 +0100
Subject: [PATCH 0547/2811] Move normalization logic to action

This is specific to the sidebar, so we don't need to pollute the global model with it
---
 .../GeneratesDocumentationSidebarMenu.php          | 14 +++++++++++++-
 .../src/Framework/Features/Navigation/NavItem.php  | 13 +------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f339458686b..c0524e331e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -116,7 +118,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $label = $this->normalizeGroupLabel($this->searchForGroupLabelInConfig($identifier) ?? $groupName);
 
         return NavItem::dropdown($label, []);
     }
@@ -125,4 +127,14 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
+
+    protected function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8096142db28..0d81cfb85b4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,7 +13,6 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
-use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -100,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -214,14 +213,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
-
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }

From 3d831c0d34dd6d8d2e2c40a8bd8e6b45592685d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:10:45 +0100
Subject: [PATCH 0548/2811] Revert "Move normalization logic to action"

This reverts commit c1fdebb3ff006330b1df9cd4117daafa52e74f55.
---
 .../GeneratesDocumentationSidebarMenu.php          | 14 +-------------
 .../src/Framework/Features/Navigation/NavItem.php  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c0524e331e0..f339458686b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -14,7 +13,6 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -118,7 +116,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
-        $label = $this->normalizeGroupLabel($this->searchForGroupLabelInConfig($identifier) ?? $groupName);
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
         return NavItem::dropdown($label, []);
     }
@@ -127,14 +125,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
-
-    protected function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0d81cfb85b4..8096142db28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,6 +13,7 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
+use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -99,7 +100,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -213,4 +214,14 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
+
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }

From f0fb28637703d52bc9af5bbe9e03c10af6f064ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:30:23 +0100
Subject: [PATCH 0549/2811] Add test for conflicting configuration states

---
 .../AutomaticNavigationConfigurationsTest.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 51f873fbe18..0ecc49a463d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -516,6 +516,21 @@ public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDiff
         ]);
     }
 
+    public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGivesPrecedenceToSubdirectory()
+    {
+        // In case subdirectories are set to be used as dropdowns, but a page has a group set in its front matter,
+        // we run into a conflicting state where we don't know what the user intended. We solve this by giving
+        // precedence to the subdirectory configuration. This is opinionated, but allows for good grouping.
+
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'children' => ['Child']],
+        ], [
+            new MarkdownPage('foo/child', ['navigation.group' => 'bar']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 194b9b849495b9fd17c2e9896a3f5f41e72ac624 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:33:35 +0100
Subject: [PATCH 0550/2811] Remove unnecessary data from test

---
 .../AutomaticNavigationConfigurationsTest.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0ecc49a463d..afa4b3fdc0f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -495,11 +495,11 @@ public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGrou
         config(['hyde.navigation.subdirectories' => 'dropdown']);
 
         $this->assertMenuEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new MarkdownPage('one/foo', ['navigation.group' => 'Group 1']),
-            new MarkdownPage('two/foo', ['navigation.group' => 'Group 2']),
+            new MarkdownPage('one/foo'),
+            new MarkdownPage('two/foo'),
         ]);
     }
 
@@ -926,11 +926,11 @@ public function testSidebarItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreFiltered()
     {
         $this->assertSidebarEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
-            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
         ]);
     }
 
@@ -950,11 +950,11 @@ public function testSidebarDropdownItemsWithSameLabelButDifferentGroupsAreNotFil
         config(['docs.flattened_output_paths' => false]);
 
         $this->assertSidebarEquals([
-            ['label' => 'Group 1', 'children' => ['Foo']],
-            ['label' => 'Group 2', 'children' => ['Foo']],
+            ['label' => 'One', 'children' => ['Foo']],
+            ['label' => 'Two', 'children' => ['Foo']],
         ], [
-            new DocumentationPage('one/foo', ['navigation.group' => 'Group 1']),
-            new DocumentationPage('two/foo', ['navigation.group' => 'Group 2']),
+            new DocumentationPage('one/foo'),
+            new DocumentationPage('two/foo'),
         ]);
     }
 

From bdcc4b5cdc1a4374b3ab16863ab254e8bb874a0c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:32:14 +0100
Subject: [PATCH 0551/2811] Use accessor to use fully processed data

Has slightly differing semantics, but ones that we probably want
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8096142db28..4b792447f14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -64,7 +64,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->data('navigation.group'),
+            $group ?? $route->getPage()->navigationMenuGroup(),
         );
     }
 

From 1eabf7e463ea9c108e2ebcb24f40fe36dc4d9d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 18:46:26 +0100
Subject: [PATCH 0552/2811] Experiment with using factory to create sidebar
 data

See https://github.com/hydephp/develop/pull/1568#issuecomment-1954674961
---
 .../Framework/Features/Navigation/NavItem.php | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b792447f14..b8643c128f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,13 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Factories\NavigationDataFactory;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 
 use function is_string;
 use function strtolower;
@@ -100,7 +102,25 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        $data = (new NavigationDataFactory(new CoreDataObject(
+            new FrontMatter([
+                'navigation' => [
+                    'label' => static::normalizeGroupLabel($label),
+                    'priority' => $priority,
+                    'hidden' => false,
+                    'group' => static::normalizeGroupKey($label),
+                ]
+            ]),
+            false, '', '', '', '', Str::slug($label),
+        ), $label))->toArray();
+
+        return new static(
+            '',
+            $data['label'],
+            $data['priority'],
+            $data['group'],
+            $items
+        );
     }
 
     /**
@@ -209,12 +229,6 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    // TODO: Consider moving all of these to a dropdown factory
-    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
-
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 8ae48761639e9a9f626be6d7d086a4add8256fe1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:07:28 +0100
Subject: [PATCH 0553/2811] Revert "Experiment with using factory to create
 sidebar data"

This reverts commit 1eabf7e463ea9c108e2ebcb24f40fe36dc4d9d4a.
---
 .../Framework/Features/Navigation/NavItem.php | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b8643c128f4..4b792447f14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,15 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Factories\NavigationDataFactory;
-use Hyde\Framework\Factories\Concerns\CoreDataObject;
 
 use function is_string;
 use function strtolower;
@@ -102,25 +100,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        $data = (new NavigationDataFactory(new CoreDataObject(
-            new FrontMatter([
-                'navigation' => [
-                    'label' => static::normalizeGroupLabel($label),
-                    'priority' => $priority,
-                    'hidden' => false,
-                    'group' => static::normalizeGroupKey($label),
-                ]
-            ]),
-            false, '', '', '', '', Str::slug($label),
-        ), $label))->toArray();
-
-        return new static(
-            '',
-            $data['label'],
-            $data['priority'],
-            $data['group'],
-            $items
-        );
+        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -229,6 +209,12 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
+    // TODO: Consider moving all of these to a dropdown factory
+    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
+    {
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
+    }
+
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 4bcfbeb4c91fd2df4c83f27c637c0935d8c6e1e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:11:51 +0100
Subject: [PATCH 0554/2811] Extract helper method

---
 .../GeneratesDocumentationSidebarMenu.php     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f339458686b..545355ad96d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,19 +52,12 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 $item = NavItem::fromRoute($route);
-                if ($useGroups) {
-                    $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
-
-                    $groupItem->addChild($item);
-
-                    if (! $this->items->has($groupItem->getIdentifier())) {
-                        $this->items->put($groupItem->getIdentifier(), $groupItem);
-                    }
 
-                    return;
+                if ($useGroups) {
+                    $this->addItemToGroup($item);
+                } else {
+                    $this->items->put($route->getRouteKey(), $item);
                 }
-
-                $this->items->put($route->getRouteKey(), $item);
             }
         });
 
@@ -101,6 +94,17 @@ protected function sortByPriority(): void
         })->values();
     }
 
+    protected function addItemToGroup(NavItem $item): void
+    {
+        $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
+
+        $groupItem->addChild($item);
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
+
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());

From 942ebb765c1efab9856c403404a7a573bd79c97d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:15:05 +0100
Subject: [PATCH 0555/2811] Deprecate out of scope helpers

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b792447f14..43314b92ccd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -209,12 +209,13 @@ protected static function makeIdentifier(string $label): string
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
 
-    // TODO: Consider moving all of these to a dropdown factory
+    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
     protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
 
+    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
     protected static function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it

From 2c389e4b4aea7b4bd3a243dd92479fe3c6086816 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 19:21:03 +0100
Subject: [PATCH 0556/2811] Move label normalization to generators

This means that when creating navigation dropdown items directly, you no longer get the normalization
---
 .../GeneratesDocumentationSidebarMenu.php         | 15 ++++++++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php    | 15 ++++++++++++++-
 .../src/Framework/Features/Navigation/NavItem.php | 14 +-------------
 .../tests/Feature/NavigationMenuTest.php          |  4 ++--
 packages/framework/tests/Unit/NavItemTest.php     |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 545355ad96d..5105b3b12f0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -122,11 +124,22 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        return NavItem::dropdown($label, []);
+        return NavItem::dropdown(static::normalizeGroupLabel($label), []);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
+
+    /** Todo: Move into shared class */
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9ed815aa01d..9b3adb0be56 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -11,6 +12,7 @@
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -72,7 +74,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown($group, $items));
+            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items));
         }
     }
 
@@ -90,4 +92,15 @@ protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
+
+    /** Todo: Move into shared class */
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43314b92ccd..6cfd3cae668 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -13,7 +13,6 @@
 use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
-use function strtolower;
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
@@ -100,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', static::normalizeGroupLabel($label), $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
     }
 
     /**
@@ -214,15 +213,4 @@ protected static function searchForDropdownPriorityInNavigationConfig(string $gr
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }
-
-    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 31bb0ad3f19..15c00178129 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -228,7 +228,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            NavItem::dropdown('foo', [
+            NavItem::dropdown('Foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -249,7 +249,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::dropdown('bar', [
+            NavItem::dropdown('Bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 9dab7732acb..ebcd7e675dd 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -265,7 +265,7 @@ public function testDropdownFacade()
     {
         $item = NavItem::dropdown('foo', []);
 
-        $this->assertSame('Foo', $item->getLabel());
+        $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }

From 514facdeca53f2c39eefbc930764fc03c4fb8b58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:05:32 +0100
Subject: [PATCH 0557/2811] Fix method should convert label to identifier for
 comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6cfd3cae668..764d491d72e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,7 +99,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig($label) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig(Str::slug($label)) ?? 999, $label, $items);
     }
 
     /**

From ffa86ffb6568894659e0f390079e76a15309c976 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:25:40 +0100
Subject: [PATCH 0558/2811] Add priority tests

---
 .../AutomaticNavigationConfigurationsTest.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index afa4b3fdc0f..7297b6da681 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1038,6 +1038,54 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    // Priority tests
+
+    public function testMainNavigationDropdownPriorityCanBeSetInConfig()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.order' => ['foo' => 500]]);
+
+        $this->assertMenuEquals(
+            [['label' => 'Foo', 'priority' => 500]],
+            [new MarkdownPage('foo/bar')]
+        );
+    }
+
+    public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDifferingCases()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.order' => ['hello-world' => 500]]);
+
+        $expected = [['label' => 'Hello World', 'priority' => 500]];
+        $this->assertMenuEquals($expected, [new MarkdownPage('Hello World/bar')]);
+        $this->assertMenuEquals($expected, [new MarkdownPage('hello-world/bar')]);
+        $this->assertMenuEquals($expected, [new MarkdownPage('hello world/bar')]);
+    }
+
+    public function testSidebarGroupPriorityCanBeSetInConfig()
+    {
+        $this->markTestSkipped('TODO');
+
+        config(['docs.sidebar_order' => ['foo' => 500]]);
+
+        $this->assertSidebarEquals(
+            [['label' => 'Foo', 'priority' => 500]],
+            [new DocumentationPage('foo/bar')]
+        );
+    }
+
+    public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
+    {
+        $this->markTestSkipped('TODO');
+
+        config(['docs.sidebar_order' => ['hello-world' => 500]]);
+
+        $expected = [['label' => 'Hello World', 'priority' => 500]];
+        $this->assertSidebarEquals($expected, [new DocumentationPage('Hello World/bar')]);
+        $this->assertSidebarEquals($expected, [new DocumentationPage('hello-world/bar')]);
+        $this->assertSidebarEquals($expected, [new DocumentationPage('hello world/bar')]);
+    }
+
     // Label casing tests
 
     public function testMainMenuNavigationItemCasing()

From e2e0f2d65fac3e935edfb83bad8a787842ba3219 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Feb 2024 21:30:08 +0100
Subject: [PATCH 0559/2811] Refactor to handle priority search in generators

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php | 10 +++++++++-
 .../Navigation/GeneratesMainNavigationMenu.php       |  8 +++++++-
 .../src/Framework/Features/Navigation/NavItem.php    |  9 +--------
 .../AutomaticNavigationConfigurationsTest.php        |  4 ----
 packages/framework/tests/Unit/NavItemTest.php        | 12 ------------
 5 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5105b3b12f0..22f9d0609fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function filled;
 use function collect;
 use function strtolower;
 
@@ -123,8 +124,9 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $priority = $this->searchForGroupPriorityInConfig($identifier);
 
-        return NavItem::dropdown(static::normalizeGroupLabel($label), []);
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 
     protected function searchForGroupLabelInConfig(string $identifier): ?string
@@ -142,4 +144,10 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    /** Todo: Move into shared class */
+    protected static function searchForGroupPriorityInConfig(string $groupKey): ?int
+    {
+        return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9b3adb0be56..9eaea26bde6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -74,7 +74,7 @@ protected function moveGroupedItemsIntoDropdowns(): void
 
         foreach ($dropdowns as $group => $items) {
             // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items));
+            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items, static::searchForDropdownPriorityInConfig($group)));
         }
     }
 
@@ -103,4 +103,10 @@ protected static function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    /** Todo: Move into shared class */
+    protected static function searchForDropdownPriorityInConfig(string $groupKey): ?int
+    {
+        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 764d491d72e..ffbb2ac6234 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -99,7 +98,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? static::searchForDropdownPriorityInNavigationConfig(Str::slug($label)) ?? 999, $label, $items);
+        return new static('', $label, $priority ?? 999, $label, $items);
     }
 
     /**
@@ -207,10 +206,4 @@ protected static function makeIdentifier(string $label): string
     {
         return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
     }
-
-    /** @deprecated This responsibility does not belong here. This should happen before the NavItem is created. */
-    protected static function searchForDropdownPriorityInNavigationConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7297b6da681..0fea5535c0a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1064,8 +1064,6 @@ public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDiffering
 
     public function testSidebarGroupPriorityCanBeSetInConfig()
     {
-        $this->markTestSkipped('TODO');
-
         config(['docs.sidebar_order' => ['foo' => 500]]);
 
         $this->assertSidebarEquals(
@@ -1076,8 +1074,6 @@ public function testSidebarGroupPriorityCanBeSetInConfig()
 
     public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
     {
-        $this->markTestSkipped('TODO');
-
         config(['docs.sidebar_order' => ['hello-world' => 500]]);
 
         $expected = [['label' => 'Hello World', 'priority' => 500]];
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index ebcd7e675dd..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,16 +396,4 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
-
-    public function testDefaultDropdownItemPriority()
-    {
-        $this->assertSame(999, NavItem::dropdown('foo', [])->getPriority());
-    }
-
-    public function testCanResolveDropdownItemPriorityFromConfig()
-    {
-        $this->mockConfig(['hyde.navigation.order' => ['foo' => 500]]);
-
-        $this->assertSame(500, NavItem::dropdown('foo', [])->getPriority());
-    }
 }

From 66da2e4acb9cf085407808f6b408f7bb84e3d1ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:15:34 +0100
Subject: [PATCH 0560/2811] Deprecate internal helper method

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 9eaea26bde6..777e0723cd3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -58,6 +58,7 @@ protected function generate(): void
         }
     }
 
+    /** @deprecated */
     protected function moveGroupedItemsIntoDropdowns(): void
     {
         $dropdowns = [];

From 2695ad37ef5e2eb23146812ddd258317bea939fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:18:00 +0100
Subject: [PATCH 0561/2811] Add outer conditional

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 777e0723cd3..cfe063288eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -44,6 +44,9 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
+                if ($this->useSubdirectoriesAsDropdowns()) {
+                    //
+                }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }
         });

From 657462f966aaf62a43827269587e2ea95bf87fd6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:20:15 +0100
Subject: [PATCH 0562/2811] Add todo

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cfe063288eb..b9467178d87 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -44,6 +44,7 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
+                // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     //
                 }

From e864054044aa8ead26fbbff330352ef991a150f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:20:30 +0100
Subject: [PATCH 0563/2811] Add new helper

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index b9467178d87..f86ee67cbfc 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -93,6 +93,11 @@ protected function canAddItemToDropdown(NavItem $item): bool
         return $item->getGroup() !== null;
     }
 
+    protected function canAddRouteToDropdown(Route $route): bool
+    {
+        return $route->getPage()->navigationMenuGroup() !== null;
+    }
+
     protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';

From b0f682fc192a16f30ecc5d680e3c9eab8667063b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:22:45 +0100
Subject: [PATCH 0564/2811] Add inner conditional

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f86ee67cbfc..0f62130071d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,7 +46,9 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
-                    //
+                    if ($this->canAddRouteToDropdown($route)) {
+                        //
+                    }
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From e7a9f6fd7bdb7a591499e3112767c4692e1fe7de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:30:42 +0100
Subject: [PATCH 0565/2811] Begin porting deterministic generation logic

---
 .../GeneratesMainNavigationMenu.php           | 43 ++++++++++++++++---
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0f62130071d..dea95364e9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -47,7 +48,9 @@ protected function generate(): void
                 // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     if ($this->canAddRouteToDropdown($route)) {
-                        //
+                        $this->addRouteToGroup($route);
+
+                        return;
                     }
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -58,10 +61,6 @@ protected function generate(): void
             // Since these were added explicitly by the user, we can assume they should always be shown
             $this->items->push($item);
         });
-
-        if ($this->useSubdirectoriesAsDropdowns()) {
-            $this->moveGroupedItemsIntoDropdowns();
-        }
     }
 
     /** @deprecated */
@@ -100,11 +99,45 @@ protected function canAddRouteToDropdown(Route $route): bool
         return $route->getPage()->navigationMenuGroup() !== null;
     }
 
+    protected function addRouteToGroup(Route $route): void
+    {
+        $group = $route->getPage()->navigationMenuGroup();
+
+        $groupItem = $this->getOrCreateGroupItem($group);
+
+        $groupItem->addChild(NavItem::fromRoute($route));
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
+
+    protected function getOrCreateGroupItem(string $groupName): NavItem
+    {
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
+
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $priority = $this->searchForDropdownPriorityInConfig($identifier);
+
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+    }
+
     protected function useSubdirectoriesAsDropdowns(): bool
     {
         return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
     }
 
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
+    }
+
     /** Todo: Move into shared class */
     protected static function normalizeGroupLabel(string $label): string
     {

From f505764cb02aa00d3c89528cd222bff48a76e988 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 12:57:43 +0100
Subject: [PATCH 0566/2811] Remove now unused helpers

---
 .../GeneratesMainNavigationMenu.php           | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index dea95364e9b..5e719a5ba62 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -63,37 +63,11 @@ protected function generate(): void
         });
     }
 
-    /** @deprecated */
-    protected function moveGroupedItemsIntoDropdowns(): void
-    {
-        $dropdowns = [];
-
-        foreach ($this->items as $key => $item) {
-            if ($this->canAddItemToDropdown($item)) {
-                // Buffer the item in the dropdowns array
-                $dropdowns[$item->getGroup()][] = $item;
-
-                // Remove the item from the main items collection
-                $this->items->forget($key);
-            }
-        }
-
-        foreach ($dropdowns as $group => $items) {
-            // Create a new dropdown item containing the buffered items
-            $this->items->add(NavItem::dropdown(static::normalizeGroupLabel($group), $items, static::searchForDropdownPriorityInConfig($group)));
-        }
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddItemToDropdown(NavItem $item): bool
-    {
-        return $item->getGroup() !== null;
-    }
-
     protected function canAddRouteToDropdown(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;

From 68f0d95095190ed8aac47327fff1058275efc7e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:02:12 +0100
Subject: [PATCH 0567/2811] Revert "Add todo"

This reverts commit 657462f966aaf62a43827269587e2ea95bf87fd6.
---
 .../Features/Navigation/GeneratesMainNavigationMenu.php          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 5e719a5ba62..8ff3a52ee0b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,7 +45,6 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                // TODO This conditional might not be needed as it might be evaluated by the NavDaF
                 if ($this->useSubdirectoriesAsDropdowns()) {
                     if ($this->canAddRouteToDropdown($route)) {
                         $this->addRouteToGroup($route);

From 2171de13e7d7ed7289692eb10c090c82df4f01f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:03:05 +0100
Subject: [PATCH 0568/2811] Rename helpers to be more generic

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 8ff3a52ee0b..c8bd7b95224 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,7 +46,7 @@ protected function generate(): void
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns()) {
-                    if ($this->canAddRouteToDropdown($route)) {
+                    if ($this->canAddRouteToGroup($route)) {
                         $this->addRouteToGroup($route);
 
                         return;
@@ -67,7 +67,7 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddRouteToDropdown(Route $route): bool
+    protected function canAddRouteToGroup(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;
     }

From de8069000609267aeae3b9ce5cf7102ddf805693 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:13:30 +0100
Subject: [PATCH 0569/2811] Merge with outer condition

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c8bd7b95224..49cf9ff3867 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,12 +45,10 @@ protected function generate(): void
     {
         Routes::each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->useSubdirectoriesAsDropdowns()) {
-                    if ($this->canAddRouteToGroup($route)) {
-                        $this->addRouteToGroup($route);
+                if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
+                    $this->addRouteToGroup($route);
 
-                        return;
-                    }
+                    return;
                 }
                 $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }

From 15621bfaee98392917acbb16f659c4d0a3f65ba9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:14:37 +0100
Subject: [PATCH 0570/2811] Replace closure return with else branch

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 49cf9ff3867..650cc3a8f71 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -47,10 +47,9 @@ protected function generate(): void
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);
-
-                    return;
+                } else {
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
-                $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
             }
         });
 

From 6f0e46d22a3e46805c9c9b4992da947ccb6434d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:19:50 +0100
Subject: [PATCH 0571/2811] Inline local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 22f9d0609fe..e59666dbb99 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -54,12 +54,10 @@ protected function generate(): void
 
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
-                $item = NavItem::fromRoute($route);
-
                 if ($useGroups) {
-                    $this->addItemToGroup($item);
+                    $this->addItemToGroup(NavItem::fromRoute($route));
                 } else {
-                    $this->items->put($route->getRouteKey(), $item);
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
             }
         });

From 742ba39ff7e311e657b6fe1b5cad3aa0e2e0305f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 13:24:24 +0100
Subject: [PATCH 0572/2811] Shift item construction to normalize method
 signature

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index e59666dbb99..71f723b3df9 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -55,7 +55,7 @@ protected function generate(): void
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
                 if ($useGroups) {
-                    $this->addItemToGroup(NavItem::fromRoute($route));
+                    $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
                 }
@@ -95,8 +95,10 @@ protected function sortByPriority(): void
         })->values();
     }
 
-    protected function addItemToGroup(NavItem $item): void
+    protected function addRouteToGroup(Route $route): void
     {
+        $item = NavItem::fromRoute($route);
+
         $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
 
         $groupItem->addChild($item);

From cf175b6293c09130985d21619536ae7a4f60860a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:45:46 +0100
Subject: [PATCH 0573/2811] Normalize method implementation

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 650cc3a8f71..cc0e7f0017b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -71,9 +71,9 @@ protected function canAddRouteToGroup(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $group = $route->getPage()->navigationMenuGroup();
+        $item = NavItem::fromRoute($route);
 
-        $groupItem = $this->getOrCreateGroupItem($group);
+        $groupItem = $this->getOrCreateGroupItem($item->getGroup());
 
         $groupItem->addChild(NavItem::fromRoute($route));
 

From b96a898e72936028da9f234c9b8fba988967488d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:46:57 +0100
Subject: [PATCH 0574/2811] Use the local variable

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cc0e7f0017b..28c4547fb44 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -75,7 +75,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($item->getGroup());
 
-        $groupItem->addChild(NavItem::fromRoute($route));
+        $groupItem->addChild($item);
 
         if (! $this->items->has($groupItem->getIdentifier())) {
             $this->items->put($groupItem->getIdentifier(), $groupItem);

From 034cf3fc39d2fe62877efeba461a2dce45718464 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:47:33 +0100
Subject: [PATCH 0575/2811] Create BaseMenuGenerator.php

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
new file mode 100644
index 00000000000..adf8f5baf74
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class BaseMenuGenerator
+{
+    //
+}

From d6649f0526cf036433992db959fefa8226b05909 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:06 +0100
Subject: [PATCH 0576/2811] Make class abstract

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index adf8f5baf74..62bf88953e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class BaseMenuGenerator
+abstract class BaseMenuGenerator
 {
     //
 }

From eef96d7b8af58b38300f4943bd97a7d5b90434a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:26 +0100
Subject: [PATCH 0577/2811] Mark class as experimental

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 62bf88953e0..73c31725aa0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @experimental This class may change significantly before its release.
+ */
 abstract class BaseMenuGenerator
 {
     //

From 9132c240c05b0cb07ea7fb508360c35e4c8ca4d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:48:56 +0100
Subject: [PATCH 0578/2811] Cover new base class

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0fea5535c0a..a79b92703a9 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -25,6 +25,7 @@
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Features\Navigation\BaseMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu

From 276f176f48cabcb16e5c3e4da336b24cc993db34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:49:27 +0100
Subject: [PATCH 0579/2811] Extend new base class

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 71f723b3df9..06e27d77a4e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -24,7 +24,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
-class GeneratesDocumentationSidebarMenu
+class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 28c4547fb44..cc77cf17ee2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -22,7 +22,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
-class GeneratesMainNavigationMenu
+class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From 3a8d1083b5ac31e8ea8252f613bd8bed5faeb719 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 14:50:26 +0100
Subject: [PATCH 0580/2811] Move shared property to base class

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 ++++-
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 3 ---
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 73c31725aa0..da42a8bf8a2 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,10 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Collection;
+
 /**
  * @experimental This class may change significantly before its release.
  */
 abstract class BaseMenuGenerator
 {
-    //
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    protected Collection $items;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 06e27d77a4e..c13e8b35001 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -26,9 +26,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index cc77cf17ee2..3b0a010b456 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -24,9 +24,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     protected function __construct()
     {
         $this->items = new Collection();

From f3a99ba6cb9be18cfc24def74610b2164d9934dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:13:48 +0100
Subject: [PATCH 0581/2811] Move routes property to base class

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 ++++
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index da42a8bf8a2..9348aec8c2e 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -13,4 +14,7 @@ abstract class BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
+
+    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    protected RouteCollection $routes;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c13e8b35001..6af78e7a942 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,7 +11,6 @@
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
 use function collect;
@@ -26,9 +25,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
-    protected RouteCollection $routes;
-
     protected function __construct()
     {
         $this->items = new Collection();

From 5609efa01f2f03c4d6956b309888496f3699d812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:14:32 +0100
Subject: [PATCH 0582/2811] Move constructors to base class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 ++++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 6 ------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9348aec8c2e..5bdf5f67eed 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
+use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
@@ -17,4 +19,10 @@ abstract class BaseMenuGenerator
 
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
+
+    protected function __construct()
+    {
+        $this->items = new Collection();
+        $this->routes = Routes::getRoutes(DocumentationPage::class);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6af78e7a942..5c62c01c6bb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,8 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Illuminate\Support\Collection;
-use Hyde\Foundation\Facades\Routes;
 
 use function filled;
 use function collect;
@@ -25,12 +23,6 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    protected function __construct()
-    {
-        $this->items = new Collection();
-        $this->routes = Routes::getRoutes(DocumentationPage::class);
-    }
-
     public static function handle(): DocumentationSidebar
     {
         $menu = new static();
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 3b0a010b456..fd11bcdf237 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 
 use function collect;
@@ -24,11 +23,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    protected function __construct()
-    {
-        $this->items = new Collection();
-    }
-
     public static function handle(): NavigationMenu
     {
         $menu = new static();

From b2af8b4a67bb6f64e88030ec4d6b653b308e629b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:15:48 +0100
Subject: [PATCH 0583/2811] Use routes property

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fd11bcdf237..543b4b67677 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Foundation\Facades\Routes;
 
 use function collect;
 use function strtolower;
@@ -34,7 +33,7 @@ public static function handle(): NavigationMenu
 
     protected function generate(): void
     {
-        Routes::each(function (Route $route): void {
+        $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
                 if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);

From aa33de8bbad43a6bdab4ab7124acdf9bc58b0612 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:16:36 +0100
Subject: [PATCH 0584/2811] Fix route construction logic

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5bdf5f67eed..4142ca13a15 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -23,6 +23,11 @@ abstract class BaseMenuGenerator
     protected function __construct()
     {
         $this->items = new Collection();
-        $this->routes = Routes::getRoutes(DocumentationPage::class);
+
+        if ($this instanceof GeneratesDocumentationSidebarMenu) {
+            $this->routes = Routes::getRoutes(DocumentationPage::class);
+        } else {
+            $this->routes = Routes::all();
+        }
     }
 }

From f4b336e1196ff0d638861f99a95de8502973434c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:17:30 +0100
Subject: [PATCH 0585/2811] Simplify 'if'

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 4142ca13a15..da9aef80df8 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -24,10 +24,8 @@ protected function __construct()
     {
         $this->items = new Collection();
 
-        if ($this instanceof GeneratesDocumentationSidebarMenu) {
-            $this->routes = Routes::getRoutes(DocumentationPage::class);
-        } else {
-            $this->routes = Routes::all();
-        }
+        $this->routes = $this instanceof GeneratesDocumentationSidebarMenu
+            ? Routes::getRoutes(DocumentationPage::class)
+            : Routes::all();
     }
 }

From 116ca5a0a44d30161609964d9c3af75352560a0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:27:07 +0100
Subject: [PATCH 0586/2811] Refactor to move entry point to base class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +++++++++
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index da9aef80df8..f26a29a3542 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -28,4 +28,13 @@ protected function __construct()
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
     }
+
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static();
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 543b4b67677..33b9f970590 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -22,15 +22,6 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static();
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
-
     protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {

From 65dbb894260330e9a3a0d3087236caa8a7ec9a38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:37:11 +0100
Subject: [PATCH 0587/2811] Introduce state field

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index f26a29a3542..85d5fc96c24 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -20,11 +20,15 @@ abstract class BaseMenuGenerator
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
+    protected bool $generatesSidebar;
+
     protected function __construct()
     {
         $this->items = new Collection();
 
-        $this->routes = $this instanceof GeneratesDocumentationSidebarMenu
+        $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
+
+        $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
     }

From 19cfb690ecc2bab5241cc1130b9558a88ca366b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:38:10 +0100
Subject: [PATCH 0588/2811] Contract abstract function

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 85d5fc96c24..b27fef3e8b3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -41,4 +41,6 @@ public static function handle(): NavigationMenu
 
         return new NavigationMenu($menu->items);
     }
+
+    abstract protected function generate(): void;
 }

From 5ae81ea1836fc9ceec63a07bec7029d9a19a6816 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:40:43 +0100
Subject: [PATCH 0589/2811] Introduce polymorphic state field

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index b27fef3e8b3..31c9e210e2d 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -21,6 +21,7 @@ abstract class BaseMenuGenerator
     protected RouteCollection $routes;
 
     protected bool $generatesSidebar;
+    protected bool $usesGroups;
 
     protected function __construct()
     {
@@ -31,6 +32,10 @@ protected function __construct()
         $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
+
+        $this->usesGroups = $this->generatesSidebar
+            ? $this->usesSidebarGroups()
+            : $this->useSubdirectoriesAsDropdowns();
     }
 
     public static function handle(): NavigationMenu

From 15453da8e4d73ab51743342a9f8a0354b79dc39e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:41:42 +0100
Subject: [PATCH 0590/2811] Extract helper method

---
 .../Features/Navigation/BaseMenuGenerator.php         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 31c9e210e2d..44e0e89e6da 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -33,9 +33,7 @@ protected function __construct()
             ? Routes::getRoutes(DocumentationPage::class)
             : Routes::all();
 
-        $this->usesGroups = $this->generatesSidebar
-            ? $this->usesSidebarGroups()
-            : $this->useSubdirectoriesAsDropdowns();
+        $this->usesGroups = $this->usesGroups();
     }
 
     public static function handle(): NavigationMenu
@@ -48,4 +46,11 @@ public static function handle(): NavigationMenu
     }
 
     abstract protected function generate(): void;
+
+    protected function usesGroups(): bool
+    {
+        return $this->generatesSidebar
+            ? $this->usesSidebarGroups()
+            : $this->useSubdirectoriesAsDropdowns();
+    }
 }

From 4ef3834868f495c35473eee8fcb47f52cafe39f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:42:03 +0100
Subject: [PATCH 0591/2811] Replace '?:' with if

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 44e0e89e6da..ce732b543dc 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -49,8 +49,10 @@ abstract protected function generate(): void;
 
     protected function usesGroups(): bool
     {
-        return $this->generatesSidebar
-            ? $this->usesSidebarGroups()
-            : $this->useSubdirectoriesAsDropdowns();
+        if ($this->generatesSidebar) {
+            return $this->usesSidebarGroups();
+        } else {
+            return $this->useSubdirectoriesAsDropdowns();
+        }
     }
 }

From ce2e9ddb038dd67ca772e99ea913a80a3f8d6da7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:44:18 +0100
Subject: [PATCH 0592/2811] Use added state field

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 5c62c01c6bb..a65f1f5015e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -35,7 +35,7 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $useGroups = $this->usesSidebarGroups();
+        $useGroups = $this->usesGroups;
 
         $this->routes->each(function (Route $route) use ($useGroups): void {
             if ($this->canAddRoute($route)) {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 33b9f970590..f84afbd154b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->useSubdirectoriesAsDropdowns() && $this->canAddRouteToGroup($route)) {
+                if ($this->usesGroups && $this->canAddRouteToGroup($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From 8bb755202d463381ef716282ac4e20cb103e5b59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:44:44 +0100
Subject: [PATCH 0593/2811] Inline polymorphic helper methods

---
 .../Features/Navigation/BaseMenuGenerator.php       | 13 +++++++++++--
 .../GeneratesDocumentationSidebarMenu.php           | 11 -----------
 .../Navigation/GeneratesMainNavigationMenu.php      |  5 -----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ce732b543dc..aa3900abe82 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,11 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
+use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 
+use function filled;
+
 /**
  * @experimental This class may change significantly before its release.
  */
@@ -50,9 +54,14 @@ abstract protected function generate(): void;
     protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
-            return $this->usesSidebarGroups();
+            // In order to know if we should use groups in the sidebar,
+            // we need to loop through the pages and see if they have a group set
+
+            return $this->routes->first(function (Route $route): bool {
+                return filled($route->getPage()->navigationMenuGroup());
+            }) !== null;
         } else {
-            return $this->useSubdirectoriesAsDropdowns();
+            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a65f1f5015e..af70c970c75 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -10,7 +10,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
-use function filled;
 use function collect;
 use function strtolower;
 
@@ -53,16 +52,6 @@ protected function generate(): void
         }
     }
 
-    protected function usesSidebarGroups(): bool
-    {
-        // In order to know if we should use groups in the sidebar,
-        // we need to loop through the pages and see if they have a group set
-
-        return $this->routes->first(function (Route $route): bool {
-            return filled($route->getPage()->navigationMenuGroup());
-        }) !== null;
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f84afbd154b..e981b956897 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -79,11 +79,6 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 
-    protected function useSubdirectoriesAsDropdowns(): bool
-    {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;

From 5d9e82a0d1f3b74d9d4389e2bd0a7f6050266b5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:45:52 +0100
Subject: [PATCH 0594/2811] Convert closure to arrow function

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index aa3900abe82..d5781fab250 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -57,9 +57,7 @@ protected function usesGroups(): bool
             // In order to know if we should use groups in the sidebar,
             // we need to loop through the pages and see if they have a group set
 
-            return $this->routes->first(function (Route $route): bool {
-                return filled($route->getPage()->navigationMenuGroup());
-            }) !== null;
+            return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {
             return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }

From 2778649c463670bc942dcfe12a20a484342a568f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:46:25 +0100
Subject: [PATCH 0595/2811] Clarify logic description

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index d5781fab250..9b360765859 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -55,7 +55,8 @@ protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
             // In order to know if we should use groups in the sidebar,
-            // we need to loop through the pages and see if they have a group set
+            // we need to loop through the pages and see if they have a group set.
+            // This automatically enables the sidebar grouping for all pages if at least one group is set.
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {

From 7c7f582899773a77567ca3e2f5f0dc8964ecb7cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:46:54 +0100
Subject: [PATCH 0596/2811] Format code comment

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9b360765859..282e208e1e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -54,8 +54,7 @@ abstract protected function generate(): void;
     protected function usesGroups(): bool
     {
         if ($this->generatesSidebar) {
-            // In order to know if we should use groups in the sidebar,
-            // we need to loop through the pages and see if they have a group set.
+            // In order to know if we should use groups in the sidebar, we need to loop through the pages and see if they have a group set.
             // This automatically enables the sidebar grouping for all pages if at least one group is set.
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;

From a4ab7ada916bbaf63fd88bfe3487ac9ed70cf847 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:48:20 +0100
Subject: [PATCH 0597/2811] Inline local variable

---
 .../Navigation/GeneratesDocumentationSidebarMenu.php        | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index af70c970c75..0d9f3df0238 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,11 +34,9 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $useGroups = $this->usesGroups;
-
-        $this->routes->each(function (Route $route) use ($useGroups): void {
+        $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($useGroups) {
+                if ($this->usesGroups) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));

From ae551a4c860a3bdbcab0b63d84bc0b5a255a2769 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 15:59:57 +0100
Subject: [PATCH 0598/2811] Document reasoning behind filter

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index e981b956897..d424848f011 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,7 +42,11 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation() && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
+        return $route->getPage()->showInNavigation()
+            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
+            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
+            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
+            && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
     protected function canAddRouteToGroup(Route $route): bool

From 31f7e626c5010ea1c1f0d4683e5ee5a0df5a7eef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:00:43 +0100
Subject: [PATCH 0599/2811] Document reasoning behind filter

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 0d9f3df0238..c510a4020ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,7 +52,9 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation() && ! $route->is(DocumentationPage::homeRouteName());
+        return $route->getPage()->showInNavigation()
+            // Since the index page is linked in the header, we don't want it in the sidebar
+            && ! $route->is(DocumentationPage::homeRouteName());
     }
 
     protected function sortByPriority(): void

From 03599ca916f0c86be4fbca91837becea213b3e59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:01:58 +0100
Subject: [PATCH 0600/2811] Extract parent method

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 282e208e1e1..04451f46183 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -62,4 +62,9 @@ protected function usesGroups(): bool
             return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }
     }
+
+    protected function canAddRoute(Route $route): bool
+    {
+        return $route->getPage()->showInNavigation();
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index c510a4020ba..768c4ca43e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -52,7 +52,7 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation()
+        return parent::canAddRoute($route)
             // Since the index page is linked in the header, we don't want it in the sidebar
             && ! $route->is(DocumentationPage::homeRouteName());
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index d424848f011..19d671d2b9f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,7 +42,7 @@ protected function generate(): void
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation()
+        return parent::canAddRoute($route)
             // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
             // we need to make an exception for documentation pages, which generally have a visible state, as the data is
             // also used in the sidebar. But we only want the documentation index page to be in the main navigation.

From 8b2760cac48238aa27f16926f7a29a49a6e6051f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:12:51 +0100
Subject: [PATCH 0601/2811] Swap method source order

---
 .../GeneratesDocumentationSidebarMenu.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 768c4ca43e5..cd43fcc66e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -57,18 +57,6 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function sortByPriority(): void
-    {
-        // While the items accessor sorts the items upon retrieval,
-        // we do an initial sorting here to order any groups.
-
-        $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->hasChildren()
-                ? $this->getLowestPriorityInGroup($item)
-                : $item->getPriority();
-        })->values();
-    }
-
     protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
@@ -82,6 +70,18 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
+    protected function sortByPriority(): void
+    {
+        // While the items accessor sorts the items upon retrieval,
+        // we do an initial sorting here to order any groups.
+
+        $this->items = $this->items->sortBy(function (NavItem $item): int {
+            return $item->hasChildren()
+                ? $this->getLowestPriorityInGroup($item)
+                : $item->getPriority();
+        })->values();
+    }
+
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());

From 9e01c8d470fe5b1bacbaff08eb778bd53831490c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 16:14:56 +0100
Subject: [PATCH 0602/2811] Add abstract method stub

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 04451f46183..4ddf3daf910 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -67,4 +67,7 @@ protected function canAddRoute(Route $route): bool
     {
         return $route->getPage()->showInNavigation();
     }
+
+    // Todo: Refactor to bring logic here
+    abstract protected function addRouteToGroup(Route $route): void;
 }

From d67c695f3d3c18b2299696c7e7539551206bf73a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:26:38 +0100
Subject: [PATCH 0603/2811] Rename helper method

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 19d671d2b9f..75e5e3d05c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups && $this->canAddRouteToGroup($route)) {
+                if ($this->usesGroups && $this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -49,7 +49,7 @@ protected function canAddRoute(Route $route): bool
             && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
     }
 
-    protected function canAddRouteToGroup(Route $route): bool
+    protected function canGroupRoute(Route $route): bool
     {
         return $route->getPage()->navigationMenuGroup() !== null;
     }

From d50c054fb6f1fe992257115679e8d7ce94e4950b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:28:40 +0100
Subject: [PATCH 0604/2811] Refactor to add parent method

Normalizes the implementations
---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php  | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 4ddf3daf910..06dcf0bbe51 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -68,6 +68,11 @@ protected function canAddRoute(Route $route): bool
         return $route->getPage()->showInNavigation();
     }
 
+    protected function canGroupRoute(Route $route): bool
+    {
+        return $this->usesGroups;
+    }
+
     // Todo: Refactor to bring logic here
     abstract protected function addRouteToGroup(Route $route): void;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cd43fcc66e2..56ef1c1f9c0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -36,7 +36,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups) {
+                if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 75e5e3d05c6..4414010134c 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -26,7 +26,7 @@ protected function generate(): void
     {
         $this->routes->each(function (Route $route): void {
             if ($this->canAddRoute($route)) {
-                if ($this->usesGroups && $this->canGroupRoute($route)) {
+                if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
                     $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
@@ -51,7 +51,7 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        return $route->getPage()->navigationMenuGroup() !== null;
+        return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
     protected function addRouteToGroup(Route $route): void

From ba428a8fac20fa63dbdf6bee090975fbcc7c3873 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:31:47 +0100
Subject: [PATCH 0605/2811] Add shared logic to parent class

---
 .../Features/Navigation/BaseMenuGenerator.php       | 13 ++++++++++++-
 .../GeneratesDocumentationSidebarMenu.php           | 10 +---------
 .../Navigation/GeneratesMainNavigationMenu.php      | 10 +---------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 06dcf0bbe51..0aa9c49630d 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -49,7 +49,18 @@ public static function handle(): NavigationMenu
         return new NavigationMenu($menu->items);
     }
 
-    abstract protected function generate(): void;
+    protected function generate(): void
+    {
+        $this->routes->each(function (Route $route): void {
+            if ($this->canAddRoute($route)) {
+                if ($this->canGroupRoute($route)) {
+                    $this->addRouteToGroup($route);
+                } else {
+                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                }
+            }
+        });
+    }
 
     protected function usesGroups(): bool
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 56ef1c1f9c0..7b4193d909a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,15 +34,7 @@ public static function handle(): DocumentationSidebar
 
     protected function generate(): void
     {
-        $this->routes->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                if ($this->canGroupRoute($route)) {
-                    $this->addRouteToGroup($route);
-                } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-                }
-            }
-        });
+        parent::generate();
 
         // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4414010134c..2eb0319488a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -24,15 +24,7 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     protected function generate(): void
     {
-        $this->routes->each(function (Route $route): void {
-            if ($this->canAddRoute($route)) {
-                if ($this->canGroupRoute($route)) {
-                    $this->addRouteToGroup($route);
-                } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
-                }
-            }
-        });
+        parent::generate();
 
         collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
             // Since these were added explicitly by the user, we can assume they should always be shown

From 0832057593c7d24a8a5359d79790a12c67e0191e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:33:24 +0100
Subject: [PATCH 0606/2811] Refactor to bring logic to parent

---
 .../Features/Navigation/BaseMenuGenerator.php | 20 +++++++++++++++++--
 .../GeneratesDocumentationSidebarMenu.php     | 13 ------------
 .../GeneratesMainNavigationMenu.php           | 13 ------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 0aa9c49630d..5a2d1cf5dd2 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -84,6 +84,22 @@ protected function canGroupRoute(Route $route): bool
         return $this->usesGroups;
     }
 
-    // Todo: Refactor to bring logic here
-    abstract protected function addRouteToGroup(Route $route): void;
+    protected function addRouteToGroup(Route $route): void
+    {
+        $item = NavItem::fromRoute($route);
+
+        if ($this->generatesSidebar) {
+            $groupName = $item->getGroup() ?? 'Other';
+        } else {
+            $groupName = $item->getGroup();
+        }
+
+        $groupItem = $this->getOrCreateGroupItem($groupName);
+
+        $groupItem->addChild($item);
+
+        if (! $this->items->has($groupItem->getIdentifier())) {
+            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7b4193d909a..80b8a13c4ca 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -49,19 +49,6 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function addRouteToGroup(Route $route): void
-    {
-        $item = NavItem::fromRoute($route);
-
-        $groupItem = $this->getOrCreateGroupItem($item->getGroup() ?? 'Other');
-
-        $groupItem->addChild($item);
-
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
-        }
-    }
-
     protected function sortByPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 2eb0319488a..29e933c46eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -46,19 +46,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function addRouteToGroup(Route $route): void
-    {
-        $item = NavItem::fromRoute($route);
-
-        $groupItem = $this->getOrCreateGroupItem($item->getGroup());
-
-        $groupItem->addChild($item);
-
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
-        }
-    }
-
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
         $identifier = Str::slug($groupName);

From a0a64aae3028a37be112c5a6a411e124750cb0dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:34:26 +0100
Subject: [PATCH 0607/2811] Simplify 'if'

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5a2d1cf5dd2..e470d0d8de4 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -88,11 +88,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
 
-        if ($this->generatesSidebar) {
-            $groupName = $item->getGroup() ?? 'Other';
-        } else {
-            $groupName = $item->getGroup();
-        }
+        $groupName = $this->generatesSidebar ? $item->getGroup() ?? 'Other' : $item->getGroup();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 800d1982ed477409d073824c37198f03b5385777 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:35:04 +0100
Subject: [PATCH 0608/2811] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index e470d0d8de4..87eae0adac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -88,7 +88,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::fromRoute($route);
 
-        $groupName = $this->generatesSidebar ? $item->getGroup() ?? 'Other' : $item->getGroup();
+        $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From e759d5cacf002584479ccc4ed0fbb620dc7c9ad4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:36:07 +0100
Subject: [PATCH 0609/2811] Move shared method to parent

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +++++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php     | 9 ---------
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ---------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 87eae0adac3..272f8bb801e 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -98,4 +99,12 @@ protected function addRouteToGroup(Route $route): void
             $this->items->put($groupItem->getIdentifier(), $groupItem);
         }
     }
+
+    protected function getOrCreateGroupItem(string $groupName): NavItem
+    {
+        $identifier = Str::slug($groupName);
+        $group = $this->items->get($identifier);
+
+        return $group ?? $this->createGroupItem($identifier, $groupName);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 80b8a13c4ca..8c4af350163 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -66,14 +65,6 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
-    {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
-
-        return $group ?? $this->createGroupItem($identifier, $groupName);
-    }
-
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 29e933c46eb..df7eb0339f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -46,14 +45,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
-    {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
-
-        return $group ?? $this->createGroupItem($identifier, $groupName);
-    }
-
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;

From d40f25577986f61dd655928e049dfb616aa6e671 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:49:20 +0100
Subject: [PATCH 0610/2811] Begin refactoring method to parent class

---
 .../Features/Navigation/BaseMenuGenerator.php     | 15 +++++++++++++++
 .../GeneratesDocumentationSidebarMenu.php         |  8 --------
 .../Navigation/GeneratesMainNavigationMenu.php    |  8 --------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 272f8bb801e..0129239384f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -107,4 +107,19 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
         return $group ?? $this->createGroupItem($identifier, $groupName);
     }
+
+    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    {
+        if ($this->generatesSidebar) {
+            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+            $priority = $this->searchForGroupPriorityInConfig($identifier);
+
+            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        } else {
+            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+            $priority = $this->searchForDropdownPriorityInConfig($identifier);
+
+            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 8c4af350163..d9174598e4a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -65,14 +65,6 @@ protected function getLowestPriorityInGroup(NavItem $item): int
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
-    {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
-        $priority = $this->searchForGroupPriorityInConfig($identifier);
-
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index df7eb0339f4..4e093aa3cec 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -45,14 +45,6 @@ protected function canGroupRoute(Route $route): bool
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
-    {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
-        $priority = $this->searchForDropdownPriorityInConfig($identifier);
-
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
-    }
-
     protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;

From b57a54922e035a5aa22fae82ec8f91dcea7a23b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:50:40 +0100
Subject: [PATCH 0611/2811] Extract common parts from if/else block

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 0129239384f..db07ab50d0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -110,16 +110,14 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
 
     protected function createGroupItem(string $identifier, string $groupName): NavItem
     {
+        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+
         if ($this->generatesSidebar) {
-            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
             $priority = $this->searchForGroupPriorityInConfig($identifier);
-
-            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
         } else {
-            $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
             $priority = $this->searchForDropdownPriorityInConfig($identifier);
-
-            return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
         }
+
+        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
 }

From d6c33aedf1017ab8a2ad6ac3e8a43eec1233d02f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:53:47 +0100
Subject: [PATCH 0612/2811] Simplify 'if'

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index db07ab50d0c..19085bc73f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -112,11 +112,9 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        if ($this->generatesSidebar) {
-            $priority = $this->searchForGroupPriorityInConfig($identifier);
-        } else {
-            $priority = $this->searchForDropdownPriorityInConfig($identifier);
-        }
+        $priority = $this->generatesSidebar
+            ? $this->searchForGroupPriorityInConfig($identifier)
+            : $this->searchForDropdownPriorityInConfig($identifier);
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }

From 338b453a4b355e091180c65022b73cae761d0c25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:55:56 +0100
Subject: [PATCH 0613/2811] Normalize method signatures

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 +---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 19085bc73f7..5dadc5520e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -112,9 +112,7 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
     {
         $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
 
-        $priority = $this->generatesSidebar
-            ? $this->searchForGroupPriorityInConfig($identifier)
-            : $this->searchForDropdownPriorityInConfig($identifier);
+        $priority = $this->searchForGroupPriorityInConfig($identifier);
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d9174598e4a..593b7863160 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -82,7 +82,7 @@ protected static function normalizeGroupLabel(string $label): string
     }
 
     /** Todo: Move into shared class */
-    protected static function searchForGroupPriorityInConfig(string $groupKey): ?int
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4e093aa3cec..7129b82df1f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -62,7 +62,7 @@ protected static function normalizeGroupLabel(string $label): string
     }
 
     /** Todo: Move into shared class */
-    protected static function searchForDropdownPriorityInConfig(string $groupKey): ?int
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
     }

From 9af0fbc4616bd9423a5312c10608924d3a2c14b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 17:57:59 +0100
Subject: [PATCH 0614/2811] Move shared method into base class

---
 .../Features/Navigation/BaseMenuGenerator.php       | 12 ++++++++++++
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 .../Navigation/GeneratesMainNavigationMenu.php      | 13 -------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 5dadc5520e0..82d5b6a14a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
@@ -13,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -116,4 +118,14 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
 
         return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
     }
+
+    protected static function normalizeGroupLabel(string $label): string
+    {
+        // If there is no label, and the group is a slug, we can make a title from it
+        if ($label === strtolower($label)) {
+            return Hyde::makeTitle($label);
+        }
+
+        return $label;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 593b7863160..cbd8309532e 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,13 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -70,17 +68,6 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
 
-    /** Todo: Move into shared class */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
-
     /** Todo: Move into shared class */
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 7129b82df1f..794fed0e571 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,13 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
-use function strtolower;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -50,17 +48,6 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
     }
 
-    /** Todo: Move into shared class */
-    protected static function normalizeGroupLabel(string $label): string
-    {
-        // If there is no label, and the group is a slug, we can make a title from it
-        if ($label === strtolower($label)) {
-            return Hyde::makeTitle($label);
-        }
-
-        return $label;
-    }
-
     /** Todo: Move into shared class */
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {

From d167660042914030197aacc9ce271ce48294a16e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:04:12 +0100
Subject: [PATCH 0615/2811] Change static method to instance member

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 82d5b6a14a6..249903d18a4 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -116,10 +116,10 @@ protected function createGroupItem(string $identifier, string $groupName): NavIt
 
         $priority = $this->searchForGroupPriorityInConfig($identifier);
 
-        return NavItem::dropdown(static::normalizeGroupLabel($label), [], $priority);
+        return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
     }
 
-    protected static function normalizeGroupLabel(string $label): string
+    protected function normalizeGroupLabel(string $label): string
     {
         // If there is no label, and the group is a slug, we can make a title from it
         if ($label === strtolower($label)) {

From 5ee8ce1da782a1bffe8533fb9d131cadf6808d0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:06:55 +0100
Subject: [PATCH 0616/2811] Refactor to move method into parent class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 +++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 6 ------
 .../Features/Navigation/GeneratesMainNavigationMenu.php    | 6 ------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 249903d18a4..79262d9abdb 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -128,4 +128,11 @@ protected function normalizeGroupLabel(string $label): string
 
         return $label;
     }
+
+    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
+    {
+        $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
+
+        return Config::getArray($key, [])[$groupKey] ?? null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index cbd8309532e..59737dce823 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -67,10 +67,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
     }
-
-    /** Todo: Move into shared class */
-    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
-    {
-        return Config::getArray('docs.sidebar_order', [])[$groupKey] ?? null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 794fed0e571..aa36fddf141 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -47,10 +47,4 @@ protected function searchForGroupLabelInConfig(string $identifier): ?string
     {
         return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
     }
-
-    /** Todo: Move into shared class */
-    protected function searchForGroupPriorityInConfig(string $groupKey): ?int
-    {
-        return Config::getArray('hyde.navigation.order', [])[$groupKey] ?? null;
-    }
 }

From 351ff643d588f66750bf797422e18e072e0c7f7e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:08:44 +0100
Subject: [PATCH 0617/2811] Refactor to move method into parent class

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php    | 7 +++++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php       | 6 ------
 .../Features/Navigation/GeneratesMainNavigationMenu.php    | 5 -----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 79262d9abdb..ed5f73bfbda 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -129,6 +129,13 @@ protected function normalizeGroupLabel(string $label): string
         return $label;
     }
 
+    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    {
+        $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
+
+        return Config::getArray($key, [])[$identifier] ?? null;
+    }
+
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 59737dce823..ed88032994f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
@@ -62,9 +61,4 @@ protected function getLowestPriorityInGroup(NavItem $item): int
     {
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
-
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
-    {
-        return Config::getArray('docs.sidebar_group_labels', [])[$identifier] ?? null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index aa36fddf141..33b802cf4fb 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -42,9 +42,4 @@ protected function canGroupRoute(Route $route): bool
     {
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
     }
-
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
-    {
-        return Config::getArray('hyde.navigation.labels', [])[$identifier] ?? null;
-    }
 }

From 02b327c315e52c8cbd83ab2ab068e8414ceb50fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:11:13 +0100
Subject: [PATCH 0618/2811] Normalize helper method signatures

Using groupKey instead of identifier as the latter can also apply to the pages
---
 .../Features/Navigation/BaseMenuGenerator.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ed5f73bfbda..128ee3c0cc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -104,17 +104,17 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavItem
     {
-        $identifier = Str::slug($groupName);
-        $group = $this->items->get($identifier);
+        $groupKey = Str::slug($groupName);
+        $group = $this->items->get($groupKey);
 
-        return $group ?? $this->createGroupItem($identifier, $groupName);
+        return $group ?? $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $identifier, string $groupName): NavItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavItem
     {
-        $label = $this->searchForGroupLabelInConfig($identifier) ?? $groupName;
+        $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
-        $priority = $this->searchForGroupPriorityInConfig($identifier);
+        $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
         return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
     }
@@ -129,11 +129,11 @@ protected function normalizeGroupLabel(string $label): string
         return $label;
     }
 
-    protected function searchForGroupLabelInConfig(string $identifier): ?string
+    protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        return Config::getArray($key, [])[$identifier] ?? null;
+        return Config::getArray($key, [])[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int

From f14c7dd75f82b8622b00a8695dac3e54bd56973e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 18:16:15 +0100
Subject: [PATCH 0619/2811] Remove resolved todos

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 --
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ed88032994f..efa661ffdc7 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -12,8 +12,6 @@
 /**
  * @experimental This class may change significantly before its release.
  *
- * @todo Consider making into a service which can create the sidebar as well.
- *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 33b802cf4fb..00503a07751 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,8 +13,6 @@
 /**
  * @experimental This class may change significantly before its release.
  *
- * @todo Consider making into a service which can create the sidebar as well.
- *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator

From d8c378dca4421cea0783b4cdec23f4e630ce1ada Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:15:09 +0100
Subject: [PATCH 0620/2811] Move method call into method body

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index efa661ffdc7..b7fe4ab3bc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -21,7 +21,6 @@ public static function handle(): DocumentationSidebar
         $menu = new static();
 
         $menu->generate();
-        $menu->sortByPriority();
 
         return new DocumentationSidebar($menu->items);
     }
@@ -34,6 +33,8 @@ protected function generate(): void
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
+
+        $this->sortByPriority();
     }
 
     protected function canAddRoute(Route $route): bool

From a4a8fb951cd91a7f1756ffcac4087bae3893d42d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:42:38 +0100
Subject: [PATCH 0621/2811] Add a type parameter to the base class

---
 .../Features/Navigation/BaseMenuGenerator.php          | 10 ++++++++--
 .../Navigation/GeneratesDocumentationSidebarMenu.php   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 128ee3c0cc0..d624ff198a9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -27,11 +27,17 @@ abstract class BaseMenuGenerator
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
     protected RouteCollection $routes;
 
+    /** @var class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> */
+    protected string $menuType;
+
     protected bool $generatesSidebar;
     protected bool $usesGroups;
 
-    protected function __construct()
+    /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
+    protected function __construct(string $menuType)
     {
+        $this->menuType = $menuType;
+
         $this->items = new Collection();
 
         $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
@@ -45,7 +51,7 @@ protected function __construct()
 
     public static function handle(): NavigationMenu
     {
-        $menu = new static();
+        $menu = new static(NavigationMenu::class);
 
         $menu->generate();
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index b7fe4ab3bc0..29ba4d18925 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -18,7 +18,7 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(): DocumentationSidebar
     {
-        $menu = new static();
+        $menu = new static(DocumentationSidebar::class);
 
         $menu->generate();
 

From 84500ff4e84e2bcd045db024ea304a891aebd867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:44:36 +0100
Subject: [PATCH 0622/2811] Replace type check

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index d624ff198a9..80de191640c 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -40,7 +40,7 @@ protected function __construct(string $menuType)
 
         $this->items = new Collection();
 
-        $this->generatesSidebar = $this instanceof GeneratesDocumentationSidebarMenu;
+        $this->generatesSidebar = $menuType === DocumentationSidebar::class;
 
         $this->routes = $this->generatesSidebar
             ? Routes::getRoutes(DocumentationPage::class)

From e05f5ea87014a5fab74663e3f03a13358a59019d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:48:33 +0100
Subject: [PATCH 0623/2811] Rename helper method

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 29ba4d18925..bb596fc456d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -34,7 +34,7 @@ protected function generate(): void
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
 
-        $this->sortByPriority();
+        $this->sortSidebarGroupsByLowestPriority();
     }
 
     protected function canAddRoute(Route $route): bool
@@ -44,7 +44,7 @@ protected function canAddRoute(Route $route): bool
             && ! $route->is(DocumentationPage::homeRouteName());
     }
 
-    protected function sortByPriority(): void
+    protected function sortSidebarGroupsByLowestPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,
         // we do an initial sorting here to order any groups.

From ed1e32a452330fb34ac1fdb6fa41bb52d1a0a08a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:49:13 +0100
Subject: [PATCH 0624/2811] Break out return expression

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 80de191640c..ed304d1f0a1 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -85,7 +85,11 @@ protected function usesGroups(): bool
 
     protected function canAddRoute(Route $route): bool
     {
-        return $route->getPage()->showInNavigation();
+        if (! $route->getPage()->showInNavigation()) {
+            return false;
+        }
+
+        return true;
     }
 
     protected function canGroupRoute(Route $route): bool

From ed5d0730c7def57ff342edba0d96ff401f8f0bf2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 19:50:00 +0100
Subject: [PATCH 0625/2811] Merge child method into parent block

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 5 +++++
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ed304d1f0a1..bee751211f3 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -89,6 +89,11 @@ protected function canAddRoute(Route $route): bool
             return false;
         }
 
+        if ($this->generatesSidebar) {
+            // Since the index page is linked in the header, we don't want it in the sidebar
+            return ! $route->is(DocumentationPage::homeRouteName());
+        }
+
         return true;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index bb596fc456d..6d70a536159 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 
 use function collect;
@@ -37,13 +36,6 @@ protected function generate(): void
         $this->sortSidebarGroupsByLowestPriority();
     }
 
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route)
-            // Since the index page is linked in the header, we don't want it in the sidebar
-            && ! $route->is(DocumentationPage::homeRouteName());
-    }
-
     protected function sortSidebarGroupsByLowestPriority(): void
     {
         // While the items accessor sorts the items upon retrieval,

From 85674518281f4e9cff66599cf295bebc6a89aa06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:00:53 +0100
Subject: [PATCH 0626/2811] Merge child method into parent block

---
 .../Features/Navigation/BaseMenuGenerator.php          |  7 +++++--
 .../Navigation/GeneratesMainNavigationMenu.php         | 10 ----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index bee751211f3..214dc370fdc 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -92,9 +92,12 @@ protected function canAddRoute(Route $route): bool
         if ($this->generatesSidebar) {
             // Since the index page is linked in the header, we don't want it in the sidebar
             return ! $route->is(DocumentationPage::homeRouteName());
+        } else {
+            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
+            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
+            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
+            return ! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName());
         }
-
-        return true;
     }
 
     protected function canGroupRoute(Route $route): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 00503a07751..13a80ea62fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,7 +6,6 @@
 
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
 
 use function collect;
 
@@ -27,15 +26,6 @@ protected function generate(): void
         });
     }
 
-    protected function canAddRoute(Route $route): bool
-    {
-        return parent::canAddRoute($route)
-            // While we for the most part can rely on the navigation visibility state provided by the navigation data factory,
-            // we need to make an exception for documentation pages, which generally have a visible state, as the data is
-            // also used in the sidebar. But we only want the documentation index page to be in the main navigation.
-            && (! $route->getPage() instanceof DocumentationPage || $route->is(DocumentationPage::homeRouteName()));
-    }
-
     protected function canGroupRoute(Route $route): bool
     {
         return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;

From 3ec2a3aa49bed13c9c279a7cfde563cbd2f440de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:03:59 +0100
Subject: [PATCH 0627/2811] Break out return expression

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 214dc370fdc..ccf1a50bede 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -102,7 +102,11 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        return $this->usesGroups;
+        if (! $this->usesGroups) {
+            return false;
+        }
+
+        return true;
     }
 
     protected function addRouteToGroup(Route $route): void

From ea9305e42877293f7d7f2ac54d74c2b4ed221db4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:04:44 +0100
Subject: [PATCH 0628/2811] Merge child method into parent block

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php | 4 ++++
 .../Features/Navigation/GeneratesMainNavigationMenu.php     | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index ccf1a50bede..c37a13b0126 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -106,6 +106,10 @@ protected function canGroupRoute(Route $route): bool
             return false;
         }
 
+        if (! $this->generatesSidebar) {
+            return $route->getPage()->navigationMenuGroup() !== null;
+        }
+
         return true;
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 13a80ea62fa..fec562b9b76 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Support\Models\Route;
 
 use function collect;
 
@@ -25,9 +24,4 @@ protected function generate(): void
             $this->items->push($item);
         });
     }
-
-    protected function canGroupRoute(Route $route): bool
-    {
-        return parent::canGroupRoute($route) && $route->getPage()->navigationMenuGroup() !== null;
-    }
 }

From e9aac1c7b85c0848fa7d0d111bfb04360ce5b238 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:08:44 +0100
Subject: [PATCH 0629/2811] Add todo

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 6d70a536159..d318b8d0d50 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -50,6 +50,8 @@ protected function sortSidebarGroupsByLowestPriority(): void
 
     protected function getLowestPriorityInGroup(NavItem $item): int
     {
+        // Todo: Could actually be moved to the NavItem accessor
+
         return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
     }
 }

From 59a3cc4f5923a28cc40b9b932fc3ae698476fb47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:12:49 +0100
Subject: [PATCH 0630/2811] Move logic to instance accessor

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 +------------
 .../src/Framework/Features/Navigation/NavItem.php   |  7 +++++++
 packages/framework/tests/Unit/NavItemTest.php       |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d318b8d0d50..7e041eca0be 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,8 +6,6 @@
 
 use Hyde\Pages\DocumentationPage;
 
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -42,16 +40,7 @@ protected function sortSidebarGroupsByLowestPriority(): void
         // we do an initial sorting here to order any groups.
 
         $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->hasChildren()
-                ? $this->getLowestPriorityInGroup($item)
-                : $item->getPriority();
+            return $item->getPriority();
         })->values();
     }
-
-    protected function getLowestPriorityInGroup(NavItem $item): int
-    {
-        // Todo: Could actually be moved to the NavItem accessor
-
-        return collect($item->getChildren())->min(fn (NavItem $child): int => $child->getPriority());
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ffbb2ac6234..309271bd21e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -11,6 +11,7 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function collect;
 use function is_string;
 
 /**
@@ -135,9 +136,15 @@ public function getLabel(): string
 
     /**
      * Get the priority to determine the order of the navigation item.
+     *
+     * For dropdowns, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
+        if ($this->hasChildren()) {
+            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+        }
+
         return $this->priority;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..68145381e30 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -278,7 +278,7 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(999, $item->getPriority());
+        $this->assertSame(500, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()

From df2859546674a221f123152e637f4d3843cd2d09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:17:31 +0100
Subject: [PATCH 0631/2811] Initial sorting is now no longer needed

Thanks to https://github.com/hydephp/develop/commit/59a3cc4f5923a28cc40b9b932fc3ae698476fb47
---
 .../Navigation/GeneratesDocumentationSidebarMenu.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 7e041eca0be..2a56a4cd6ed 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -30,17 +30,5 @@ protected function generate(): void
         if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
             $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
         }
-
-        $this->sortSidebarGroupsByLowestPriority();
-    }
-
-    protected function sortSidebarGroupsByLowestPriority(): void
-    {
-        // While the items accessor sorts the items upon retrieval,
-        // we do an initial sorting here to order any groups.
-
-        $this->items = $this->items->sortBy(function (NavItem $item): int {
-            return $item->getPriority();
-        })->values();
     }
 }

From b70045e1779c591d47fca5faf201decc14a6a8cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:39:03 +0100
Subject: [PATCH 0632/2811] Refactor to move post-generation logic to base
 class

---
 .../Features/Navigation/BaseMenuGenerator.php      | 13 +++++++++++++
 .../GeneratesDocumentationSidebarMenu.php          | 12 ------------
 .../Navigation/GeneratesMainNavigationMenu.php     | 14 +-------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index c37a13b0126..504bcf1680f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -14,6 +14,7 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function collect;
 use function strtolower;
 
 /**
@@ -69,6 +70,18 @@ protected function generate(): void
                 }
             }
         });
+
+        if ($this->generatesSidebar) {
+            // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
+            if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
+                $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
+            }
+        } else {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+                // Since these were added explicitly by the user, we can assume they should always be shown
+                $this->items->push($item);
+            });
+        }
     }
 
     protected function usesGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 2a56a4cd6ed..d2245aa6893 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Pages\DocumentationPage;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -21,14 +19,4 @@ public static function handle(): DocumentationSidebar
 
         return new DocumentationSidebar($menu->items);
     }
-
-    protected function generate(): void
-    {
-        parent::generate();
-
-        // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
-        if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-            $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
-        }
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fec562b9b76..fc22addb6f2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -4,10 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Facades\Config;
-
-use function collect;
-
 /**
  * @experimental This class may change significantly before its release.
  *
@@ -15,13 +11,5 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    protected function generate(): void
-    {
-        parent::generate();
-
-        collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
-            // Since these were added explicitly by the user, we can assume they should always be shown
-            $this->items->push($item);
-        });
-    }
+    //
 }

From c7459fb41f7314e195d3d13bffc6eb7d3d889d06 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:41:08 +0100
Subject: [PATCH 0633/2811] Move entrypoint to child

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 +--------
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 504bcf1680f..9bf8ae7591a 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,14 +50,7 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
+    abstract public static function handle(): NavigationMenu;
 
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fc22addb6f2..0190480ee04 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,5 +11,12 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    //
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }

From f92c1d1edd60dac52068fdc0bf635175cf9699e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:41:47 +0100
Subject: [PATCH 0634/2811] Revert "Move entrypoint to child"

This reverts commit c7459fb41f7314e195d3d13bffc6eb7d3d889d06.
---
 .../Framework/Features/Navigation/BaseMenuGenerator.php  | 9 ++++++++-
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 +--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9bf8ae7591a..504bcf1680f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,7 +50,14 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    abstract public static function handle(): NavigationMenu;
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 
     protected function generate(): void
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0190480ee04..fc22addb6f2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,12 +11,5 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
-    {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
-    }
+    //
 }

From 372ee5377ff1f1102e50cbbd0f13d5803d95d790 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:42:03 +0100
Subject: [PATCH 0635/2811] Copy entrypoint to child

---
 .../Features/Navigation/GeneratesMainNavigationMenu.php  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index fc22addb6f2..0190480ee04 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,5 +11,12 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    //
+    public static function handle(): NavigationMenu
+    {
+        $menu = new static(NavigationMenu::class);
+
+        $menu->generate();
+
+        return new NavigationMenu($menu->items);
+    }
 }

From 5aa4b4e6d6e33329a408a8f65068b1b6c5346665 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:45:11 +0100
Subject: [PATCH 0636/2811] Make base entrypoint dynamic

---
 .../Framework/Features/Navigation/BaseMenuGenerator.php   | 7 ++++---
 .../Navigation/GeneratesDocumentationSidebarMenu.php      | 8 ++------
 .../Features/Navigation/GeneratesMainNavigationMenu.php   | 8 ++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 504bcf1680f..b07ac46a1e7 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -50,13 +50,14 @@ protected function __construct(string $menuType)
         $this->usesGroups = $this->usesGroups();
     }
 
-    public static function handle(): NavigationMenu
+    /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
+    public static function handle(string $menuType): NavigationMenu
     {
-        $menu = new static(NavigationMenu::class);
+        $menu = new static($menuType);
 
         $menu->generate();
 
-        return new NavigationMenu($menu->items);
+        return new $menuType($menu->items);
     }
 
     protected function generate(): void
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index d2245aa6893..08b6ca3b4e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,12 +11,8 @@
  */
 class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
-    public static function handle(): DocumentationSidebar
+    public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        $menu = new static(DocumentationSidebar::class);
-
-        $menu->generate();
-
-        return new DocumentationSidebar($menu->items);
+        return parent::handle($menuType);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 0190480ee04..4bd8014ce1a 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,12 +11,8 @@
  */
 class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
-    public static function handle(): NavigationMenu
+    public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        $menu = new static(NavigationMenu::class);
-
-        $menu->generate();
-
-        return new NavigationMenu($menu->items);
+        return parent::handle($menuType);
     }
 }

From 8d16f180397539526d8942a488c8eb25d261bdc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:46:08 +0100
Subject: [PATCH 0637/2811] Union type auxiliary return type

---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index b07ac46a1e7..9b3ca985b8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -51,7 +51,7 @@ protected function __construct(string $menuType)
     }
 
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
-    public static function handle(string $menuType): NavigationMenu
+    public static function handle(string $menuType): NavigationMenu|DocumentationSidebar
     {
         $menu = new static($menuType);
 

From 5a16f7ad753fcb1e3c423adcd134ca14e62798f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:49:13 +0100
Subject: [PATCH 0638/2811] Revert "Make class abstract"

This reverts commit d6649f0526cf036433992db959fefa8226b05909.
---
 .../src/Framework/Features/Navigation/BaseMenuGenerator.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
index 9b3ca985b8f..357e68618a9 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
@@ -20,7 +20,7 @@
 /**
  * @experimental This class may change significantly before its release.
  */
-abstract class BaseMenuGenerator
+class BaseMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;

From 5fca759959846ac624ee41726b61227b2be361ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:49:47 +0100
Subject: [PATCH 0639/2811] Replace parent syntax with direct parent call

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 08b6ca3b4e2..95fb06eb6b4 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,6 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        return parent::handle($menuType);
+        return BaseMenuGenerator::handle($menuType);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4bd8014ce1a..44d02e2af42 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,6 +13,6 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        return parent::handle($menuType);
+        return BaseMenuGenerator::handle($menuType);
     }
 }

From 1b85b6857867dd1db58274af9f959326d976c15d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:50:51 +0100
Subject: [PATCH 0640/2811] Hardcode call type

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 95fb06eb6b4..a4bcd561a30 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -13,6 +13,6 @@ class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
-        return BaseMenuGenerator::handle($menuType);
+        return BaseMenuGenerator::handle(DocumentationSidebar::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 44d02e2af42..29789c4558b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -13,6 +13,6 @@ class GeneratesMainNavigationMenu extends BaseMenuGenerator
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {
-        return BaseMenuGenerator::handle($menuType);
+        return BaseMenuGenerator::handle(NavigationMenu::class);
     }
 }

From 4f1bedd01b3134823fb6100b68b9f4c4c69054f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:52:13 +0100
Subject: [PATCH 0641/2811] Generators no longer need to extend base generator

All logic has been moved to the base class
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a4bcd561a30..f8719c3648f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,7 +9,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
-class GeneratesDocumentationSidebarMenu extends BaseMenuGenerator
+class GeneratesDocumentationSidebarMenu
 {
     public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 29789c4558b..f3b3b2d290f 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,7 +9,7 @@
  *
  * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
-class GeneratesMainNavigationMenu extends BaseMenuGenerator
+class GeneratesMainNavigationMenu
 {
     public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
     {

From 5bfa158a21b2798e4e0c12f88f492c1a25040c1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:53:24 +0100
Subject: [PATCH 0642/2811] Remove unused parameters

Was only needed for parent compatibility
---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index f8719c3648f..200fceda1b5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    public static function handle(string $menuType = DocumentationSidebar::class): DocumentationSidebar
+    public static function handle(): DocumentationSidebar
     {
         return BaseMenuGenerator::handle(DocumentationSidebar::class);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index f3b3b2d290f..261a851264d 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,7 +11,7 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public static function handle(string $menuType = NavigationMenu::class): NavigationMenu
+    public static function handle(): NavigationMenu
     {
         return BaseMenuGenerator::handle(NavigationMenu::class);
     }

From 22b3cac7a95ba19ae194eabf00a3505f0d0b7bd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:53:36 +0100
Subject: [PATCH 0643/2811] Remove crosslinks

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 --
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index 200fceda1b5..a3b851e2ec3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -6,8 +6,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @see \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  */
 class GeneratesDocumentationSidebarMenu
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 261a851264d..4e7fda16843 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -6,8 +6,6 @@
 
 /**
  * @experimental This class may change significantly before its release.
- *
- * @see \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  */
 class GeneratesMainNavigationMenu
 {

From 84bec87842caf66e584c9b833419fdbcd26d7b7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:54:19 +0100
Subject: [PATCH 0644/2811] Rename base generator class for it to be standalone

---
 .../Features/Navigation/GeneratesDocumentationSidebarMenu.php   | 2 +-
 .../Features/Navigation/GeneratesMainNavigationMenu.php         | 2 +-
 .../{BaseMenuGenerator.php => NavigationMenuGenerator.php}      | 2 +-
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{BaseMenuGenerator.php => NavigationMenuGenerator.php} (99%)

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index a3b851e2ec3..ee07cac9ed3 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -11,6 +11,6 @@ class GeneratesDocumentationSidebarMenu
 {
     public static function handle(): DocumentationSidebar
     {
-        return BaseMenuGenerator::handle(DocumentationSidebar::class);
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index 4e7fda16843..c8c43230012 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -11,6 +11,6 @@ class GeneratesMainNavigationMenu
 {
     public static function handle(): NavigationMenu
     {
-        return BaseMenuGenerator::handle(NavigationMenu::class);
+        return NavigationMenuGenerator::handle(NavigationMenu::class);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
similarity index 99%
rename from packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 357e68618a9..45c6986ab99 100644
--- a/packages/framework/src/Framework/Features/Navigation/BaseMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -20,7 +20,7 @@
 /**
  * @experimental This class may change significantly before its release.
  */
-class BaseMenuGenerator
+class NavigationMenuGenerator
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index a79b92703a9..b0de676cf72 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -25,7 +25,7 @@
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Features\Navigation\BaseMenuGenerator
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu

From e06f1c027debcabe318a223b9d34f89e91f188f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:55:21 +0100
Subject: [PATCH 0645/2811] Inline `GeneratesDocumentationSidebarMenu::handle`
 method

---
 .../src/Foundation/Providers/NavigationServiceProvider.php   | 5 +++--
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 2 +-
 .../Navigation/GeneratesDocumentationSidebarMenu.php         | 5 +----
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 6b10ab8d13f..2ef94f373ab 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -7,8 +7,9 @@
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\NavigationManager;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
-use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -22,7 +23,7 @@ public function register(): void
 
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
-            $this->app->make(NavigationManager::class)->registerMenu('sidebar', GeneratesDocumentationSidebarMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index cb9433ed093..03829479837 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -18,7 +18,7 @@ class DocumentationSidebar extends NavigationMenu
     /** @deprecated Will be moved to an action */
     public static function create(): static
     {
-        return GeneratesDocumentationSidebarMenu::handle();
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function hasGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
index ee07cac9ed3..07c3d77b86b 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
@@ -9,8 +9,5 @@
  */
 class GeneratesDocumentationSidebarMenu
 {
-    public static function handle(): DocumentationSidebar
-    {
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
+    //
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index b0de676cf72..cfcb1d98bfc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,8 +18,9 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
-use Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1246,7 +1247,7 @@ class AssertableNavigationMenu
     public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
-            ? GeneratesDocumentationSidebarMenu::handle()->getItems()
+            ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
             : GeneratesMainNavigationMenu::handle()->getItems();
 
         $this->test = $test;

From eb5d79eea61906b9341e6ddbb7f5fdc276196e00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:56:48 +0100
Subject: [PATCH 0646/2811] Inline `GeneratesMainNavigationMenu::handle` method

---
 .../src/Foundation/Providers/NavigationServiceProvider.php   | 4 ++--
 .../Features/Navigation/GeneratesMainNavigationMenu.php      | 5 +----
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php      | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 2ef94f373ab..4e62984f336 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,10 +6,10 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 class NavigationServiceProvider extends ServiceProvider
 {
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', GeneratesMainNavigationMenu::handle());
+            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
index c8c43230012..99e50dce6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
@@ -9,8 +9,5 @@
  */
 class GeneratesMainNavigationMenu
 {
-    public static function handle(): NavigationMenu
-    {
-        return NavigationMenuGenerator::handle(NavigationMenu::class);
-    }
+    //
 }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cfcb1d98bfc..8c17b45ce9a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,9 +18,9 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
 
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
@@ -1248,7 +1248,7 @@ public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
             ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
-            : GeneratesMainNavigationMenu::handle()->getItems();
+            : NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
 
         $this->test = $test;
     }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 15c00178129..7dfce49320d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
-use Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
@@ -271,6 +271,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
 
     protected function createNavigationMenu(): NavigationMenu
     {
-        return GeneratesMainNavigationMenu::handle();
+        return NavigationMenuGenerator::handle(NavigationMenu::class);
     }
 }

From f1786340742ec5bee60099f454013f16ba15e07f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:58:40 +0100
Subject: [PATCH 0647/2811] Remove coverage annotations for old generators

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c17b45ce9a..c555fc9890a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -28,8 +28,6 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\GeneratesDocumentationSidebarMenu
- * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase

From 93056d3ffeeca585245b8a5e93ac75e1503965d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:59:24 +0100
Subject: [PATCH 0648/2811] Remove coverage annotation for old generator

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 7dfce49320d..22b32988d6b 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -15,7 +15,6 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\GeneratesMainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest

From 647aec057c83cf3b08dc188361d83c4e2ef5a1be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 20:59:50 +0100
Subject: [PATCH 0649/2811] Delete GeneratesDocumentationSidebarMenu.php

---
 .../GeneratesDocumentationSidebarMenu.php           | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
deleted file mode 100644
index 07c3d77b86b..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesDocumentationSidebarMenu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @experimental This class may change significantly before its release.
- */
-class GeneratesDocumentationSidebarMenu
-{
-    //
-}

From 0668a817aee0e90dedaa1cdf3a28365c6acd7ef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:00:01 +0100
Subject: [PATCH 0650/2811] Delete GeneratesMainNavigationMenu.php

---
 .../Navigation/GeneratesMainNavigationMenu.php      | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
deleted file mode 100644
index 99e50dce6d5..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GeneratesMainNavigationMenu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @experimental This class may change significantly before its release.
- */
-class GeneratesMainNavigationMenu
-{
-    //
-}

From 1185f289224dd6dca3690685d22db689a0ad4f37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:03:03 +0100
Subject: [PATCH 0651/2811] Assert the type is one of two supported menus

The ternary logic used in the class requires that only one of these two classes are used
---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 45c6986ab99..93dd3fd7b3a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -37,6 +37,8 @@ class NavigationMenuGenerator
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
     protected function __construct(string $menuType)
     {
+        assert(in_array($menuType, [NavigationMenu::class, DocumentationSidebar::class]));
+
         $this->menuType = $menuType;
 
         $this->items = new Collection();

From cc2acab7ad506c0e9881e30c4ee0a060585e6030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:03:16 +0100
Subject: [PATCH 0652/2811] Import used functions

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 93dd3fd7b3a..55366fc2561 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -14,7 +14,9 @@
 use Hyde\Foundation\Kernel\RouteCollection;
 
 use function filled;
+use function assert;
 use function collect;
+use function in_array;
 use function strtolower;
 
 /**

From 1d77ae10351d9899f480d3554fad983f2e616d81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:05:38 +0100
Subject: [PATCH 0653/2811] Cover the new generator class

---
 packages/framework/tests/Feature/NavigationMenuTest.php          | 1 +
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 22b32988d6b..1114c5735d4 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -16,6 +16,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index c7d79c3faad..6cecf8bfb13 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -18,6 +18,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem

From ca328ccd00f7282d7c02cd217ead5af12ead6738 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:05:50 +0100
Subject: [PATCH 0654/2811] Cover the main menu class

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c555fc9890a..d16bf60aee3 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -28,6 +28,7 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase

From 447b65bb419716689e9f7946cb82c2076a097f8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:17:25 +0100
Subject: [PATCH 0655/2811] Add additional priority test

---
 .../AutomaticNavigationConfigurationsTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index d16bf60aee3..e50c9015afc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1028,6 +1028,35 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroup()
         ]);
     }
 
+    public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroupUnlessGroupPriorityIsLower()
+    {
+        $this->assertSidebarEquals([
+            'A', 'B', 'C',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 10]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 30]),
+        ]);
+
+        $this->assertSidebarEquals([
+            'C', 'B', 'A',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 30]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+
+        config(['docs.sidebar_order' => ['a' => 5]]);
+
+        $this->assertSidebarEquals([
+            'A', 'C', 'B',
+        ], [
+            new DocumentationPage('foo', ['navigation.group' => 'a', 'navigation.priority' => 30]),
+            new DocumentationPage('bar', ['navigation.group' => 'b', 'navigation.priority' => 20]),
+            new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
+        ]);
+    }
+
     public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped()
     {
         $this->assertSidebarEquals([

From 097f69b2256f8f8fc37071d21b1d141ec72cb7d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:22:44 +0100
Subject: [PATCH 0656/2811] Only apply dynamic priority for sidebar groups

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 +++--
 packages/framework/tests/Unit/NavItemTest.php                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 309271bd21e..d8156963f27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -137,11 +138,11 @@ public function getLabel(): string
     /**
      * Get the priority to determine the order of the navigation item.
      *
-     * For dropdowns, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren()) {
+        if ($this->hasChildren() && $this->children[0]->getDestination()->getPage() instanceof DocumentationPage) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 68145381e30..f2caf94538c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -278,7 +278,7 @@ public function testDropdownFacadeWithChildren()
 
         $item = NavItem::dropdown('foo', $children);
         $this->assertSame($children, $item->getChildren());
-        $this->assertSame(500, $item->getPriority());
+        $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()

From a1e66bb2fd3b6f8794c5bf1127999e70e46c0979 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:27:05 +0100
Subject: [PATCH 0657/2811] Replace instanceof with class constant comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d8156963f27..37c19993917 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -142,7 +142,7 @@ public function getLabel(): string
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getDestination()->getPage() instanceof DocumentationPage) {
+        if ($this->hasChildren() && $this->children[0]->getDestination()->getPageClass() === DocumentationPage::class) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From 120777beeea9fc821ab4dcae2e0f228a182819e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:34:36 +0100
Subject: [PATCH 0658/2811] Import used function

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 37c19993917..fbca2681c6c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -12,6 +12,7 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
+use function min;
 use function collect;
 use function is_string;
 

From 6a3d8fb86c83cf948beec90a6822e90fb5ad8147 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 21 Feb 2024 21:38:21 +0100
Subject: [PATCH 0659/2811] Add design note to todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index fbca2681c6c..69b8b18bac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -213,6 +213,6 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier
+        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier (start by making a test to see if it's even possible to add a differing label)
     }
 }

From 7d59d30d750918ddfb485430c874e85bebd35723 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 11:54:15 +0100
Subject: [PATCH 0660/2811] Test can mix subdirectory dropdowns with front
 matter dropdowns

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e50c9015afc..cb57c06cc37 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -532,6 +532,18 @@ public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGi
         ]);
     }
 
+    public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        $this->assertMenuEquals([
+            ['label' => 'Foo', 'children' => ['Bar', 'Baz']],
+        ], [
+            new MarkdownPage('foo/bar'),
+            new MarkdownPage('foo/baz', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()

From 04718d4f59faca75487a7d601ca7ef997c2222dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 11:55:32 +0100
Subject: [PATCH 0661/2811] Test can mix subdirectory groups with front matter
 groups

---
 .../Feature/AutomaticNavigationConfigurationsTest.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index cb57c06cc37..14fc325dd9b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1080,6 +1080,16 @@ public function testAllSidebarItemsArePlacedInGroupsWhenAtLeastOneItemIsGrouped(
         ]);
     }
 
+    public function testSidebarCanMixSubdirectoryGroupsWithFrontMatterGroups()
+    {
+        $this->assertSidebarEquals([
+            ['label' => 'Foo', 'children' => ['Bar', 'Baz']],
+        ], [
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz', ['navigation.group' => 'foo']),
+        ]);
+    }
+
     // Priority tests
 
     public function testMainNavigationDropdownPriorityCanBeSetInConfig()

From ac4e6892bfd883730dcfac5ca9c11c925380bf38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 12:07:20 +0100
Subject: [PATCH 0662/2811] Inline deprecated helper method

---
 .../Navigation/DocumentationSidebar.php       |  6 --
 .../Services/DocumentationSidebarTest.php     | 65 ++++++++++---------
 .../tests/Feature/SidebarViewTest.php         | 11 ++--
 3 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 03829479837..f0943a3b088 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -15,12 +15,6 @@ class DocumentationSidebar extends NavigationMenu
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /** @deprecated Will be moved to an action */
-    public static function create(): static
-    {
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6cecf8bfb13..b83d3226c83 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -15,6 +15,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -41,7 +42,7 @@ protected function tearDown(): void
 
     public function testSidebarCanBeCreated()
     {
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertInstanceOf(DocumentationSidebar::class, $sidebar);
     }
@@ -50,7 +51,7 @@ public function testSidebarItemsAreAddedAutomatically()
     {
         $this->createTestFiles();
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(5, $sidebar->getItems());
     }
@@ -60,7 +61,7 @@ public function testIndexPageIsRemovedFromSidebar()
         $this->createTestFiles();
         Filesystem::touch('_docs/index.md');
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(5, $sidebar->getItems());
     }
 
@@ -69,7 +70,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
         $this->createTestFiles();
         File::put(Hyde::path('_docs/test.md'), "---\nnavigation:\n    hidden: true\n---\n\n# Foo");
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(5, $sidebar->getItems());
     }
 
@@ -86,7 +87,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
                 NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
@@ -107,7 +108,7 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
                 NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
                 NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
@@ -115,7 +116,7 @@ public function testSidebarItemPriorityCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
+        $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
@@ -124,7 +125,7 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
 
         Config::set('docs.sidebar_order', ['foo']);
 
-        $this->assertEquals(25, DocumentationSidebar::create()->getItems()->first()->getPriority());
+        $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
@@ -146,26 +147,26 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
                 NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
                 NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(DocumentationSidebar::create()->getItems()->first()->getChildren())->first()->getGroup());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
     {
-        $this->assertFalse(DocumentationSidebar::create()->hasGroups());
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreGroups()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreMultipleGroups()
@@ -173,7 +174,7 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroups()
         $this->makePage('foo', ['navigation.group' => 'bar']);
         $this->makePage('bar', ['navigation.group' => 'baz']);
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefaults()
@@ -182,7 +183,7 @@ public function testHasGroupsReturnsTrueWhenThereAreMultipleGroupsMixedWithDefau
         $this->makePage('bar', ['navigation.group' => 'baz']);
         $this->makePage('baz');
 
-        $this->assertTrue(DocumentationSidebar::create()->hasGroups());
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->hasGroups());
     }
 
     public function testGetItemsInGroupDoesNotIncludeDocsIndex()
@@ -192,26 +193,26 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
 
         $this->assertEquals(
             collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
-            DocumentationSidebar::create()->getItems()
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
 
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo-bar'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -222,9 +223,9 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz']);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -235,9 +236,9 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -248,9 +249,9 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('bar'));
-        $this->assertTrue(DocumentationSidebar::create()->isGroupActive('baz'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -258,7 +259,7 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'bar', 'navigation.label' => 'Foo']);
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(2, $sidebar->getItems());
 
         $this->assertEquals(
@@ -279,7 +280,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->makePage('foo', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
         $this->makePage('bar', ['navigation.group' => 'foo', 'navigation.label' => 'Foo']);
 
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         $this->assertCount(1, $sidebar->getItems());
 
         $this->assertEquals(
@@ -298,13 +299,13 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
         $this->makePage('index');
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(DocumentationSidebar::create()->isGroupActive('foo'));
+        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
     {
         Filesystem::touch('_docs/index.md');
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
@@ -317,7 +318,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
     {
         $this->createTestFiles(1);
         Filesystem::touch('_docs/index.md');
-        $sidebar = DocumentationSidebar::create();
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 2dcd7646d91..deab74d376d 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -11,6 +11,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Contracts\View\View;
 use Throwable;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 use function config;
 use function file_put_contents;
@@ -49,7 +50,7 @@ public function testBaseSidebar()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
@@ -102,7 +103,7 @@ public function testBaseSidebarWithItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
     }
 
@@ -130,7 +131,7 @@ public function testSidebarWithGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -162,7 +163,7 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -187,7 +188,7 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => DocumentationSidebar::create(),
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 

From 7f9b0c6adde2a89525261ed925bb69c66e268098 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 12:12:46 +0100
Subject: [PATCH 0663/2811] Split out base navigation menu class from main menu
 class

---
 .../Providers/NavigationServiceProvider.php   |  4 +--
 .../Navigation/DocumentationSidebar.php       |  1 -
 .../Navigation/MainNavigationMenu.php         | 10 +++++++
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  4 +--
 .../AutomaticNavigationConfigurationsTest.php |  6 ++--
 .../tests/Feature/NavigationManagerTest.php   |  6 ++--
 .../tests/Feature/NavigationMenuTest.php      | 10 +++----
 .../tests/Unit/NavigationMenuUnitTest.php     | 28 +++++++++----------
 .../Unit/Views/NavigationBrandViewTest.php    |  4 +--
 10 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 4e62984f336..857588c3dd3 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -22,7 +22,7 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(NavigationMenu::class));
+            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f0943a3b088..60bf526c7aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -9,7 +9,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-/** @deprecated Use the new NavigationMenu class instead */
 class DocumentationSidebar extends NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
new file mode 100644
index 00000000000..96b228fa967
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class MainNavigationMenu extends NavigationMenu
+{
+    //
+}
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 23e3ba7b3f3..986dd7076be 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -15,7 +15,7 @@
  * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
  * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
  */
-class NavigationMenu
+abstract class NavigationMenu
 {
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 55366fc2561..bd31784144e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -39,7 +39,7 @@ class NavigationMenuGenerator
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
     protected function __construct(string $menuType)
     {
-        assert(in_array($menuType, [NavigationMenu::class, DocumentationSidebar::class]));
+        assert(in_array($menuType, [MainNavigationMenu::class, DocumentationSidebar::class]));
 
         $this->menuType = $menuType;
 
@@ -55,7 +55,7 @@ protected function __construct(string $menuType)
     }
 
     /** @param class-string<\Hyde\Framework\Features\Navigation\NavigationMenu> $menuType */
-    public static function handle(string $menuType): NavigationMenu|DocumentationSidebar
+    public static function handle(string $menuType): MainNavigationMenu|DocumentationSidebar
     {
         $menu = new static($menuType);
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 14fc325dd9b..2c9e9a27288 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
@@ -28,7 +28,7 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
@@ -1298,7 +1298,7 @@ public function __construct(TestCase $test, $sidebar = false)
     {
         $this->items = $sidebar
             ? NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
-            : NavigationMenuGenerator::handle(NavigationMenu::class)->getItems();
+            : NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems();
 
         $this->test = $test;
     }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 97f2c1b83a9..41558e14a69 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -17,7 +17,7 @@ public function testCanRegisterMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(NavigationMenu::class);
+        $menu = $this->createMock(MainNavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $reflection = new \ReflectionClass($manager);
@@ -33,7 +33,7 @@ public function testCanGetMenu()
     {
         $manager = new NavigationManager();
 
-        $menu = $this->createMock(NavigationMenu::class);
+        $menu = $this->createMock(MainNavigationMenu::class);
         $manager->registerMenu('foo', $menu);
 
         $retrievedMenu = $manager->getMenu('foo');
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 1114c5735d4..aed4d880f64 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
@@ -15,7 +15,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
@@ -24,7 +24,7 @@ class NavigationMenuTest extends TestCase
 {
     public function testConstructor()
     {
-        $this->assertInstanceOf(NavigationMenu::class, $this->createNavigationMenu());
+        $this->assertInstanceOf(MainNavigationMenu::class, $this->createNavigationMenu());
     }
 
     public function testGenerateMethodCreatesCollectionOfNavItems()
@@ -269,8 +269,8 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
-    protected function createNavigationMenu(): NavigationMenu
+    protected function createNavigationMenu(): MainNavigationMenu
     {
-        return NavigationMenuGenerator::handle(NavigationMenu::class);
+        return NavigationMenuGenerator::handle(MainNavigationMenu::class);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5242dd9f317..dc935d49329 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -8,10 +8,10 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
  */
@@ -19,56 +19,56 @@ class NavigationMenuUnitTest extends UnitTestCase
 {
     public function testCanConstruct()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu());
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());
     }
 
     public function testCanConstructWithItemsArray()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu($this->getItems()));
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu($this->getItems()));
     }
 
     public function testCanConstructWithItemsArrayable()
     {
-        $this->assertInstanceOf(NavigationMenu::class, new NavigationMenu(collect($this->getItems())));
+        $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu(collect($this->getItems())));
     }
 
     public function testGetItemsReturnsCollection()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu())->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu())->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArray()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu($this->getItems()))->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu($this->getItems()))->getItems());
     }
 
     public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
     {
-        $this->assertInstanceOf(Collection::class, (new NavigationMenu(collect($this->getItems())))->getItems());
+        $this->assertInstanceOf(Collection::class, (new MainNavigationMenu(collect($this->getItems())))->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
         $items = $this->getItems();
 
-        $this->assertSame($items, (new NavigationMenu($items))->getItems()->all());
+        $this->assertSame($items, (new MainNavigationMenu($items))->getItems()->all());
     }
 
     public function testGetItemsReturnsItemsWhenSuppliedArrayable()
     {
         $items = $this->getItems();
 
-        $this->assertSame($items, (new NavigationMenu(collect($items)))->getItems()->all());
+        $this->assertSame($items, (new MainNavigationMenu(collect($items)))->getItems()->all());
     }
 
     public function testGetItemsReturnsEmptyArrayWhenNoItems()
     {
-        $this->assertSame([], (new NavigationMenu())->getItems()->all());
+        $this->assertSame([], (new MainNavigationMenu())->getItems()->all());
     }
 
     public function testCanAddItems()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item = new NavItem(new ExternalRoute('/'), 'Home');
 
         $menu->add($item);
@@ -79,7 +79,7 @@ public function testCanAddItems()
 
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item1 = new NavItem(new ExternalRoute('/'), 'Home');
         $item2 = new NavItem(new ExternalRoute('/about'), 'About');
         $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
@@ -93,7 +93,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
 
     public function testItemsAreSortedByPriority()
     {
-        $menu = new NavigationMenu();
+        $menu = new MainNavigationMenu();
         $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
         $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
         $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 47fe6c7c640..a12a053b608 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Testing\TestCase;
 
 /**
@@ -22,7 +22,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => new NavigationMenu(),
+            'navigation' => new MainNavigationMenu(),
         ])->render();
     }
 

From c9ba7f2f195cb17cd56a06cf60ab0e5d0ea04c14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 13:05:22 +0100
Subject: [PATCH 0664/2811] Deprecate NavigationManager

---
 .../src/Framework/Features/Navigation/NavigationManager.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 7fc836be42c..9313fb65bd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -8,6 +8,8 @@
 
 /**
  * Manages the navigation menus for the project.
+ *
+ * @deprecated Move to extension
  */
 class NavigationManager
 {

From 4c5e39a5fe11f5645ac1e2f28e2d644c2274a6ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 13:59:51 +0100
Subject: [PATCH 0665/2811] Remove redundant property already inherited by
 parent

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 60bf526c7aa..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,14 +6,10 @@
 
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 class DocumentationSidebar extends NavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
-    protected Collection $items;
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 90a231e1d6f86230ea9d5b686334649a3a9a383b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 14:01:24 +0100
Subject: [PATCH 0666/2811] Add coverage annotations

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 packages/framework/tests/Feature/NavigationMenuTest.php          | 1 +
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 packages/framework/tests/Unit/NavigationMenuUnitTest.php         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 2c9e9a27288..c00e56054b6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -29,6 +29,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index aed4d880f64..a4ba8a92ce8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -15,6 +15,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  *
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index b83d3226c83..2e3fcbe6344 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -20,6 +20,7 @@
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index dc935d49329..1b0f9a08a58 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -11,6 +11,7 @@
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest

From b17b7e3476a5f2f5ef621bd4a2f1715fdf508cbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 14:07:26 +0100
Subject: [PATCH 0667/2811] Add static menu container access shorthands

---
 .../Navigation/DocumentationSidebar.php       |  7 ++++++
 .../Navigation/MainNavigationMenu.php         |  7 +++++-
 .../tests/Feature/NavigationManagerTest.php   | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..e8aeec5cab6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,15 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    public static function get(): static
+    {
+        return app('navigation')->getMenu('sidebar');
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..b94dc0778ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    public static function get(): static
+    {
+        return app('navigation')->getMenu('main');
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 41558e14a69..b39e299f039 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -6,9 +6,13 @@
 
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
 
 /**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\NavigationManager
  */
 class NavigationManagerTest extends TestCase
@@ -48,4 +52,24 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation')->getMenu('main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation')->getMenu('sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        $this->assertSame(MainNavigationMenu::get(), app('navigation')->getMenu('main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        $this->assertSame(DocumentationSidebar::get(), app('navigation')->getMenu('sidebar'));
+    }
 }

From e4957b863746b631c671d6b149767f62aa94fbb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:17:35 +0100
Subject: [PATCH 0668/2811] Throw when trying to get uninitialized menu before
 boot

---
 .../src/Framework/Features/Navigation/NavigationManager.php  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 9313fb65bd0..624953fb886 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -33,9 +33,8 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
-        if (! Hyde::isBooted()) {
-            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
-            Hyde::boot();
+        if (! Hyde::isBooted() && ! isset($this->menus[$name])) {
+            throw new \Exception('Cannot get navigation menu before the Hyde Kernel is booted.');
         }
 
         return $this->menus[$name];

From b910e765ddf22b599fdd2f8b9831328fc9f4fa01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:17:39 +0100
Subject: [PATCH 0669/2811] Revert "Throw when trying to get uninitialized menu
 before boot"

This reverts commit e4957b863746b631c671d6b149767f62aa94fbb3.
---
 .../src/Framework/Features/Navigation/NavigationManager.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
index 624953fb886..9313fb65bd0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
@@ -33,8 +33,9 @@ public function registerMenu(string $name, NavigationMenu $menu): void
      */
     public function getMenu(string $name): NavigationMenu
     {
-        if (! Hyde::isBooted() && ! isset($this->menus[$name])) {
-            throw new \Exception('Cannot get navigation menu before the Hyde Kernel is booted.');
+        if (! Hyde::isBooted()) {
+            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
+            Hyde::boot();
         }
 
         return $this->menus[$name];

From d6e5e3e56fb4a8e11136bc6e3e2635c9f50fd1ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:19:21 +0100
Subject: [PATCH 0670/2811] Bind menus directly into the service container

---
 .../Foundation/Providers/NavigationServiceProvider.php    | 8 ++++++++
 .../framework/tests/Feature/NavigationManagerTest.php     | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 857588c3dd3..0ab3d60dc35 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -22,6 +22,14 @@ public function register(): void
         $this->app->alias(NavigationManager::class, 'navigation');
 
         $this->app->make(HydeKernel::class)->booted(function () {
+            $this->app->singleton(MainNavigationMenu::class, function () {
+                return NavigationMenuGenerator::handle(MainNavigationMenu::class);
+            });
+
+            $this->app->singleton(DocumentationSidebar::class, function () {
+                return NavigationMenuGenerator::handle(DocumentationSidebar::class);
+            });
+
             $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index b39e299f039..573d2c64fa1 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -55,21 +55,21 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation')->getMenu('main'));
+        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation')->getMenu('sidebar'));
+        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->assertSame(MainNavigationMenu::get(), app('navigation')->getMenu('main'));
+        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->assertSame(DocumentationSidebar::get(), app('navigation')->getMenu('sidebar'));
+        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 }

From 91f8ce931a3452475efdb2ad345ff76646524101 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:27:13 +0100
Subject: [PATCH 0671/2811] Add initial null menu bindings

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 0ab3d60dc35..216dd7cb92d 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -21,6 +21,10 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
+        // Initially bind these to null, so that the container doesn't try to return them before the kernel has booted.
+        $this->app->singleton(MainNavigationMenu::class, fn () => null);
+        $this->app->singleton(DocumentationSidebar::class, fn () => null);
+
         $this->app->make(HydeKernel::class)->booted(function () {
             $this->app->singleton(MainNavigationMenu::class, function () {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);

From 02296abad22c96e4763cfb3b90a128bcb8176430 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:28:00 +0100
Subject: [PATCH 0672/2811] Boot the kernel for each test

---
 .../framework/tests/Feature/NavigationManagerTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 573d2c64fa1..0954a35a12e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -55,21 +56,29 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
+        Hyde::boot();
+
         $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
+        Hyde::boot();
+
         $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
+        Hyde::boot();
+
         $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
+        Hyde::boot();
+
         $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 }

From 643eadf690feadcd120e8e44c2c312ce191ac500 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:28:49 +0100
Subject: [PATCH 0673/2811] Test container menus are null before kernel is
 booted

---
 packages/framework/tests/Feature/NavigationManagerTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 0954a35a12e..e1ae84fe154 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -54,6 +54,12 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $manager->getMenu('foo');
     }
 
+    public function testContainerMenusAreNullBeforeKernelIsBooted()
+    {
+        $this->assertNull(app(MainNavigationMenu::class));
+        $this->assertNull(app(DocumentationSidebar::class));
+    }
+
     public function testCanGetMainNavigationMenuFromContainer()
     {
         Hyde::boot();

From c9414b5dcbe6acf96852146df61e3b3b657b7e46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:29:29 +0100
Subject: [PATCH 0674/2811] Get direct instance from container

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 .../src/Framework/Features/Navigation/MainNavigationMenu.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e8aeec5cab6..ace9b349e71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -14,7 +14,7 @@ class DocumentationSidebar extends NavigationMenu
 {
     public static function get(): static
     {
-        return app('navigation')->getMenu('sidebar');
+        return app(static::class);
     }
 
     public function hasGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b94dc0778ab..b63f85e7720 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -10,6 +10,6 @@ class MainNavigationMenu extends NavigationMenu
 {
     public static function get(): static
     {
-        return app('navigation')->getMenu('main');
+        return app(static::class);
     }
 }

From 4349a4618eb76da137f7fd959ee0f65bfb41204f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:31:08 +0100
Subject: [PATCH 0675/2811] Remove now unnecessary method overrides

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 -------
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 +------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ace9b349e71..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,15 +8,8 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
-use function app;
-
 class DocumentationSidebar extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b63f85e7720..96b228fa967 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,12 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use function app;
-
 class MainNavigationMenu extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
+    //
 }

From 544fdfd051e65c70bf89918e242c7be112872f2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:32:57 +0100
Subject: [PATCH 0676/2811] Revert "Remove now unnecessary method overrides"

This reverts commit 4349a4618eb76da137f7fd959ee0f65bfb41204f.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++++++
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..ace9b349e71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,15 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    public static function get(): static
+    {
+        return app(static::class);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..b63f85e7720 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    public static function get(): static
+    {
+        return app(static::class);
+    }
 }

From 96756656eb06469edbbe96b39ac71c803bb0ebf6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:33:37 +0100
Subject: [PATCH 0677/2811] Move shared method to parent class

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 -------
 .../Framework/Features/Navigation/MainNavigationMenu.php   | 7 +------
 .../src/Framework/Features/Navigation/NavigationMenu.php   | 5 +++++
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ace9b349e71..3928e2847f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,15 +8,8 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
-use function app;
-
 class DocumentationSidebar extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index b63f85e7720..96b228fa967 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,12 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use function app;
-
 class MainNavigationMenu extends NavigationMenu
 {
-    public static function get(): static
-    {
-        return app(static::class);
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 986dd7076be..66434248648 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,11 @@
  */
 abstract class NavigationMenu
 {
+    public static function get(): static
+    {
+        return app(static::class);
+    }
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From 596ca0b60715130756dd60fc93b22b82d7b3b956 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:36:33 +0100
Subject: [PATCH 0678/2811] Add menu aliases

---
 .../Providers/NavigationServiceProvider.php   |  3 +++
 .../tests/Feature/NavigationManagerTest.php   | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 216dd7cb92d..5b5beae1ac0 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -34,6 +34,9 @@ public function register(): void
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
 
+            $this->app->alias(MainNavigationMenu::class, 'navigation.main');
+            $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
+
             $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
             $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e1ae84fe154..b7a57cbedaf 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -9,6 +9,7 @@
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -60,6 +61,14 @@ public function testContainerMenusAreNullBeforeKernelIsBooted()
         $this->assertNull(app(DocumentationSidebar::class));
     }
 
+    public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
     public function testCanGetMainNavigationMenuFromContainer()
     {
         Hyde::boot();
@@ -87,4 +96,18 @@ public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
 
         $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingAlias()
+    {
+        Hyde::boot();
+
+        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingAlias()
+    {
+        Hyde::boot();
+
+        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
 }

From a60def55317cb595400ecedbef43fa8029a4a30a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:37:57 +0100
Subject: [PATCH 0679/2811] Use the new container aliases to get menus

---
 .../resources/views/components/docs/sidebar.blade.php         | 2 +-
 .../framework/resources/views/layouts/navigation.blade.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index f4f3d9c2cb3..9cd5dad15c4 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -4,7 +4,7 @@
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => app('navigation')->getMenu('sidebar'),
+            'sidebar' => app('navigation.sidebar'),
         ])
     </nav>
     @if(config('docs.sidebar.footer', true) !== false)
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index d7f8edcde5b..a2d05aeb00b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -1,5 +1,5 @@
 @php
-    $navigation = app('navigation')->getMenu('main');
+    $navigation = app('navigation.main');
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 66434248648..892aaf909f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -12,8 +12,8 @@
  *
  * The automatic navigation menus are stored within the service container and can be resolved by their identifiers.
  *
- * @example `$menu = app('navigation')->getMenu('main');` for the main navigation menu.
- * @example `$menu = app('navigation')->getMenu('sidebar');` for the documentation sidebar.
+ * @example `$menu = app('navigation.main');` for the main navigation menu.
+ * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
 abstract class NavigationMenu
 {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index a4ba8a92ce8..62cf68d6aa2 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -258,12 +258,12 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
     public function testCanGetMenuFromServiceContainer()
     {
-        $this->assertEquals($this->createNavigationMenu(), app('navigation')->getMenu('main'));
+        $this->assertEquals($this->createNavigationMenu(), app('navigation.main'));
     }
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
-        $navigation = app('navigation')->getMenu('main');
+        $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());

From 5f9a8fcf3e1df1595c228ca84d636ae9e222661b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:41:44 +0100
Subject: [PATCH 0680/2811] Boot kernel for unit test

---
 packages/framework/tests/Unit/Views/NavigationMenuViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index be7fe698976..0d9145a99de 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,6 +18,8 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
+
+        Hyde::boot();
     }
 
     protected function render(): string

From 75942a0a88a6553c7e53cac02f4fd6fa2b86ba28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:42:14 +0100
Subject: [PATCH 0681/2811] Clarify code comment

---
 .../src/Foundation/Providers/NavigationServiceProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 5b5beae1ac0..81c13db5393 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -21,7 +21,7 @@ public function register(): void
 
         $this->app->alias(NavigationManager::class, 'navigation');
 
-        // Initially bind these to null, so that the container doesn't try to return them before the kernel has booted.
+        // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
 

From 06f0db4ce406950d3abebe03f6c423000aa94807 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:43:45 +0100
Subject: [PATCH 0682/2811] Boot kernel for test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 62cf68d6aa2..0666afeb8b8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -263,6 +264,8 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
+        Hyde::boot();
+
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 

From fb7a8d56464cc770140409d761b77185d305dd41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:56:59 +0100
Subject: [PATCH 0683/2811] Extract fluent testing helper

---
 .../tests/Feature/NavigationManagerTest.php   | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index b7a57cbedaf..eedafee570d 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -71,43 +71,38 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        Hyde::boot();
-
-        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
+    {
+        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
+
+    protected function booted(): self
     {
         Hyde::boot();
 
-        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        return $this;
     }
 }

From d8192cdeb1ecfa7b05d656ee1c58859289525867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 16:57:02 +0100
Subject: [PATCH 0684/2811] Lazy boot menus

Revert "Extract fluent testing helper"

This reverts commit 1a8112ec68000253509b4099857ac58ecc3d2fa9.

Revert "Boot kernel for test"

This reverts commit 06f0db4ce406950d3abebe03f6c423000aa94807.

Revert "Boot kernel for unit test"

This reverts commit 5f9a8fcf3e1df1595c228ca84d636ae9e222661b.

Revert "Boot the kernel for each test"

This reverts commit 02296abad22c96e4763cfb3b90a128bcb8176430.
---
 .../Features/Navigation/NavigationMenu.php    |  5 +++++
 .../tests/Feature/NavigationManagerTest.php   | 20 ++++++-------------
 .../tests/Feature/NavigationMenuTest.php      |  3 ---
 .../Unit/Views/NavigationMenuViewTest.php     |  2 --
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 892aaf909f7..5704a5e8a3a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -19,6 +20,10 @@ abstract class NavigationMenu
 {
     public static function get(): static
     {
+        if (! Hyde::isBooted()) {
+            Hyde::boot();
+        }
+
         return app(static::class);
     }
 
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index eedafee570d..3a702824fb6 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -71,38 +70,31 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
     {
-        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
-    }
-
-    protected function booted(): self
-    {
-        Hyde::boot();
-
-        return $this;
+        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 0666afeb8b8..62cf68d6aa2 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -264,8 +263,6 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
-        Hyde::boot();
-
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index 0d9145a99de..be7fe698976 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,8 +18,6 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
-
-        Hyde::boot();
     }
 
     protected function render(): string

From ff17137e710c055db60781be35b452a434ceee81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:05:11 +0100
Subject: [PATCH 0685/2811] Revert "Lazy boot menus"

This reverts commit a74659788806a4e42d9d072fca66defcb2a96f67.
---
 .../Features/Navigation/NavigationMenu.php    |  5 -----
 .../tests/Feature/NavigationManagerTest.php   | 20 +++++++++++++------
 .../tests/Feature/NavigationMenuTest.php      |  3 +++
 .../Unit/Views/NavigationMenuViewTest.php     |  2 ++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 5704a5e8a3a..892aaf909f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -20,10 +19,6 @@ abstract class NavigationMenu
 {
     public static function get(): static
     {
-        if (! Hyde::isBooted()) {
-            Hyde::boot();
-        }
-
         return app(static::class);
     }
 
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index 3a702824fb6..eedafee570d 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -70,31 +71,38 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingAlias()
     {
-        $this->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
+        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingAlias()
     {
-        $this->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+    }
+
+    protected function booted(): self
+    {
+        Hyde::boot();
+
+        return $this;
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 62cf68d6aa2..0666afeb8b8 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
@@ -263,6 +264,8 @@ public function testCanGetMenuFromServiceContainer()
 
     public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
     {
+        Hyde::boot();
+
         $navigation = app('navigation.main');
         $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index be7fe698976..0d9145a99de 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -18,6 +18,8 @@ protected function setUp(): void
         parent::setUp();
         $this->mockRoute();
         $this->mockPage();
+
+        Hyde::boot();
     }
 
     protected function render(): string

From dee5a44a6bfaef9c5291c3f63f7ec173ef64bdf3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:08:10 +0100
Subject: [PATCH 0686/2811] Boot the kernel

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index a1d710d25bd..bd5168d390e 100644
--- 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\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
@@ -38,6 +39,8 @@ public function testHasDarkmode()
 
     public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
@@ -75,6 +78,8 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
 
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),

From fce0950092d61836eab7f94ad4ca21a81976d913 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 17:57:19 +0100
Subject: [PATCH 0687/2811] Add method description

---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 892aaf909f7..25c7b092058 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,9 @@
  */
 abstract class NavigationMenu
 {
+    /**
+     * Get the navigation menu instance from the service container.
+     */
     public static function get(): static
     {
         return app(static::class);

From a25423e19bf961491cdf0f1de49f2fab16bc283e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:01:16 +0100
Subject: [PATCH 0688/2811] Remove menu manager binding from container

---
 .../Providers/NavigationServiceProvider.php      |  6 ------
 .../tests/Feature/HydeServiceProviderTest.php    | 16 ----------------
 2 files changed, 22 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 81c13db5393..948ecc47535 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -15,12 +15,6 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(NavigationManager::class, function () {
-            return new NavigationManager();
-        });
-
-        $this->app->alias(NavigationManager::class, 'navigation');
-
         // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 6ad340537de..83e437c4acc 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Navigation\NavigationManager;
-
 use function app;
 use function array_map;
 use function basename;
@@ -329,18 +327,4 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
-
-    public function testNavigationManagerIsRegisteredAsSingleton()
-    {
-        $this->assertTrue($this->app->bound(NavigationManager::class));
-        $this->assertInstanceOf(NavigationManager::class, $this->app->make(NavigationManager::class));
-        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make(NavigationManager::class));
-    }
-
-    public function testProviderRegistersNavigationManagerAlias()
-    {
-        $this->assertTrue($this->app->bound('navigation'));
-        $this->assertInstanceOf(NavigationManager::class, $this->app->make('navigation'));
-        $this->assertSame($this->app->make(NavigationManager::class), $this->app->make('navigation'));
-    }
 }

From 6c8e1ac812ef3288cf77b4c2283b69834d2727fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:01:51 +0100
Subject: [PATCH 0689/2811] Remove menu manager registrations

---
 .../src/Foundation/Providers/NavigationServiceProvider.php    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 948ecc47535..6d9937fdf59 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -7,7 +7,6 @@
 use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\ServiceProvider;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
@@ -30,9 +29,6 @@ public function register(): void
 
             $this->app->alias(MainNavigationMenu::class, 'navigation.main');
             $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
-
-            $this->app->make(NavigationManager::class)->registerMenu('main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
-            $this->app->make(NavigationManager::class)->registerMenu('sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
         });
     }
 }

From aad20361384c1b50f44b384f2afa660d2f3c024d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:04:22 +0100
Subject: [PATCH 0690/2811] Strictly type the closure returms

---
 .../src/Foundation/Providers/NavigationServiceProvider.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index 6d9937fdf59..f338c3caad9 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -18,12 +18,12 @@ public function register(): void
         $this->app->singleton(MainNavigationMenu::class, fn () => null);
         $this->app->singleton(DocumentationSidebar::class, fn () => null);
 
-        $this->app->make(HydeKernel::class)->booted(function () {
-            $this->app->singleton(MainNavigationMenu::class, function () {
+        $this->app->make(HydeKernel::class)->booted(function (): void {
+            $this->app->singleton(MainNavigationMenu::class, function (): MainNavigationMenu {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);
             });
 
-            $this->app->singleton(DocumentationSidebar::class, function () {
+            $this->app->singleton(DocumentationSidebar::class, function (): DocumentationSidebar {
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
 

From 0a4e1c114e097ef12f31d03182e9d0dfb1ae8391 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:09:19 +0100
Subject: [PATCH 0691/2811] Simplify container bindings

Being able to do app(MainNavigationMenu::class) instead of MainNavigationMenu::get() offers little value. It does have some benefit compared to using the aliases as the former can probably get better IDE support, but since the idea behind the alias is convenience I don't think it's worth it since the static method offers full type support. We also don't need the initial null bindings as the string versions throw an exception instead of trying to resolve the classes. It does mean the static get method breaks but that's fine as I will revert that next
---
 .../Providers/NavigationServiceProvider.php   | 11 ++------
 .../tests/Feature/NavigationManagerTest.php   | 26 ++++---------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
index f338c3caad9..02af9f13ec1 100644
--- a/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
+++ b/packages/framework/src/Foundation/Providers/NavigationServiceProvider.php
@@ -14,21 +14,14 @@ class NavigationServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        // Initially bind these to null, so that the container doesn't try to return empty menus before the kernel has booted.
-        $this->app->singleton(MainNavigationMenu::class, fn () => null);
-        $this->app->singleton(DocumentationSidebar::class, fn () => null);
-
         $this->app->make(HydeKernel::class)->booted(function (): void {
-            $this->app->singleton(MainNavigationMenu::class, function (): MainNavigationMenu {
+            $this->app->singleton('navigation.main', function (): MainNavigationMenu {
                 return NavigationMenuGenerator::handle(MainNavigationMenu::class);
             });
 
-            $this->app->singleton(DocumentationSidebar::class, function (): DocumentationSidebar {
+            $this->app->singleton('navigation.sidebar', function (): DocumentationSidebar {
                 return NavigationMenuGenerator::handle(DocumentationSidebar::class);
             });
-
-            $this->app->alias(MainNavigationMenu::class, 'navigation.main');
-            $this->app->alias(DocumentationSidebar::class, 'navigation.sidebar');
         });
     }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index eedafee570d..e46f88757b3 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -55,13 +55,7 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $manager->getMenu('foo');
     }
 
-    public function testContainerMenusAreNullBeforeKernelIsBooted()
-    {
-        $this->assertNull(app(MainNavigationMenu::class));
-        $this->assertNull(app(DocumentationSidebar::class));
-    }
-
-    public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
@@ -71,32 +65,22 @@ public function testCannotGetContainerMenusByAliasBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app(MainNavigationMenu::class));
+        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app(DocumentationSidebar::class));
+        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app(MainNavigationMenu::class));
+        $this->booted()->assertSame(MainNavigationMenu::get(), app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app(DocumentationSidebar::class));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingAlias()
-    {
-        $this->booted()->assertSame(app(MainNavigationMenu::class), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingAlias()
-    {
-        $this->booted()->assertSame(app(DocumentationSidebar::class), app('navigation.sidebar'));
+        $this->booted()->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
     }
 
     protected function booted(): self

From 6f0ddf754a6dc15ef586ca83516629d37ae00019 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:10:50 +0100
Subject: [PATCH 0692/2811] Revert "Move shared method to parent class"

This reverts commit 96756656eb06469edbbe96b39ac71c803bb0ebf6.
---
 .../Features/Navigation/DocumentationSidebar.php       | 10 ++++++++++
 .../Features/Navigation/MainNavigationMenu.php         | 10 +++++++++-
 .../Framework/Features/Navigation/NavigationMenu.php   |  8 --------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3928e2847f6..3f2d3d54480 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,8 +8,18 @@
 use Hyde\Support\Facades\Render;
 use Illuminate\Support\Str;
 
+use function app;
+
 class DocumentationSidebar extends NavigationMenu
 {
+    /**
+     * Get the navigation menu instance from the service container.
+     */
+    public static function get(): static
+    {
+        return app('navigation.sidebar');
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index 96b228fa967..e9f6f1a8dff 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -4,7 +4,15 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use function app;
+
 class MainNavigationMenu extends NavigationMenu
 {
-    //
+    /**
+     * Get the navigation menu instance from the service container.
+     */
+    public static function get(): static
+    {
+        return app('navigation.main');
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 25c7b092058..1de04be10df 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,14 +17,6 @@
  */
 abstract class NavigationMenu
 {
-    /**
-     * Get the navigation menu instance from the service container.
-     */
-    public static function get(): static
-    {
-        return app(static::class);
-    }
-
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From c0a02077975042daa49935e1bb5782c0b2020cf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:14:54 +0100
Subject: [PATCH 0693/2811] Revert "Add method description"

This reverts commit fce0950092d61836eab7f94ad4ca21a81976d913.
---
 .../src/Framework/Features/Navigation/MainNavigationMenu.php   | 3 ---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index e9f6f1a8dff..e6681c42ffd 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -8,9 +8,6 @@
 
 class MainNavigationMenu extends NavigationMenu
 {
-    /**
-     * Get the navigation menu instance from the service container.
-     */
     public static function get(): static
     {
         return app('navigation.main');
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 1de04be10df..84779c79eb9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,9 +20,6 @@ abstract class NavigationMenu
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 
-    /**
-     * Create a new navigation menu instance.
-     */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();

From a89814ce54ba7ee502b1b2a72348ae4de0b83086 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:17:20 +0100
Subject: [PATCH 0694/2811] Revert "Extract fluent testing helper"

This reverts commit fb7a8d56464cc770140409d761b77185d305dd41.
---
 .../tests/Feature/NavigationManagerTest.php   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e46f88757b3..d78ed77f32f 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -65,28 +65,29 @@ public function testCannotGetContainerMenusBeforeKernelIsBooted()
 
     public function testCanGetMainNavigationMenuFromContainer()
     {
-        $this->booted()->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
     }
 
     public function testCanGetDocumentationSidebarFromContainer()
     {
-        $this->booted()->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
     }
 
     public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
-        $this->booted()->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
+        Hyde::boot();
 
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        $this->booted()->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
     }
 
-    protected function booted(): self
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        return $this;
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
     }
 }

From c9b1127f3cd6d31c319c77c04bc3b152e3a7bcb8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:18:12 +0100
Subject: [PATCH 0695/2811] Move service container binding tests to menu test

---
 .../AutomaticNavigationConfigurationsTest.php | 40 +++++++++++++++++++
 .../tests/Feature/NavigationManagerTest.php   | 39 ------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c00e56054b6..e483d3ef0c4 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
@@ -20,6 +21,7 @@
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -1221,6 +1223,44 @@ public function testSidebarGroupCasingUsingFrontMatter()
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
     }
 
+    // Service container binding tests
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index d78ed77f32f..e4be9383d8e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,12 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
-use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -54,40 +51,4 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
 }

From 2fe9ca81d46cc351bb67ce1faae58e57e2046dff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:25:11 +0100
Subject: [PATCH 0696/2811] Revert "Move service container binding tests to
 menu test"

This reverts commit c9b1127f3cd6d31c319c77c04bc3b152e3a7bcb8.
---
 .../AutomaticNavigationConfigurationsTest.php | 40 -------------------
 .../tests/Feature/NavigationManagerTest.php   | 39 ++++++++++++++++++
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e483d3ef0c4..c00e56054b6 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
@@ -21,7 +20,6 @@
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Illuminate\Contracts\Container\BindingResolutionException;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -1223,44 +1221,6 @@ public function testSidebarGroupCasingUsingFrontMatter()
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
     }
 
-    // Service container binding tests
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
-
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): void
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index e4be9383d8e..d78ed77f32f 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,9 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
+use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -51,4 +54,40 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
 }

From 5afae61f036e124f9bea9c395272ff1bd9a8c1a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:25:52 +0100
Subject: [PATCH 0697/2811] Move service container binding tests to provider
 test

---
 .../tests/Feature/HydeServiceProviderTest.php | 40 +++++++++++++++++++
 .../tests/Feature/NavigationManagerTest.php   | 39 ------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 83e437c4acc..9c895230082 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,6 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Illuminate\Contracts\Container\BindingResolutionException;
+
 use function app;
 use function array_map;
 use function basename;
@@ -327,4 +331,40 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', MarkdownPost::outputDirectory());
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
+
+    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
+        $this->assertNull(app('navigation.main'));
+        $this->assertNull(app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainer()
+    {
+        Hyde::boot();
+
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+    }
+
+    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+    }
+
+    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
+    {
+        Hyde::boot();
+
+        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+    }
 }
diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
index d78ed77f32f..e4be9383d8e 100644
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ b/packages/framework/tests/Feature/NavigationManagerTest.php
@@ -4,12 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Framework\Features\Navigation\NavigationManager;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Testing\TestCase;
-use Illuminate\Contracts\Container\BindingResolutionException;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
@@ -54,40 +51,4 @@ public function testGetMenuThrowsExceptionForNonExistentMenu()
         $this->expectException(\Exception::class);
         $manager->getMenu('foo');
     }
-
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
-    {
-        $this->expectException(BindingResolutionException::class);
-
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainer()
-    {
-        Hyde::boot();
-
-        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
-    }
-
-    public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
-    }
-
-    public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
-    {
-        Hyde::boot();
-
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
-    }
 }

From 172cb8643e174eb258afd5f9be718522b9c6532f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:28:04 +0100
Subject: [PATCH 0698/2811] Swap wrong order of expected/actual

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 9c895230082..955e0e21be5 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -358,13 +358,13 @@ public function testCanGetMainNavigationMenuFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        $this->assertSame(MainNavigationMenu::get(), app('navigation.main'));
+        $this->assertSame(app('navigation.main'), MainNavigationMenu::get());
     }
 
     public function testCanGetDocumentationSidebarFromContainerUsingShorthand()
     {
         Hyde::boot();
 
-        $this->assertSame(DocumentationSidebar::get(), app('navigation.sidebar'));
+        $this->assertSame(app('navigation.sidebar'), DocumentationSidebar::get());
     }
 }

From 06d88e895950f8fb109a13061d824dcd234d8e3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:28:18 +0100
Subject: [PATCH 0699/2811] Clean up test

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 955e0e21be5..5704cdc160e 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -336,8 +336,8 @@ public function testCannotGetContainerMenusBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
-        $this->assertNull(app('navigation.main'));
-        $this->assertNull(app('navigation.sidebar'));
+        app('navigation.main');
+        app('navigation.sidebar');
     }
 
     public function testCanGetMainNavigationMenuFromContainer()

From 730c4276bfa984cac40b0cd4b5bebd6d3ea48dd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:29:07 +0100
Subject: [PATCH 0700/2811] Split out test

---
 .../framework/tests/Feature/HydeServiceProviderTest.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 5704cdc160e..5472304f46c 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -332,11 +332,17 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
 
-    public function testCannotGetContainerMenusBeforeKernelIsBooted()
+    public function testCannotMainNavigationMenuFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
         app('navigation.main');
+    }
+
+    public function testCannotDocumentationSidebarFromContainerBeforeKernelIsBooted()
+    {
+        $this->expectException(BindingResolutionException::class);
+
         app('navigation.sidebar');
     }
 

From 7a281c0c90ef3cf54ae4f1bab9c0b9b2342036dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:41:36 +0100
Subject: [PATCH 0701/2811] Delete NavigationManagerTest.php

---
 .../tests/Feature/NavigationManagerTest.php   | 54 -------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/NavigationManagerTest.php

diff --git a/packages/framework/tests/Feature/NavigationManagerTest.php b/packages/framework/tests/Feature/NavigationManagerTest.php
deleted file mode 100644
index e4be9383d8e..00000000000
--- a/packages/framework/tests/Feature/NavigationManagerTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Framework\Features\Navigation\NavigationManager;
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Features\Navigation\NavigationManager
- */
-class NavigationManagerTest extends TestCase
-{
-    public function testCanRegisterMenu()
-    {
-        $manager = new NavigationManager();
-
-        $menu = $this->createMock(MainNavigationMenu::class);
-        $manager->registerMenu('foo', $menu);
-
-        $reflection = new \ReflectionClass($manager);
-        $property = $reflection->getProperty('menus');
-
-        $menus = $property->getValue($manager);
-
-        $this->assertArrayHasKey('foo', $menus);
-        $this->assertSame($menu, $menus['foo']);
-    }
-
-    public function testCanGetMenu()
-    {
-        $manager = new NavigationManager();
-
-        $menu = $this->createMock(MainNavigationMenu::class);
-        $manager->registerMenu('foo', $menu);
-
-        $retrievedMenu = $manager->getMenu('foo');
-
-        $this->assertSame($menu, $retrievedMenu);
-    }
-
-    public function testGetMenuThrowsExceptionForNonExistentMenu()
-    {
-        $manager = new NavigationManager();
-
-        $this->expectException(\Exception::class);
-        $manager->getMenu('foo');
-    }
-}

From 805849b66379a584007376191e918fdecf793fb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:41:38 +0100
Subject: [PATCH 0702/2811] Delete NavigationManager.php

---
 .../Features/Navigation/NavigationManager.php | 43 -------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationManager.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php b/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
deleted file mode 100644
index 9313fb65bd0..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationManager.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Hyde\Hyde;
-
-/**
- * Manages the navigation menus for the project.
- *
- * @deprecated Move to extension
- */
-class NavigationManager
-{
-    /**
-     * The menus that are available for the project, keyed by their name identifier.
-     *
-     * @var array<string, \Hyde\Framework\Features\Navigation\NavigationMenu>
-     */
-    protected array $menus = [];
-
-    /**
-     * Register a new menu for the project.
-     */
-    public function registerMenu(string $name, NavigationMenu $menu): void
-    {
-        $this->menus[$name] = $menu;
-    }
-
-    /**
-     * Get a menu by its name.
-     */
-    public function getMenu(string $name): NavigationMenu
-    {
-        if (! Hyde::isBooted()) {
-            // Todo: This could be an anti-pattern so we may consider throwing an exception instead.
-            Hyde::boot();
-        }
-
-        return $this->menus[$name];
-    }
-}

From f19e288a6bd572cf2d51f0e459d7ebeb1a0d8c26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 18:42:40 +0100
Subject: [PATCH 0703/2811] Add missing part of test names

---
 packages/framework/tests/Feature/HydeServiceProviderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 5472304f46c..c20ebac254e 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -332,14 +332,14 @@ public function testOutputDirectoriesCanBeSetUsingKebabCaseClassNames()
         $this->assertEquals('foo', DocumentationPage::outputDirectory());
     }
 
-    public function testCannotMainNavigationMenuFromContainerBeforeKernelIsBooted()
+    public function testCannotGetMainNavigationMenuFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 
         app('navigation.main');
     }
 
-    public function testCannotDocumentationSidebarFromContainerBeforeKernelIsBooted()
+    public function testCannotGetDocumentationSidebarFromContainerBeforeKernelIsBooted()
     {
         $this->expectException(BindingResolutionException::class);
 

From 7b8e90bac290ac49f03d712c42794cb53d781d47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 19:41:10 +0100
Subject: [PATCH 0704/2811] Breaking: Change configuration option
 `sidebar_order` to `sidebar.order`

Breaking: This changes the configuration option `docs.sidebar_order` to `docs.sidebar.order` in order to normalize the configuration API.
---
 config/docs.php                               | 44 +++++++++----------
 docs/creating-content/documentation-pages.md  | 10 +++--
 docs/digging-deeper/customization.md          |  2 +-
 docs/digging-deeper/navigation.md             | 24 +++++-----
 packages/framework/config/docs.php            | 44 +++++++++----------
 .../Factories/NavigationDataFactory.php       |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../AutomaticNavigationConfigurationsTest.php | 22 +++++-----
 .../Services/DocumentationSidebarTest.php     |  8 ++--
 .../Unit/NavigationDataFactoryUnitTest.php    |  8 ++--
 10 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index fab400e973d..652695339b6 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -33,29 +33,29 @@
         // Should the sidebar footer be shown? You can also set this to a string
         // of Markdown to show in the footer. Set to `false` to disable.
         'footer' => true,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sidebar Page Order
-    |--------------------------------------------------------------------------
-    |
-    | In the generated Documentation pages the navigation links in the sidebar
-    | default to sort alphabetically. You can reorder the page identifiers
-    | in the list below, and the links will get sorted in that order.
-    |
-    | The items will get a priority of 500 plus the order its found in the list.
-    | Pages without a priority will fall back to the default priority of 999.
-    |
-    | You can also set explicit priorities in front matter or by specifying
-    | a value to the array key in the list to override the inferred value.
-    |
-    */
 
-    'sidebar_order' => [
-        'readme',
-        'installation',
-        'getting-started',
+        /*
+        |--------------------------------------------------------------------------
+        | Sidebar Page Order
+        |--------------------------------------------------------------------------
+        |
+        | In the generated Documentation pages the navigation links in the sidebar
+        | default to sort alphabetically. You can reorder the page identifiers
+        | in the list below, and the links will get sorted in that order.
+        |
+        | The items will get a priority of 500 plus the order its found in the list.
+        | Pages without a priority will fall back to the default priority of 999.
+        |
+        | You can also set explicit priorities in front matter or by specifying
+        | a value to the array key in the list to override the inferred value.
+        |
+        */
+
+        'order' => [
+            'readme',
+            'installation',
+            'getting-started',
+        ],
     ],
 
     /*
diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 005d2f324ba..9bbcedc205b 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -223,10 +223,12 @@ To quickly arrange the order of items in the sidebar, you can reorder the page i
 Link items without an entry here will fall back to the default priority of 999, putting them last.
 
 ```php
-'sidebar_order' => [
-    'readme',
-    'installation',
-    'getting-started',
+'sidebar' => [
+    'order' => [
+        'readme',
+        'installation',
+        'getting-started',
+    ],
 ]
 ```
 
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 8f8c455bc60..0ec2b9c934d 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -259,7 +259,7 @@ Learn more in the [Navigation Menu](navigation) documentation.
 
 #### Customizing the documentation sidebar
 
-- To customize the sidebar, use the setting `sidebar_order` in the `docs.php` config.
+- To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
 - When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
 
 Learn more in the [Documentation Pages](documentation-pages) documentation.
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4d201775d42..f36a2f9a761 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -122,12 +122,12 @@ Next up, let's look at how to customize the navigation menus using the config fi
 - To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
 - When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.
 
-- To customize the sidebar, use the setting `sidebar_order` in the `docs.php` config.
+- To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
 - When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
 
 ### Changing the priorities
 
-The `navigation.order` and `sidebar_order` settings allow you to customize the order of the pages in the navigation menus.
+The `navigation.order` and `sidebar.order` settings allow you to customize the order of the pages in the navigation menus.
 
 #### Basic syntax for changing the priorities
 
@@ -149,10 +149,12 @@ The offset is added to make it easier to place pages earlier in the list using f
 ```php
 // filepath: config/docs.php
 
-'sidebar_order' => [
-    'readme', // Gets priority 500
-    'installation', // Gets priority 501
-    'getting-started', // Gets priority 502
+'sidebar' => [
+    'order' => [
+        'readme', // Gets priority 500
+        'installation', // Gets priority 501
+        'getting-started', // Gets priority 502
+    ]
 ]
 ```
 
@@ -175,10 +177,12 @@ You can also specify explicit priorities by adding a value to the array key:
 ```php
 // filepath: config/docs.php
 
-'sidebar_order' => [
-    'readme' => 10, // Gets priority 10
-    'installation' => 15, // Gets priority 15
-    'getting-started' => 20, // Gets priority 20
+'sidebar' => [
+    'order' => [
+        'readme' => 10, // Gets priority 10
+        'installation' => 15, // Gets priority 15
+        'getting-started' => 20, // Gets priority 20
+    ]
 ]
 ```
 
diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index fab400e973d..652695339b6 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -33,29 +33,29 @@
         // Should the sidebar footer be shown? You can also set this to a string
         // of Markdown to show in the footer. Set to `false` to disable.
         'footer' => true,
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sidebar Page Order
-    |--------------------------------------------------------------------------
-    |
-    | In the generated Documentation pages the navigation links in the sidebar
-    | default to sort alphabetically. You can reorder the page identifiers
-    | in the list below, and the links will get sorted in that order.
-    |
-    | The items will get a priority of 500 plus the order its found in the list.
-    | Pages without a priority will fall back to the default priority of 999.
-    |
-    | You can also set explicit priorities in front matter or by specifying
-    | a value to the array key in the list to override the inferred value.
-    |
-    */
 
-    'sidebar_order' => [
-        'readme',
-        'installation',
-        'getting-started',
+        /*
+        |--------------------------------------------------------------------------
+        | Sidebar Page Order
+        |--------------------------------------------------------------------------
+        |
+        | In the generated Documentation pages the navigation links in the sidebar
+        | default to sort alphabetically. You can reorder the page identifiers
+        | in the list below, and the links will get sorted in that order.
+        |
+        | The items will get a priority of 500 plus the order its found in the list.
+        | Pages without a priority will fall back to the default priority of 999.
+        |
+        | You can also set explicit priorities in front matter or by specifying
+        | a value to the array key in the list to override the inferred value.
+        |
+        */
+
+        'order' => [
+            'readme',
+            'installation',
+            'getting-started',
+        ],
     ],
 
     /*
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 0fb46e79da2..7d02a193d4e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -160,7 +160,7 @@ private function searchForPriorityInConfigs(): ?int
     private function searchForPriorityInSidebarConfig(): ?int
     {
         /** @var array<string>|array<string, int> $config */
-        $config = Config::getArray('docs.sidebar_order', []);
+        $config = Config::getArray('docs.sidebar.order', []);
 
         return
             // For consistency with the navigation config.
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index bd31784144e..b490ac19bc2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -182,7 +182,7 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
-        $key = $this->generatesSidebar ? 'docs.sidebar_order' : 'hyde.navigation.order';
+        $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
         return Config::getArray($key, [])[$groupKey] ?? null;
     }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c00e56054b6..98541a8be20 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -745,9 +745,7 @@ public function testSidebarWithFrontMatterGroupAndCategory()
 
     public function testSidebarWithConfigOrder()
     {
-        // TODO should be sidebar.order instead of docs.sidebar_order
-
-        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+        config(['docs.sidebar.order' => ['first', 'second', 'third']]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [
             new DocumentationPage('first'),
@@ -755,7 +753,7 @@ public function testSidebarWithConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['third', 'second', 'first']]);
+        config(['docs.sidebar.order' => ['third', 'second', 'first']]);
 
         $this->assertSidebarEquals(['Third', 'Second', 'First'], [
             new DocumentationPage('first'),
@@ -776,7 +774,7 @@ public function testSidebarWithConfigOrderHasInferredPriorities()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first', 'second', 'third']]);
+        config(['docs.sidebar.order' => ['first', 'second', 'third']]);
 
         $this->assertSidebarEquals([
             ['priority' => 500],
@@ -791,7 +789,7 @@ public function testSidebarWithConfigOrderHasInferredPriorities()
 
     public function testSidebarWithExplicitConfigOrder()
     {
-        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+        config(['docs.sidebar.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [
             new DocumentationPage('first'),
@@ -799,7 +797,7 @@ public function testSidebarWithExplicitConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
+        config(['docs.sidebar.order' => ['first' => 3, 'second' => 2, 'third' => 1]]);
 
         $this->assertSidebarEquals(['Third', 'Second', 'First'], [
             new DocumentationPage('first'),
@@ -807,7 +805,7 @@ public function testSidebarWithExplicitConfigOrder()
             new DocumentationPage('third'),
         ]);
 
-        config(['docs.sidebar_order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
+        config(['docs.sidebar.order' => ['first' => 1, 'second' => 2, 'third' => 3]]);
 
         $this->assertSidebarEquals([
             ['label' => 'First', 'priority' => 1],
@@ -822,7 +820,7 @@ public function testSidebarWithExplicitConfigOrder()
 
     public function testSidebarWithMixedConfigOrders()
     {
-        config(['docs.sidebar_order' => ['foo', 'bar' => 650]]);
+        config(['docs.sidebar.order' => ['foo', 'bar' => 650]]);
 
         $this->assertSidebarEquals([
             ['label' => 'Foo', 'priority' => 500],
@@ -1059,7 +1057,7 @@ public function testSidebarGroupsAreSortedByLowestFoundPriorityInEachGroupUnless
             new DocumentationPage('baz', ['navigation.group' => 'c', 'navigation.priority' => 10]),
         ]);
 
-        config(['docs.sidebar_order' => ['a' => 5]]);
+        config(['docs.sidebar.order' => ['a' => 5]]);
 
         $this->assertSidebarEquals([
             'A', 'C', 'B',
@@ -1117,7 +1115,7 @@ public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDiffering
 
     public function testSidebarGroupPriorityCanBeSetInConfig()
     {
-        config(['docs.sidebar_order' => ['foo' => 500]]);
+        config(['docs.sidebar.order' => ['foo' => 500]]);
 
         $this->assertSidebarEquals(
             [['label' => 'Foo', 'priority' => 500]],
@@ -1127,7 +1125,7 @@ public function testSidebarGroupPriorityCanBeSetInConfig()
 
     public function testSidebarGroupPriorityCanBeSetInConfigUsingDifferingCases()
     {
-        config(['docs.sidebar_order' => ['hello-world' => 500]]);
+        config(['docs.sidebar.order' => ['hello-world' => 500]]);
 
         $expected = [['label' => 'Hello World', 'priority' => 500]];
         $this->assertSidebarEquals($expected, [new DocumentationPage('Hello World/bar')]);
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 2e3fcbe6344..3bb0b2b6545 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -77,7 +77,7 @@ public function testFilesWithFrontMatterHiddenSetToTrueAreRemovedFromSidebar()
 
     public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
     {
-        Config::set('docs.sidebar_order', []);
+        Config::set('docs.sidebar.order', []);
         Filesystem::touch('_docs/a.md');
         Filesystem::touch('_docs/b.md');
         Filesystem::touch('_docs/c.md');
@@ -94,7 +94,7 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
     public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
     {
-        Config::set('docs.sidebar_order', [
+        Config::set('docs.sidebar.order', [
             'c',
             'b',
             'a',
@@ -124,14 +124,14 @@ public function testSidebarItemPrioritySetInConfigOverridesFrontMatter()
     {
         $this->makePage('foo', ['navigation.priority' => 25]);
 
-        Config::set('docs.sidebar_order', ['foo']);
+        Config::set('docs.sidebar.order', ['foo']);
 
         $this->assertEquals(25, NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getPriority());
     }
 
     public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     {
-        Config::set('docs.sidebar_order', [
+        Config::set('docs.sidebar.order', [
             'first',
             'third',
             'second',
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index a118c695723..9674273bf75 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -74,7 +74,7 @@ public function testSearchForPriorityInNavigationConfigForMarkdownPageSupportsMi
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageWithListConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo' => 15,
             'bar' => 10,
         ]]);
@@ -88,7 +88,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageWithL
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageWithKeyedConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo',
             'bar' => 10,
             'baz',
@@ -109,7 +109,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageWithK
 
     public function testSearchForPriorityInNavigationConfigForDocumentationPageSupportsMixingKeyedAndListConfig()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'foo',
             'bar' => 10,
             'baz',
@@ -130,7 +130,7 @@ public function testSearchForPriorityInNavigationConfigForDocumentationPageSuppo
 
     public function testRouteKeysCanBeUsedForDocumentationSidebarPriorities()
     {
-        self::mockConfig(['docs.sidebar_order' => [
+        self::mockConfig(['docs.sidebar.order' => [
             'key/foo',
             'key/bar',
             'baz',

From 255aa0e18b4e258998129bd04fa82b5378e901be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 19:54:07 +0100
Subject: [PATCH 0705/2811] Breaking: Change configuration option
 `table_of_contents` to `sidebar.table_of_contents`

Breaking: This changes the configuration option `docs.table_of_contents` to `docs.sidebar.table_of_contents` in order to normalize the configuration API.
---
 config/docs.php                               | 31 ++++++++++---------
 docs/creating-content/documentation-pages.md  | 12 ++++---
 packages/framework/config/docs.php            | 31 ++++++++++---------
 .../components/docs/sidebar-item.blade.php    |  2 +-
 .../Actions/GeneratesTableOfContents.php      |  4 +--
 .../framework/src/Pages/DocumentationPage.php |  2 +-
 .../tests/Feature/MarkdownServiceTest.php     |  2 +-
 .../tests/Unit/DocumentationPageTest.php      |  4 +--
 8 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index 652695339b6..93bbc751dc2 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -56,23 +56,24 @@
             'installation',
             'getting-started',
         ],
-    ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Table of Contents Settings
-    |--------------------------------------------------------------------------
-    |
-    | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
-    | has a Table of Contents included. Here, you can configure its behavior,
-    | content, look and feel. You can also disable the feature completely.
-    |
-    */
+        /*
+        |--------------------------------------------------------------------------
+        | Table of Contents Settings
+        |--------------------------------------------------------------------------
+        |
+        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
+        | has a Table of Contents included. Here, you can configure its behavior,
+        | content, look and feel. You can also disable the feature completely.
+        |
+        */
+
+        'table_of_contents' => [
+            'enabled' => true,
+            'min_heading_level' => 2,
+            'max_heading_level' => 4,
+        ],
 
-    'table_of_contents' => [
-        'enabled' => true,
-        'min_heading_level' => 2,
-        'max_heading_level' => 4,
     ],
 
     /*
diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 9bbcedc205b..c978fa30447 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -258,11 +258,13 @@ In the `config/docs.php` file you can configure the behaviour, content, and the
 You can also disable the feature completely.
 
 ```php
-'table_of_contents' => [
-    'enabled' => true,
-    'min_heading_level' => 2,
-    'max_heading_level' => 4,
-    'smooth_page_scrolling' => true,
+'sidebar' => [
+    'table_of_contents' => [
+        'enabled' => true,
+        'min_heading_level' => 2,
+        'max_heading_level' => 4,
+        'smooth_page_scrolling' => true,
+    ],
 ],
 ```
 
diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index 652695339b6..93bbc751dc2 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -56,23 +56,24 @@
             'installation',
             'getting-started',
         ],
-    ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | Table of Contents Settings
-    |--------------------------------------------------------------------------
-    |
-    | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
-    | has a Table of Contents included. Here, you can configure its behavior,
-    | content, look and feel. You can also disable the feature completely.
-    |
-    */
+        /*
+        |--------------------------------------------------------------------------
+        | Table of Contents Settings
+        |--------------------------------------------------------------------------
+        |
+        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
+        | has a Table of Contents included. Here, you can configure its behavior,
+        | content, look and feel. You can also disable the feature completely.
+        |
+        */
+
+        'table_of_contents' => [
+            'enabled' => true,
+            'min_heading_level' => 2,
+            'max_heading_level' => 4,
+        ],
 
-    'table_of_contents' => [
-        'enabled' => true,
-        'min_heading_level' => 2,
-        'max_heading_level' => 4,
     ],
 
     /*
diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 012947357c0..bf97a15f88d 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -12,7 +12,7 @@
             {{ $item->getLabel() }}
         </a>
 
-        @if(config('docs.table_of_contents.enabled', true))
+        @if(config('docs.sidebar.table_of_contents.enabled', true))
             <span class="sr-only">Table of contents</span>
             {!! ($page->getTableOfContents()) !!}
         @endif
diff --git a/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php b/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
index 0a68d1b032b..2889b0fe419 100644
--- a/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
+++ b/packages/framework/src/Framework/Actions/GeneratesTableOfContents.php
@@ -35,8 +35,8 @@ public function execute(): string
                 'position' => 'placeholder',
                 'placeholder' => '[[START_TOC]]',
                 'style' => 'bullet',
-                'min_heading_level' => Config::getInt('docs.table_of_contents.min_heading_level', 2),
-                'max_heading_level' => Config::getInt('docs.table_of_contents.max_heading_level', 4),
+                'min_heading_level' => Config::getInt('docs.sidebar.table_of_contents.min_heading_level', 2),
+                'max_heading_level' => Config::getInt('docs.sidebar.table_of_contents.max_heading_level', 4),
                 'normalize' => 'relative',
             ],
             'heading_permalink' => [
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index c9df40fe15c..6ca14b5b9b8 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -51,7 +51,7 @@ public function getOnlineSourcePath(): string|false
 
     public static function hasTableOfContents(): bool
     {
-        return Config::getBool('docs.table_of_contents.enabled', true);
+        return Config::getBool('docs.sidebar.table_of_contents.enabled', true);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/MarkdownServiceTest.php b/packages/framework/tests/Feature/MarkdownServiceTest.php
index d3c68a835ef..aac0df233e0 100644
--- a/packages/framework/tests/Feature/MarkdownServiceTest.php
+++ b/packages/framework/tests/Feature/MarkdownServiceTest.php
@@ -192,7 +192,7 @@ public function testMethodCanEnablePermalinksIsAutomaticallyForDocumentationPage
     {
         $service = new MarkdownServiceTestClass(pageClass: DocumentationPage::class);
 
-        Config::set('docs.table_of_contents.enabled', true);
+        Config::set('docs.sidebar.table_of_contents.enabled', true);
 
         $this->assertTrue($service->canEnablePermalinks());
     }
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index b725e59477a..9304a4955c1 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -195,10 +195,10 @@ public function testHasTableOfContents()
     {
         $this->assertIsBool(DocumentationPage::hasTableOfContents());
 
-        Config::set('docs.table_of_contents.enabled', true);
+        Config::set('docs.sidebar.table_of_contents.enabled', true);
         $this->assertTrue(DocumentationPage::hasTableOfContents());
 
-        Config::set('docs.table_of_contents.enabled', false);
+        Config::set('docs.sidebar.table_of_contents.enabled', false);
         $this->assertFalse(DocumentationPage::hasTableOfContents());
     }
 

From 57a013e7936690b0e73cce9a8ea3bb8b5f6da8a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 22 Feb 2024 21:12:27 +0100
Subject: [PATCH 0706/2811] Implement skipped tests

---
 .../AutomaticNavigationConfigurationsTest.php | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 98541a8be20..e6f8926327e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -545,6 +545,18 @@ public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
         ]);
     }
 
+    public function testMainMenuAutomaticDropdownLabelsCanBeSetInConfig()
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Bar', 'children' => ['Bar']],
+        ], [
+            new MarkdownPage('foo/bar'),
+        ]);
+    }
+
     // Documentation sidebar menu tests
 
     public function testSidebarWithPages()
@@ -846,14 +858,15 @@ public function testSidebarWithConfigLabels()
         ]);
     }
 
-    public function testSidebarDropdownLabelsCanBeSetInConfig()
+    public function testSidebarGroupLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
-    }
+        config(['docs.sidebar_group_labels' => ['foo' => 'Bar']]);
 
-    public function testSidebarAutomaticDropdownLabelsCanBeSetInConfig()
-    {
-        $this->markTestSkipped('Not yet implemented');
+        $this->assertSidebarEquals([
+            ['label' => 'Bar', 'children' => ['Bar']],
+        ], [
+            new DocumentationPage('foo/bar'),
+        ]);
     }
 
     public function testSidebarWithConfigHidden()

From af79a2c591795fa3b3a2a18829613239dd08e269 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 11:05:34 +0100
Subject: [PATCH 0707/2811] Support setting sidebar labels in config

---
 .../Factories/NavigationDataFactory.php       | 21 +++++++++++++++++--
 .../AutomaticNavigationConfigurationsTest.php |  2 --
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 7d02a193d4e..2503fa0c027 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -73,7 +73,7 @@ public function toArray(): array
     protected function makeLabel(): ?string
     {
         return $this->searchForLabelInFrontMatter()
-            ?? $this->searchForLabelInConfig()
+            ?? $this->searchForLabelInConfigs()
             ?? $this->getMatter('title')
             ?? $this->title;
     }
@@ -139,7 +139,14 @@ private function searchForPriorityInFrontMatter(): ?int
             ?? $this->getMatter('navigation.order');
     }
 
-    private function searchForLabelInConfig(): ?string
+    private function searchForLabelInConfigs(): ?string
+    {
+        return $this->isInstanceOf(DocumentationPage::class)
+            ? $this->searchForLabelInSidebarConfig()
+            : $this->searchForLabelInNavigationConfig();
+    }
+
+    private function searchForLabelInNavigationConfig(): ?string
     {
         /** @var array<string, string> $config */
         $config = Config::getArray('hyde.navigation.labels', [
@@ -150,6 +157,16 @@ private function searchForLabelInConfig(): ?string
         return $config[$this->routeKey] ?? null;
     }
 
+    private function searchForLabelInSidebarConfig(): ?string
+    {
+        /** @var array<string>|array<string, string> $config */
+        $config = Config::getArray('docs.sidebar.labels', [
+            DocumentationPage::homeRouteName() => 'Docs',
+        ]);
+
+        return $config[$this->routeKey] ?? $config[$this->identifier] ?? null;
+    }
+
     private function searchForPriorityInConfigs(): ?int
     {
         return $this->isInstanceOf(DocumentationPage::class)
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index e6f8926327e..319769282fc 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -847,8 +847,6 @@ public function testSidebarWithMixedConfigOrders()
 
     public function testSidebarWithConfigLabels()
     {
-        $this->markTestSkipped('Not supported (yet?)');
-
         config(['docs.sidebar.labels' => ['foo' => 'First', 'bar' => 'Second', 'baz' => 'Third']]);
 
         $this->assertSidebarEquals(['First', 'Second', 'Third'], [

From 3431ebebd606c4def6aff696f20414d01f5b7330 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 11:25:06 +0100
Subject: [PATCH 0708/2811] Generate tests from patch using GPT 4

---
 .../Unit/NavigationDataFactoryUnitTest.php    | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 9674273bf75..1b764372e0c 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -146,6 +146,53 @@ public function testRouteKeysCanBeUsedForDocumentationSidebarPriorities()
         $this->assertSame(502, $factory->makePriority());
     }
 
+    public function testSearchForLabelInNavigationConfigForMarkdownPage()
+    {
+        self::mockConfig([
+            'hyde.navigation.labels' => [
+                'foo' => 'Foo Label',
+                'bar' => 'Bar Label',
+            ],
+        ]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'foo'));
+        $this->assertSame('Foo Label', $factory->makeLabel());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'bar'));
+        $this->assertSame('Bar Label', $factory->makeLabel());
+    }
+
+    public function testSearchForLabelInSidebarConfigForDocumentationPage()
+    {
+        self::mockConfig([
+            'docs.sidebar.labels' => [
+                'foo' => 'Documentation Foo Label',
+                'bar' => 'Documentation Bar Label',
+            ],
+        ]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'foo', pageClass: DocumentationPage::class));
+        $this->assertSame('Documentation Foo Label', $factory->makeLabel());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'bar', pageClass: DocumentationPage::class));
+        $this->assertSame('Documentation Bar Label', $factory->makeLabel());
+    }
+
+    public function testLabelFallbackToTitleIfNotDefinedInConfig()
+    {
+        self::mockConfig([
+            'hyde.navigation.labels' => [],
+            'docs.sidebar.labels' => [],
+        ]);
+
+        // Assuming the title fallback is correctly set in front matter or title property
+        $frontMatter = new FrontMatter(['title' => 'Fallback Title']);
+        $coreDataObject = new CoreDataObject($frontMatter, new Markdown(), MarkdownPage::class, '', '', '', 'undefinedKey');
+
+        $factory = new NavigationConfigTestClass($coreDataObject);
+        $this->assertSame('Fallback Title', $factory->makeLabel());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);
@@ -163,4 +210,9 @@ public function makePriority(): int
     {
         return parent::makePriority();
     }
+
+    public function makeLabel(): ?string
+    {
+        return parent::makeLabel();
+    }
 }

From 7adb3435e1bce47829b679d5a2171502f85b2f39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:22:41 +0100
Subject: [PATCH 0709/2811] Support setting sidebar hidden state in config

---
 .../Factories/NavigationDataFactory.php          | 16 +++++++++++++++-
 .../AutomaticNavigationConfigurationsTest.php    |  2 --
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 2503fa0c027..6a40d250ece 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -91,7 +91,7 @@ protected function makeHidden(): bool
     {
         return $this->isInstanceOf(MarkdownPost::class)
             || $this->searchForHiddenInFrontMatter()
-            || $this->isPageHiddenInNavigationConfiguration()
+            || $this->searchForHiddenInConfigs()
             || $this->isNonDocumentationPageInHiddenSubdirectory();
     }
 
@@ -120,11 +120,25 @@ private function searchForHiddenInFrontMatter(): ?bool
             ?? $this->invert($this->getMatter('navigation.visible'));
     }
 
+    private function searchForHiddenInConfigs(): ?bool
+    {
+        return $this->isInstanceOf(DocumentationPage::class)
+            ? $this->isPageHiddenInSidebarConfiguration()
+            : $this->isPageHiddenInNavigationConfiguration();
+    }
+
     private function isPageHiddenInNavigationConfiguration(): ?bool
     {
         return in_array($this->routeKey, Config::getArray('hyde.navigation.exclude', ['404']));
     }
 
+    private function isPageHiddenInSidebarConfiguration(): ?bool
+    {
+        $config = Config::getArray('docs.sidebar.exclude', ['404']);
+
+        return in_array($this->routeKey, $config) || in_array($this->identifier, $config);
+    }
+
     private function isNonDocumentationPageInHiddenSubdirectory(): bool
     {
         return ! $this->isInstanceOf(DocumentationPage::class)
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 319769282fc..16436394c3e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -869,8 +869,6 @@ public function testSidebarGroupLabelsCanBeSetInConfig()
 
     public function testSidebarWithConfigHidden()
     {
-        $this->markTestSkipped('Not supported (yet?)');
-
         config(['docs.sidebar.exclude' => ['foo', 'bar', 'baz']]);
 
         $this->assertSidebarEquals([], [

From 2f0c88cba582a210463964430297753697acf884 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:31:13 +0100
Subject: [PATCH 0710/2811] Add auxiliary check to allow hiding docs index from
 main navigation

For backwards compatibility we keep this desired logic
---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 6a40d250ece..c6c62d3c9e1 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -136,7 +136,7 @@ private function isPageHiddenInSidebarConfiguration(): ?bool
     {
         $config = Config::getArray('docs.sidebar.exclude', ['404']);
 
-        return in_array($this->routeKey, $config) || in_array($this->identifier, $config);
+        return in_array($this->routeKey, $config) || in_array($this->identifier, $config) || $this->isPageHiddenInNavigationConfiguration();
     }
 
     private function isNonDocumentationPageInHiddenSubdirectory(): bool

From f4606cc8edef4ba7d03ff90fd7a5cfbba3f68844 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:32:32 +0100
Subject: [PATCH 0711/2811] Generate tests from patch using GPT 4

---
 .../Unit/NavigationDataFactoryUnitTest.php    | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 1b764372e0c..85719ae6611 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -193,6 +193,50 @@ public function testLabelFallbackToTitleIfNotDefinedInConfig()
         $this->assertSame('Fallback Title', $factory->makeLabel());
     }
 
+    public function testPageIsHiddenBasedOnNavigationConfiguration()
+    {
+        self::mockConfig(['hyde.navigation.exclude' => ['hiddenPage']]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'hiddenPage'));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'visiblePage'));
+        $this->assertFalse($factory->makeHidden());
+    }
+
+    public function testPageIsHiddenBasedOnSidebarConfigurationForDocumentationPage()
+    {
+        self::mockConfig(['docs.sidebar.exclude' => ['hiddenDocPage']]);
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('hiddenDocPage', pageClass: DocumentationPage::class));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('visibleDocPage', pageClass: DocumentationPage::class));
+        $this->assertFalse($factory->makeHidden());
+    }
+
+    public function testSearchForHiddenInConfigsSelectsCorrectConfigurationBasedOnPageType()
+    {
+        self::mockConfig([
+            'hyde.navigation.exclude' => ['hiddenPage'],
+            'docs.sidebar.exclude' => ['hiddenDocPage'],
+        ]);
+
+        // Test for a Markdown page, should use navigation.exclude config
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'hiddenPage'));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject(routeKey: 'visiblePage'));
+        $this->assertFalse($factory->makeHidden());
+
+        // Test for a Documentation page, should use docs.sidebar.exclude config
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('hiddenDocPage', pageClass: DocumentationPage::class));
+        $this->assertTrue($factory->makeHidden());
+
+        $factory = new NavigationConfigTestClass($this->makeCoreDataObject('visibleDocPage', pageClass: DocumentationPage::class));
+        $this->assertFalse($factory->makeHidden());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);
@@ -215,4 +259,9 @@ public function makeLabel(): ?string
     {
         return parent::makeLabel();
     }
+
+    public function makeHidden(): bool
+    {
+        return parent::makeHidden();
+    }
 }

From b93174f9926b8ddfecb7b7c7504e09ba1dc68710 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 12:32:38 +0100
Subject: [PATCH 0712/2811] Document reasoning behind code

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c6c62d3c9e1..e131e6adb21 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -136,7 +136,11 @@ private function isPageHiddenInSidebarConfiguration(): ?bool
     {
         $config = Config::getArray('docs.sidebar.exclude', ['404']);
 
-        return in_array($this->routeKey, $config) || in_array($this->identifier, $config) || $this->isPageHiddenInNavigationConfiguration();
+        return
+            // Check if the page is hidden from the sidebar by route key or identifier.
+            (in_array($this->routeKey, $config) || in_array($this->identifier, $config))
+            // Check if the page is hidden from the main navigation by its route key.
+            || $this->isPageHiddenInNavigationConfiguration();
     }
 
     private function isNonDocumentationPageInHiddenSubdirectory(): bool

From 956b5e387c7b19731cc3623aee2ad3495facd4c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:03:06 +0100
Subject: [PATCH 0713/2811] Clarify test method name

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 16436394c3e..4687c25118a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -407,7 +407,7 @@ public function testMainNavigationDropdownLabelsCanBeSetInConfig()
         $this->markTestSkipped('Not yet implemented');
     }
 
-    public function testMainNavigationAutomaticDropdownLabelsCanBeSetInConfig()
+    public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()
     {
         $this->markTestSkipped('Not yet implemented');
     }

From aa55e5f3b1f953c8d95a657c5e86aa1c2ef78305 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:20:40 +0100
Subject: [PATCH 0714/2811] Implement test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4687c25118a..064f1a9b50c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -404,7 +404,12 @@ public function testMainNavigationMenuWithConfigLabels()
 
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
+        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
+        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+
+        $this->assertMenuEquals(['Bar'], [
+            new MarkdownPage('child', ['navigation.group' => 'foo']),
+        ]);
     }
 
     public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()

From 98459bbf1919ba908ab4451a3a07064b662dc510 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:21:00 +0100
Subject: [PATCH 0715/2811] Change test data to be clearer

Foo be confusing sometimes
---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 064f1a9b50c..f3012979fe0 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -405,10 +405,10 @@ public function testMainNavigationMenuWithConfigLabels()
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
         config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
-        config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
+        config(['hyde.navigation.labels' => ['hello' => 'World']]);
 
-        $this->assertMenuEquals(['Bar'], [
-            new MarkdownPage('child', ['navigation.group' => 'foo']),
+        $this->assertMenuEquals(['World'], [
+            new MarkdownPage('foo', ['navigation.group' => 'Hello']),
         ]);
     }
 

From aa4fc0f4eaef9d3776582889a61180c3b2d6ac5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 23 Feb 2024 21:22:54 +0100
Subject: [PATCH 0716/2811] Implement test

---
 .../Feature/AutomaticNavigationConfigurationsTest.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index f3012979fe0..8c8142bbcea 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -414,7 +414,12 @@ public function testMainNavigationDropdownLabelsCanBeSetInConfig()
 
     public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()
     {
-        $this->markTestSkipped('Not yet implemented');
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.labels' => ['hello' => 'World']]);
+
+        $this->assertMenuEquals(['World'], [
+            new MarkdownPage('hello/world'),
+        ]);
     }
 
     public function testMainNavigationMenuWithConfigHidden()

From 6dd834b38efa8520c464dc2d908c50d0dc98b6af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:26:24 +0100
Subject: [PATCH 0717/2811] Clarify helper method name

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3f2d3d54480..042f8186f44 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,12 +33,12 @@ public function hasGroups(): bool
     public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
-        $currentPageIsIndexPageAndShouldBeActive = $this->isPageIndexPage() && $this->shouldIndexPageBeActive($group);
+        $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
     }
 
-    private function isPageIndexPage(): bool
+    private function isCurrentPageIndexPage(): bool
     {
         return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
     }

From 3f68b03631c433b1c25982179646d32ce14dd6d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:29:33 +0100
Subject: [PATCH 0718/2811] Remove unnecessary type annotation comment

---
 .../resources/views/components/docs/sidebar-items.blade.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 615ea53dcd4..9f7bfc12451 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */ @endphp
 @if(! $sidebar->hasGroups())
     <ul id="sidebar-items" role="list" class="pl-2">
         @foreach ($sidebar->getItems() as $item)

From 1f433e30f28d42f9dfc41a280c5a911c84fc3323 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:36:29 +0100
Subject: [PATCH 0719/2811] Create DocumentationSidebarUnitTest.php

---
 .../tests/Unit/DocumentationSidebarUnitTest.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
new file mode 100644
index 00000000000..a12224bee2a
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ */
+class DocumentationSidebarUnitTest extends UnitTestCase
+{
+    //
+}

From e35d45807e66e1ca29917103d7a6192628ced5de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:37:02 +0100
Subject: [PATCH 0720/2811] Link to unit test

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 3bb0b2b6545..35de82258a4 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -24,6 +24,8 @@
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavItem
+ *
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class DocumentationSidebarTest extends TestCase
 {

From 5323caf22b08ff370035b6060645e93a96096647 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:40:51 +0100
Subject: [PATCH 0721/2811] Copy over and adapt unit tests from navigation menu
 unit test

---
 .../Unit/DocumentationSidebarUnitTest.php     | 101 +++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index a12224bee2a..f8123b073e3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,6 +5,10 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -13,5 +17,100 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
-    //
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar($this->getItems()));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar(collect($this->getItems())));
+    }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar($this->getItems()))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar(collect($this->getItems())))->getItems());
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new DocumentationSidebar())->getItems()->all());
+    }
+
+    public function testCanAddItems()
+    {
+        $menu = new DocumentationSidebar();
+        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new DocumentationSidebar();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new DocumentationSidebar();
+        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
+        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
+        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    protected function getItems(): array
+    {
+        return [
+            new NavItem(new ExternalRoute('/'), 'Home'),
+            new NavItem(new ExternalRoute('/about'), 'About'),
+            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+        ];
+    }
 }

From a41b5aa1dc9977c2b909f232439c87bf02d5f37e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:46:35 +0100
Subject: [PATCH 0722/2811] Extract testing helper method

---
 .../Unit/DocumentationSidebarUnitTest.php     | 25 +++++++++++--------
 .../tests/Unit/NavigationMenuUnitTest.php     | 25 +++++++++++--------
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f8123b073e3..0b5f6e170b8 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -69,7 +69,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -80,9 +80,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -94,9 +94,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -108,9 +108,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 1b0f9a08a58..aa654e3cf2b 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -70,7 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -81,9 +81,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +95,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +109,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }

From 29b14d6ea425972f7c92092e85ad3f356b751a05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:54:51 +0100
Subject: [PATCH 0723/2811] Cover base class

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 0b5f6e170b8..cce704cd337 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -12,6 +12,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
  */

From e5a298976487cfde3ba8a730f18d78355034bc24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:55:07 +0100
Subject: [PATCH 0724/2811] Update test data to better suit subject

---
 .../Unit/DocumentationSidebarUnitTest.php     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index cce704cd337..b8db1d1ad6f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -70,7 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
-        $item = $this->item('/', 'Home');
+        $item = $this->item('/', 'Docs');
 
         $menu->add($item);
 
@@ -81,9 +81,9 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
-        $item1 = $this->item('/', 'Home');
-        $item2 = $this->item('/about', 'About');
-        $item3 = $this->item('/contact', 'Contact');
+        $item1 = $this->item('/', 'Docs');
+        $item2 = $this->item('/installation', 'Installation');
+        $item3 = $this->item('/getting-started', 'Getting Started');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +95,9 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
-        $item1 = $this->item('/', 'Home', 100);
-        $item2 = $this->item('/about', 'About', 200);
-        $item3 = $this->item('/contact', 'Contact', 300);
+        $item1 = $this->item('/', 'Docs', 100);
+        $item2 = $this->item('/installation', 'Installation', 200);
+        $item3 = $this->item('/getting-started', 'Getting Started', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +109,9 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            $this->item('/', 'Home'),
-            $this->item('/about', 'About'),
-            $this->item('/contact', 'Contact'),
+            $this->item('/', 'Docs'),
+            $this->item('/installation', 'Installation'),
+            $this->item('/getting-started', 'Getting Started'),
         ];
     }
 

From b3aad5a8e1baf17049dd94e78ebfd2c1f846843d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 13:56:01 +0100
Subject: [PATCH 0725/2811] Format test code

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 3 +++
 packages/framework/tests/Unit/NavigationMenuUnitTest.php       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b8db1d1ad6f..2fd02cfd2cc 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -70,6 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new DocumentationSidebar();
+
         $item = $this->item('/', 'Docs');
 
         $menu->add($item);
@@ -81,6 +82,7 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new DocumentationSidebar();
+
         $item1 = $this->item('/', 'Docs');
         $item2 = $this->item('/installation', 'Installation');
         $item3 = $this->item('/getting-started', 'Getting Started');
@@ -95,6 +97,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new DocumentationSidebar();
+
         $item1 = $this->item('/', 'Docs', 100);
         $item2 = $this->item('/installation', 'Installation', 200);
         $item3 = $this->item('/getting-started', 'Getting Started', 300);
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index aa654e3cf2b..5a9d765ea1c 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -70,6 +70,7 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
+
         $item = $this->item('/', 'Home');
 
         $menu->add($item);
@@ -81,6 +82,7 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
+
         $item1 = $this->item('/', 'Home');
         $item2 = $this->item('/about', 'About');
         $item3 = $this->item('/contact', 'Contact');
@@ -95,6 +97,7 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
+
         $item1 = $this->item('/', 'Home', 100);
         $item2 = $this->item('/about', 'About', 200);
         $item3 = $this->item('/contact', 'Contact', 300);

From 86487fb9982bac1c7278dae6801cd1955af3d809 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:11:26 +0100
Subject: [PATCH 0726/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69b8b18bac3..487f5c78135 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,6 +206,8 @@ public function addChild(NavItem $item): void
         $this->children[] = $item;
     }
 
+    // Todo add method to add multiple children at once?
+
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From 6d91c3171882d043822ab4470846398901c4228d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:12:05 +0100
Subject: [PATCH 0727/2811] Make `NavItem::addChild` method fluent

---
 .../src/Framework/Features/Navigation/NavItem.php         | 4 +++-
 packages/framework/tests/Unit/NavItemTest.php             | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 487f5c78135..5be8695d751 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -199,11 +199,13 @@ public function isCurrent(): bool
     /**
      * Add a navigation item to the children of the navigation item.
      */
-    public function addChild(NavItem $item): void
+    public function addChild(NavItem $item): static
     {
         // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
 
         $this->children[] = $item;
+
+        return $this;
     }
 
     // Todo add method to add multiple children at once?
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f2caf94538c..754d536f1ac 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -396,4 +396,12 @@ public function testCanAddItemToDropdown()
 
         $this->assertSame([$child], $parent->getChildren());
     }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChild($child));
+    }
 }

From 14c40a8eba8b94b7812bdfdd02ca8fbb77220bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:14:49 +0100
Subject: [PATCH 0728/2811] Unit test has groups method

---
 .../Unit/DocumentationSidebarUnitTest.php     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 2fd02cfd2cc..30aee410386 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
@@ -109,6 +110,25 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
+    {
+        $this->assertFalse((new DocumentationSidebar())->hasGroups());
+    }
+
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
+    {
+        self::mockConfig();
+        self::setupKernel();
+
+        $page = new DocumentationPage('foo');
+        $child = new DocumentationPage('bar');
+        $menu = new DocumentationSidebar([
+            NavItem::fromRoute($page->getRoute())->addChild(NavItem::fromRoute($child->getRoute())),
+        ]);
+
+        $this->assertTrue($menu->hasGroups());
+    }
+
     protected function getItems(): array
     {
         return [

From ae36b95f4c4ec1fcbeea0ba798fc9cbf2b56c91d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:18:38 +0100
Subject: [PATCH 0729/2811] Categorize tests

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php     | 4 ++++
 packages/framework/tests/Unit/NavigationMenuUnitTest.php      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 30aee410386..f4cba3feb81 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -19,6 +19,8 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
@@ -110,6 +112,8 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    // Sidebar specific tests
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 5a9d765ea1c..60948237682 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -18,6 +18,8 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());

From b456e324c6f87d4194e8e21997ec9ac2c6fc9e3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:19:04 +0100
Subject: [PATCH 0730/2811] Add test crosslinks

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 packages/framework/tests/Unit/NavigationMenuUnitTest.php       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f4cba3feb81..f6278a9291b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -16,6 +16,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 60948237682..648bb55a092 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -15,6 +15,7 @@
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {

From f01159a59d936865b470cace8e3ea690c585fcfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:20:11 +0100
Subject: [PATCH 0731/2811] Test get method resolves instance from service
 container

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index f6278a9291b..6b0a4e75484 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -115,6 +115,13 @@ public function testItemsAreSortedByPriority()
 
     // Sidebar specific tests
 
+    public function testGetMethodResolvesInstanceFromServiceContainer()
+    {
+        app()->instance('navigation.sidebar', $instance = new DocumentationSidebar());
+
+        $this->assertSame($instance, DocumentationSidebar::get());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 36493489eb5dd7f9a4d63a50bc35d5d7ba83ff8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:28:56 +0100
Subject: [PATCH 0732/2811] Add child constructor

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 042f8186f44..4300899ecdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,6 +6,7 @@
 
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
 use function app;
@@ -20,6 +21,11 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
+    public function __construct(Arrayable|array $items = [])
+    {
+        parent::__construct($items);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 1718f53390ecb9c87bd6e9d6bc8545ca0f4f9796 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 14:31:27 +0100
Subject: [PATCH 0733/2811] Add config accessor to the sidebar class

---
 .../Navigation/DocumentationSidebar.php       |  6 ++++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4300899ecdf..dab898839fa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Contracts\Support\Arrayable;
@@ -26,6 +27,11 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
+    public function isCollapsible(): bool
+    {
+        return Config::getBool('docs.sidebar.collapsible', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 6b0a4e75484..71ebb676c4f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,27 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testIsCollapsibleReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->isCollapsible());
+    }
+
+    public function testIsCollapsibleReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->isCollapsible());
+    }
+
+    public function testIsCollapsibleReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->isCollapsible());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 2fe21b8b368827b772527118dfafa52fdb85be8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 15:12:26 +0100
Subject: [PATCH 0734/2811] Use sidebar accessor method

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 9f7bfc12451..c029cfe468a 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php ($collapsible = config('docs.sidebar.collapsible', true))
+        @php ($collapsible = $sidebar->isCollapsible())
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>

From 0de41c6d263dc99b51330aa0beca84f678118e67 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 15:12:41 +0100
Subject: [PATCH 0735/2811] Inline Blade variable

---
 .../views/components/docs/sidebar-items.blade.php     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index c029cfe468a..2485420d786 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,16 +6,15 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php ($collapsible = $sidebar->isCollapsible())
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($collapsible) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
-                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $collapsible]) @if($collapsible) @click="groupOpen = ! groupOpen" @endif>
-                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $collapsible])>{{ $group->getLabel() }}</h4>
-                    @if($collapsible)
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
+                <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
+                    <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
+                    @if($sidebar->isCollapsible())
                         @include('hyde::components.docs.sidebar-group-toggle-button')
                     @endif
                 </header>
-                <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($collapsible) x-show="groupOpen" @endif>
+                <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($sidebar->isCollapsible()) x-show="groupOpen" @endif>
                     @foreach ($group->getChildren() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach

From 381ada17cda32dce1cafe79198d94ef41c3ef046 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 17:58:30 +0100
Subject: [PATCH 0736/2811] Remove unnecessary type annotation comment

---
 .../resources/views/components/docs/sidebar-item.blade.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index bf97a15f88d..caa2472f043 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Hyde\Framework\Features\Navigation\NavItem $item */ @endphp
 @props(['grouped' => false])
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'

From 959654c4900def9f30f2e9fe12275149c2343508 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:00:24 +0100
Subject: [PATCH 0737/2811] Remove unnecessary parentheses

---
 .../resources/views/components/docs/sidebar-item.blade.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index caa2472f043..cb0274b5304 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -13,7 +13,7 @@
 
         @if(config('docs.sidebar.table_of_contents.enabled', true))
             <span class="sr-only">Table of contents</span>
-            {!! ($page->getTableOfContents()) !!}
+            {!! $page->getTableOfContents() !!}
         @endif
     @else
         <a href="{{ $item->getDestination() }}" @class([$grouped

From 0e56c4b3b527543a3923287777acfc862459b028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:02:55 +0100
Subject: [PATCH 0738/2811] Add config accessor for the sidebar footer state

---
 .../Navigation/DocumentationSidebar.php       |  5 +++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index dab898839fa..b75d3382bbe 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -32,6 +32,11 @@ public function isCollapsible(): bool
         return Config::getBool('docs.sidebar.collapsible', true);
     }
 
+    public function hasFooter(): bool
+    {
+        return Config::getBool('docs.sidebar.footer', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 71ebb676c4f..b2c9d2451c2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -143,6 +143,27 @@ public function testIsCollapsibleReturnsFalseWhenConfigIsFalse()
         $this->assertFalse((new DocumentationSidebar())->isCollapsible());
     }
 
+    public function testHasFooterReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
+    public function testHasFooterReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
+    public function testHasFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From afb462697fb076b05cd0233a1bea45df7871e1d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:09:26 +0100
Subject: [PATCH 0739/2811] Ensure compatibility with string values

Uses strict typing, though it could also return a bool cast to make 'false' and '' be false, but I prefer strict typing and want to nudge people to use false if they explicably want the sidebar footer to be disabled.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 5 +++++
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b75d3382bbe..763ab097f60 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Str;
 
 use function app;
+use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
 {
@@ -34,6 +35,10 @@ public function isCollapsible(): bool
 
     public function hasFooter(): bool
     {
+        if (is_string(Config::get('docs.sidebar.footer'))) {
+            return true;
+        }
+
         return Config::getBool('docs.sidebar.footer', true);
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b2c9d2451c2..a3d8db53a54 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,13 @@ public function testHasFooterReturnsTrueByDefault()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
+    public function testHasFooterReturnsTrueWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertTrue((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasFooterReturnsTrueWhenConfigIsTrue()
     {
         self::mockConfig(['docs.sidebar.footer' => true]);

From 89598f3dcb57de427ebb4fb36c7a1664f10298b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:11:26 +0100
Subject: [PATCH 0740/2811] Use the footer state accessor

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 9cd5dad15c4..866b1813714 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -7,7 +7,7 @@
             'sidebar' => app('navigation.sidebar'),
         ])
     </nav>
-    @if(config('docs.sidebar.footer', true) !== false)
+    @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
             @include('hyde::components.docs.sidebar-footer-text')
         </footer>

From 923d0301e3d673dae9e28adf9ad6a439ff76bd7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 18:12:06 +0100
Subject: [PATCH 0741/2811] Set default value

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 763ab097f60..92dbd6cd5d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,7 +35,7 @@ public function isCollapsible(): bool
 
     public function hasFooter(): bool
     {
-        if (is_string(Config::get('docs.sidebar.footer'))) {
+        if (is_string(Config::get('docs.sidebar.footer', true))) {
             return true;
         }
 

From b5223fcd81c175e565f59a89647faeb985f6211f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 19:44:21 +0100
Subject: [PATCH 0742/2811] Add footer config accessor

---
 .../Navigation/DocumentationSidebar.php       |  5 ++++
 .../Unit/DocumentationSidebarUnitTest.php     | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 92dbd6cd5d8..426f708e509 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,6 +23,11 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
+    public function getFooter(): bool|string
+    {
+        return Config::get('docs.sidebar.footer', true);
+    }
+
     public function __construct(Arrayable|array $items = [])
     {
         parent::__construct($items);
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index a3d8db53a54..e85a7aca302 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,34 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testGetFooterReturnsTrueByDefault()
+    {
+        self::mockConfig();
+
+        $this->assertTrue((new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsStringWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsTrueWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertTrue((new DocumentationSidebar())->getFooter());
+    }
+
+    public function testGetFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->getFooter());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();

From bd773d7087d63d760fcd009c351a9deba5c337ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 19:56:02 +0100
Subject: [PATCH 0743/2811] Get data through sidebar instance

---
 .../components/docs/sidebar-footer-text.blade.php    |  4 ++--
 .../views/components/docs/sidebar.blade.php          |  4 +++-
 .../Feature/Views/SidebarFooterTextViewTest.php      | 12 +++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
index 6b49ca39bb1..49e2218fbdb 100644
--- a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
@@ -1,7 +1,7 @@
 <p>
-    @if(is_bool(config('docs.sidebar.footer', true)))
+    @if(is_bool($sidebar->getFooter())))
         <a href="{{ Hyde::relativeLink('index.html') }}">Back to home page</a>
     @else
-        {{ Hyde::markdown(config('docs.sidebar.footer')) }}
+        {{ Hyde::markdown($sidebar->getFooter()) }}
     @endif
 </p>
\ No newline at end of file
diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 866b1813714..dcd158d993f 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -9,7 +9,9 @@
     </nav>
     @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
-            @include('hyde::components.docs.sidebar-footer-text')
+            @include('hyde::components.docs.sidebar-footer-text', [
+            'sidebar' => app('navigation.sidebar'),
+        ])
         </footer>
     @endif
 </aside>
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index e4d5c21e9a3..f575483e0c9 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 class SidebarFooterTextViewTest extends TestCase
 {
@@ -14,7 +15,7 @@ class SidebarFooterTextViewTest extends TestCase
 
     public function testSidebarFooterTextViewWithDefaultConfig()
     {
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
     }
@@ -23,7 +24,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
     {
         Config::set('docs.sidebar.footer', true);
 
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
     }
@@ -32,7 +33,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
     {
         Config::set('docs.sidebar.footer', 'Your Markdown String Here');
 
-        $view = $this->test(view('hyde::components.docs.sidebar-footer-text'));
+        $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
         $view->assertSeeText('Your Markdown String Here');
     }
@@ -43,4 +44,9 @@ public function testSidebarFooterTextViewWhenConfigOptionIsFalse()
 
         $this->assertTrue(true);
     }
+
+    protected function withSidebar(): array
+    {
+        return ['sidebar' => new DocumentationSidebar()];
+    }
 }

From e5a8ad7fd3e4d6a0e261e9d7d93e37b5322b2386 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 24 Feb 2024 21:09:37 +0100
Subject: [PATCH 0744/2811] Initialize sidebar instance

---
 .../views/components/docs/sidebar.blade.php       | 11 +++++------
 .../framework/tests/Feature/SidebarViewTest.php   | 15 ++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index dcd158d993f..06a76534214 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,17 +1,16 @@
+@php
+$sidebar = app('navigation.sidebar');
+@endphp
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
     </header>
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
-        @include('hyde::components.docs.sidebar-items', [
-            'sidebar' => app('navigation.sidebar'),
-        ])
+        @include('hyde::components.docs.sidebar-items')
     </nav>
     @if(app('navigation.sidebar')->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
-            @include('hyde::components.docs.sidebar-footer-text', [
-            'sidebar' => app('navigation.sidebar'),
-        ])
+            @include('hyde::components.docs.sidebar-footer-text')
         </footer>
     @endif
 </aside>
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index a7b83594db7..0c338671485 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -43,9 +43,7 @@ public function testBaseSidebar()
             ->assertDontSee('<li class="sidebar-item')
             ->allGood();
 
-        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
-        ]));
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-footer-text'));
@@ -96,9 +94,7 @@ public function testBaseSidebarWithItems()
             ->assertSeeHtml('<li class="sidebar-item')
             ->allGood();
 
-        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
-        ]));
+        $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
     }
 
     public function testSidebarWithGroupedItems()
@@ -125,7 +121,6 @@ public function testSidebarWithGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -157,7 +152,6 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -182,7 +176,6 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->allGood();
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
-            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
             'grouped' => true,
         ]));
 
@@ -191,6 +184,10 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
 
     protected function renderComponent(View $view): self
     {
+        $sidebar = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        app()->instance('navigation.sidebar', $sidebar);
+        view()->share('sidebar', $sidebar);
+
         try {
             $this->html = $view->render();
             /** @noinspection LaravelFunctionsInspection */

From aa05542b629ec557f65a3d75f471e726052ca2bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:29:34 +0100
Subject: [PATCH 0745/2811] Cherry pick unit test from
 https://github.com/hydephp/develop/pull/1587

---
 .../Unit/DocumentationSidebarUnitTest.php     | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
new file mode 100644
index 00000000000..76d95bc8193
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -0,0 +1,142 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Collection;
+use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
+ */
+class DocumentationSidebarUnitTest extends UnitTestCase
+{
+    // Base menu tests
+
+    public function testCanConstruct()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar());
+    }
+
+    public function testCanConstructWithItemsArray()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar($this->getItems()));
+    }
+
+    public function testCanConstructWithItemsArrayable()
+    {
+        $this->assertInstanceOf(DocumentationSidebar::class, new DocumentationSidebar(collect($this->getItems())));
+    }
+
+    public function testGetItemsReturnsCollection()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar())->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArray()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar($this->getItems()))->getItems());
+    }
+
+    public function testGetItemsReturnsCollectionWhenSuppliedArrayable()
+    {
+        $this->assertInstanceOf(Collection::class, (new DocumentationSidebar(collect($this->getItems())))->getItems());
+    }
+
+    public function testGetItemsReturnsItems()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar($items))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsItemsWhenSuppliedArrayable()
+    {
+        $items = $this->getItems();
+
+        $this->assertSame($items, (new DocumentationSidebar(collect($items)))->getItems()->all());
+    }
+
+    public function testGetItemsReturnsEmptyArrayWhenNoItems()
+    {
+        $this->assertSame([], (new DocumentationSidebar())->getItems()->all());
+    }
+
+    public function testCanAddItems()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item = $this->item('/', 'Docs');
+
+        $menu->add($item);
+
+        $this->assertCount(1, $menu->getItems());
+        $this->assertSame($item, $menu->getItems()->first());
+    }
+
+    public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item1 = $this->item('/', 'Docs');
+        $item2 = $this->item('/installation', 'Installation');
+        $item3 = $this->item('/getting-started', 'Getting Started');
+
+        $menu->add($item1);
+        $menu->add($item2);
+        $menu->add($item3);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $menu = new DocumentationSidebar();
+
+        $item1 = $this->item('/', 'Docs', 100);
+        $item2 = $this->item('/installation', 'Installation', 200);
+        $item3 = $this->item('/getting-started', 'Getting Started', 300);
+
+        $menu->add($item3);
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
+    }
+
+    // Sidebar specific tests
+
+    public function testGetMethodResolvesInstanceFromServiceContainer()
+    {
+        app()->instance('navigation.sidebar', $instance = new DocumentationSidebar());
+
+        $this->assertSame($instance, DocumentationSidebar::get());
+    }
+
+    public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
+    {
+        $this->assertFalse((new DocumentationSidebar())->hasGroups());
+    }
+
+    protected function getItems(): array
+    {
+        return [
+            $this->item('/', 'Docs'),
+            $this->item('/installation', 'Installation'),
+            $this->item('/getting-started', 'Getting Started'),
+        ];
+    }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
+}

From 9cf28093b73c8762398bdc59bb9e6c7161658028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:30:14 +0100
Subject: [PATCH 0746/2811] Cherry pick changes to unit test from
 https://github.com/hydephp/develop/pull/1587

---
 .../tests/Unit/NavigationMenuUnitTest.php     | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 1b0f9a08a58..648bb55a092 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -15,9 +15,12 @@
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\NavigationMenuTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    // Base menu tests
+
     public function testCanConstruct()
     {
         $this->assertInstanceOf(MainNavigationMenu::class, new MainNavigationMenu());
@@ -70,7 +73,8 @@ public function testGetItemsReturnsEmptyArrayWhenNoItems()
     public function testCanAddItems()
     {
         $menu = new MainNavigationMenu();
-        $item = new NavItem(new ExternalRoute('/'), 'Home');
+
+        $item = $this->item('/', 'Home');
 
         $menu->add($item);
 
@@ -81,9 +85,10 @@ public function testCanAddItems()
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home');
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About');
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact');
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+        $item3 = $this->item('/contact', 'Contact');
 
         $menu->add($item1);
         $menu->add($item2);
@@ -95,9 +100,10 @@ public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPrioritie
     public function testItemsAreSortedByPriority()
     {
         $menu = new MainNavigationMenu();
-        $item1 = new NavItem(new ExternalRoute('/'), 'Home', 100);
-        $item2 = new NavItem(new ExternalRoute('/about'), 'About', 200);
-        $item3 = new NavItem(new ExternalRoute('/contact'), 'Contact', 300);
+
+        $item1 = $this->item('/', 'Home', 100);
+        $item2 = $this->item('/about', 'About', 200);
+        $item3 = $this->item('/contact', 'Contact', 300);
 
         $menu->add($item3);
         $menu->add($item1);
@@ -109,9 +115,14 @@ public function testItemsAreSortedByPriority()
     protected function getItems(): array
     {
         return [
-            new NavItem(new ExternalRoute('/'), 'Home'),
-            new NavItem(new ExternalRoute('/about'), 'About'),
-            new NavItem(new ExternalRoute('/contact'), 'Contact'),
+            $this->item('/', 'Home'),
+            $this->item('/about', 'About'),
+            $this->item('/contact', 'Contact'),
         ];
     }
+
+    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    {
+        return new NavItem(new ExternalRoute($destination), $label, $priority);
+    }
 }

From 71fb1d782e4b9ccb67cec26855897121ed807c6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:32:03 +0100
Subject: [PATCH 0747/2811] Use the resolved sidebar instance

---
 .../framework/resources/views/components/docs/sidebar.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 06a76534214..35b845b1366 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -8,7 +8,7 @@
     <nav id="sidebar-navigation" class="p-2 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-full">
         @include('hyde::components.docs.sidebar-items')
     </nav>
-    @if(app('navigation.sidebar')->hasFooter())
+    @if($sidebar->hasFooter())
         <footer id="sidebar-footer" class="h-16 p-4 w-full bottom-0 left-0 text-center leading-8">
             @include('hyde::components.docs.sidebar-footer-text')
         </footer>

From d4358caa78e6280ef04249fcabfeb770f2733c77 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 11:36:58 +0100
Subject: [PATCH 0748/2811] Update IDE helper file with sidebar variable

---
 _ide_helper.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/_ide_helper.php b/_ide_helper.php
index 7d868d7bbb5..8cc231f850f 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -22,6 +22,11 @@
 /** @var string $routeKey The route key for the page being compiled/previewed */
 $routeKey = \Hyde\Support\Facades\Render::getRouteKey();
 
+// Variables available only to some page types
+
+/** @var \Hyde\Framework\Features\Navigation\DocumentationSidebar $sidebar */
+$sidebar = app('navigation.sidebar');
+
 // Facades (aliased in app/config.php)
 
 /** @mixin \Hyde\Foundation\HydeKernel */

From 6643a4abaa7035037d4fcef4e27dadbb9ec9d7a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 15:33:28 +0100
Subject: [PATCH 0749/2811] Fix method order

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 426f708e509..9197247b4e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -23,14 +23,14 @@ public static function get(): static
         return app('navigation.sidebar');
     }
 
-    public function getFooter(): bool|string
+    public function __construct(Arrayable|array $items = [])
     {
-        return Config::get('docs.sidebar.footer', true);
+        parent::__construct($items);
     }
 
-    public function __construct(Arrayable|array $items = [])
+    public function getFooter(): bool|string
     {
-        parent::__construct($items);
+        return Config::get('docs.sidebar.footer', true);
     }
 
     public function isCollapsible(): bool

From 28831efcdcc864567b77ce5900570dfef703bcc7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 15:33:46 +0100
Subject: [PATCH 0750/2811] Move down method

---
 .../Features/Navigation/DocumentationSidebar.php       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9197247b4e5..0c76bf0d97a 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,11 +33,6 @@ public function getFooter(): bool|string
         return Config::get('docs.sidebar.footer', true);
     }
 
-    public function isCollapsible(): bool
-    {
-        return Config::getBool('docs.sidebar.collapsible', true);
-    }
-
     public function hasFooter(): bool
     {
         if (is_string(Config::get('docs.sidebar.footer', true))) {
@@ -47,6 +42,11 @@ public function hasFooter(): bool
         return Config::getBool('docs.sidebar.footer', true);
     }
 
+    public function isCollapsible(): bool
+    {
+        return Config::getBool('docs.sidebar.collapsible', true);
+    }
+
     public function hasGroups(): bool
     {
         return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());

From 08bc6feee34a94a9140c78af2542c5b0cf312b23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 18:07:11 +0100
Subject: [PATCH 0751/2811] Add footer text accessor

---
 .../Navigation/DocumentationSidebar.php       | 11 ++++++++++
 .../Unit/DocumentationSidebarUnitTest.php     | 21 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0c76bf0d97a..e42ce5e5db7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -33,6 +33,17 @@ public function getFooter(): bool|string
         return Config::get('docs.sidebar.footer', true);
     }
 
+    public function getFooterText(): ?string
+    {
+        $option = Config::get('docs.sidebar.footer', true);
+
+        if (is_string($option)) {
+            return $option;
+        }
+
+        return null;
+    }
+
     public function hasFooter(): bool
     {
         if (is_string(Config::get('docs.sidebar.footer', true))) {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index e85a7aca302..1f6aba2bb97 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,27 @@ public function testGetFooterReturnsFalseWhenConfigIsFalse()
         $this->assertFalse((new DocumentationSidebar())->getFooter());
     }
 
+    public function testGetFooterTextReturnsStringWhenConfigIsString()
+    {
+        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
+
+        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooterText());
+    }
+
+    public function testGetFooterTextReturnsNullWhenConfigIsTrue()
+    {
+        self::mockConfig(['docs.sidebar.footer' => true]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooterText());
+    }
+
+    public function testGetFooterTextReturnsNullWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooterText());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();

From b9f8e3dca0ce71e46394d8f8cb1b110a1527a889 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 11:54:08 +0100
Subject: [PATCH 0752/2811] Change default navigation footer config option to
 be the default link

Uses the link from the view, in order to simplify the API. A drawback of this is that it no longer resolves dynamic links, but given the increased visibility of the option I think the tradeoff is worth it as it makes it easier to customize.
---
 config/docs.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/docs.php b/config/docs.php
index 93bbc751dc2..4ac1dd70706 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -30,9 +30,8 @@
         // When using a grouped sidebar, should the groups be collapsible?
         'collapsible' => true,
 
-        // Should the sidebar footer be shown? You can also set this to a string
-        // of Markdown to show in the footer. Set to `false` to disable.
-        'footer' => true,
+        // A string of Markdown to show in the footer. Set to `false` to disable.
+        'footer' => '[Back to home page](../)',
 
         /*
         |--------------------------------------------------------------------------

From 2fcf75a4c921914949d7b9c593d809a9e67ccc07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 13:28:37 +0100
Subject: [PATCH 0753/2811] Massively simplify sidebar footer text handling

---
 .../docs/sidebar-footer-text.blade.php        |  8 +----
 .../Navigation/DocumentationSidebar.php       | 20 +++++------
 .../tests/Feature/SidebarViewTest.php         |  9 ++---
 .../Views/SidebarFooterTextViewTest.php       | 11 ++-----
 .../Unit/DocumentationSidebarUnitTest.php     | 33 ++++---------------
 ...veLinksAcrossPagesRetainsIntegrityTest.php |  2 +-
 6 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
index 49e2218fbdb..ddc7e711303 100644
--- a/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-footer-text.blade.php
@@ -1,7 +1 @@
-<p>
-    @if(is_bool($sidebar->getFooter())))
-        <a href="{{ Hyde::relativeLink('index.html') }}">Back to home page</a>
-    @else
-        {{ Hyde::markdown($sidebar->getFooter()) }}
-    @endif
-</p>
\ No newline at end of file
+{{ Hyde::markdown($sidebar->getFooter()) }}
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e42ce5e5db7..600d1503abd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -28,29 +28,25 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
-    public function getFooter(): bool|string
+    public function getFooter(): ?string
     {
-        return Config::get('docs.sidebar.footer', true);
-    }
-
-    public function getFooterText(): ?string
-    {
-        $option = Config::get('docs.sidebar.footer', true);
+        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
 
         if (is_string($option)) {
             return $option;
         }
 
+        if ($option === true) {
+            /** @deprecated Backwards compatibility */
+            return '[Back to home page](../)';
+        }
+
         return null;
     }
 
     public function hasFooter(): bool
     {
-        if (is_string(Config::get('docs.sidebar.footer', true))) {
-            return true;
-        }
-
-        return Config::getBool('docs.sidebar.footer', true);
+        return $this->getFooter() !== null;
     }
 
     public function isCollapsible(): bool
diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 0c338671485..522d25de033 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -37,7 +37,7 @@ public function testBaseSidebar()
             ->assertSeeHtml('<ul id="sidebar-items" role="list"')
             ->assertSeeHtml('<nav id="sidebar-navigation"')
             ->assertSeeHtml('<footer id="sidebar-footer"')
-            ->assertSeeHtml('<a href="index.html">Back to home page</a>')
+            ->assertSeeHtml('<a href="../">Back to home page</a>')
             ->assertSeeHtml('<span class="sr-only">Toggle dark theme</span>')
             ->assertDontSee('<a href="docs/index.html">')
             ->assertDontSee('<li class="sidebar-item')
@@ -53,9 +53,10 @@ public function testBaseSidebarWithoutFooter()
     {
         config(['docs.sidebar.footer' => false]);
 
-        $this->renderComponent(view('hyde::components.docs.sidebar'));
-
-        $this->assertViewWasNotRendered(view('hyde::components.docs.sidebar-footer-text'));
+        $this->renderComponent(view('hyde::components.docs.sidebar'))
+            ->assertDontSee('<footer id="sidebar-footer"')
+            ->assertDontSee('Back to home page')
+            ->allGood();
     }
 
     public function testBaseSidebarWithCustomFooterText()
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index f575483e0c9..7e9f407289b 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -17,7 +17,7 @@ public function testSidebarFooterTextViewWithDefaultConfig()
     {
         $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
-        $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
+        $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
     public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
@@ -26,7 +26,7 @@ public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
 
         $view = $this->test(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
 
-        $view->assertSeeHtml('<a href="index.html">Back to home page</a>');
+        $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
     public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
@@ -38,13 +38,6 @@ public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
         $view->assertSeeText('Your Markdown String Here');
     }
 
-    public function testSidebarFooterTextViewWhenConfigOptionIsFalse()
-    {
-        // This state is handled earlier in the component by the sidebar component so we don't need to test it here.
-
-        $this->assertTrue(true);
-    }
-
     protected function withSidebar(): array
     {
         return ['sidebar' => new DocumentationSidebar()];
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 1f6aba2bb97..41d658162b7 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,11 +122,11 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
-    public function testGetFooterReturnsTrueByDefault()
+    public function testGetFooterReturnsBackLinkByDefault()
     {
         self::mockConfig();
 
-        $this->assertTrue((new DocumentationSidebar())->getFooter());
+        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
     }
 
     public function testGetFooterReturnsStringWhenConfigIsString()
@@ -136,39 +136,18 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsTrueWhenConfigIsTrue()
+    public function testGetFooterReturnsBackLinkWhenConfigIsTrue()
     {
         self::mockConfig(['docs.sidebar.footer' => true]);
 
-        $this->assertTrue((new DocumentationSidebar())->getFooter());
+        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsFalseWhenConfigIsFalse()
+    public function testGetFooterReturnsNullWhenConfigIsFalse()
     {
         self::mockConfig(['docs.sidebar.footer' => false]);
 
-        $this->assertFalse((new DocumentationSidebar())->getFooter());
-    }
-
-    public function testGetFooterTextReturnsStringWhenConfigIsString()
-    {
-        self::mockConfig(['docs.sidebar.footer' => 'Some footer content']);
-
-        $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooterText());
-    }
-
-    public function testGetFooterTextReturnsNullWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooterText());
-    }
-
-    public function testGetFooterTextReturnsNullWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooterText());
+        $this->assertNull((new DocumentationSidebar())->getFooter());
     }
 
     public function testIsCollapsibleReturnsTrueByDefault()
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index c263016b94f..facec7a3cc6 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -93,7 +93,7 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<link rel="stylesheet" href="../media/app.css">',
             '<a href="../docs/index.html">',
             '<a href="../docs/docs.html"',
-            '<a href="../index.html">Back to home page</a>',
+            '<a href="../">Back to home page</a>',
         ]);
     }
 }

From ca62c8c906f9b2394240d2224aa09daae1ae7219 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 16:39:38 +0100
Subject: [PATCH 0754/2811] Pass sidebar instance as component variable

---
 .../resources/views/components/docs/sidebar.blade.php          | 3 ---
 packages/framework/resources/views/layouts/docs.blade.php      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 35b845b1366..0196551d310 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,6 +1,3 @@
-@php
-$sidebar = app('navigation.sidebar');
-@endphp
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index 3f66d821517..e6bdb4886cf 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -8,7 +8,7 @@
 
     @include('hyde::components.skip-to-content-button')
     @include('hyde::components.docs.mobile-navigation')
-    @include('hyde::components.docs.sidebar')
+    @include('hyde::components.docs.sidebar', ['sidebar' => app('navigation.sidebar')])
 
     <main id="content" class="dark:bg-gray-900 min-h-screen bg-gray-50 md:bg-white absolute top-16 md:top-0 w-screen md:left-64 md:w-[calc(100vw_-_16rem)]">
         @include('hyde::components.docs.documentation-article')

From ee594f0eaaf1b4220a7719658b1ecdd8cf0a043b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 17:10:02 +0100
Subject: [PATCH 0755/2811] Add sidebar header accessor

---
 .../Features/Navigation/DocumentationSidebar.php   |  5 +++++
 .../tests/Unit/DocumentationSidebarUnitTest.php    | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 600d1503abd..11cb904cc7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -28,6 +28,11 @@ public function __construct(Arrayable|array $items = [])
         parent::__construct($items);
     }
 
+    public function getHeader(): string
+    {
+        return Config::get('docs.sidebar.header', 'Documentation');
+    }
+
     public function getFooter(): ?string
     {
         $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 41d658162b7..fc3b74ea55f 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -122,6 +122,20 @@ public function testGetMethodResolvesInstanceFromServiceContainer()
         $this->assertSame($instance, DocumentationSidebar::get());
     }
 
+    public function testGetHeaderReturnsDefaultWhenNotConfigured()
+    {
+        self::mockConfig();
+
+        $this->assertSame('Documentation', (new DocumentationSidebar())->getHeader());
+    }
+
+    public function testGetHeaderReturnsConfiguredValue()
+    {
+        self::mockConfig(['docs.sidebar.header' => 'Some header']);
+
+        $this->assertSame('Some header', (new DocumentationSidebar())->getHeader());
+    }
+
     public function testGetFooterReturnsBackLinkByDefault()
     {
         self::mockConfig();

From 8d28069dafab3c12409d58a2739ecda5dc6f0367 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 26 Feb 2024 17:12:40 +0100
Subject: [PATCH 0756/2811] Use sidebar header accessor

---
 .../views/components/docs/sidebar-brand.blade.php         | 4 ++--
 .../tests/Feature/Views/SidebarBrandViewTest.php          | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
index ad693a85c96..e150f86e133 100644
--- a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
@@ -2,10 +2,10 @@
     <strong class="px-2">
         @if(DocumentationPage::home())
             <a href="{{ DocumentationPage::home() }}">
-                {{ config('docs.sidebar.header', 'Documentation') }}
+                {{  $sidebar->getHeader() }}
             </a>
         @else
-            {{ config('docs.sidebar.header', 'Documentation') }}
+            {{ $sidebar->getHeader() }}
         @endif
     </strong>
     <x-hyde::navigation.theme-toggle-button class="opacity-75 hover:opacity-100"/>
diff --git a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
index 10b840bf5e4..1086a1b40f6 100644
--- a/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarBrandViewTest.php
@@ -9,6 +9,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 class SidebarBrandViewTest extends TestCase
 {
@@ -68,4 +69,11 @@ public function testSidebarBrandViewWithoutDarkmodeFeature()
         $view->assertSee('HydePHP Docs');
         $view->assertDontSee('theme-toggle-button');
     }
+
+    protected function testViewData(): array
+    {
+        return [
+            'sidebar' => new DocumentationSidebar(),
+        ];
+    }
 }

From d12b00147f4853b75f08d0999d84e5b7374dbdd8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 27 Feb 2024 19:03:32 +0100
Subject: [PATCH 0757/2811] Change void testing helper to return instance

---
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c8142bbcea..8a0109e4f13 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1240,14 +1240,14 @@ public function testSidebarGroupCasingUsingFrontMatter()
 
     // Testing helpers
 
-    protected function assertSidebarEquals(array $expected, array $menuPages): void
+    protected function assertSidebarEquals(array $expected, array $menuPages): AssertableNavigationMenu
     {
-        $this->sidebar($menuPages)->assertEquals($expected);
+        return $this->sidebar($menuPages)->assertEquals($expected);
     }
 
-    protected function assertMenuEquals(array $expected, array $menuPages): void
+    protected function assertMenuEquals(array $expected, array $menuPages): AssertableNavigationMenu
     {
-        $this->menu($menuPages)->assertEquals($expected);
+        return $this->menu($menuPages)->assertEquals($expected);
     }
 
     #[NoReturn]

From e2b14c91c9612793c93b71bcc0ffc3f7a87d3243 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 27 Feb 2024 19:05:15 +0100
Subject: [PATCH 0758/2811] Add back testing helper to die with the state

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8a0109e4f13..fdae21d2a38 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1334,6 +1334,11 @@ public function getState(int $index): ?TestNavItem
         return $this->state()[$index] ?? null;
     }
 
+    public function ddState(): void
+    {
+        dd($this->state());
+    }
+
     /**
      * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored

From d02531b2c721b71441d827939d3658d2f9bef0dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:15:10 +0100
Subject: [PATCH 0759/2811] Rename test methods names to be clearer

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fdae21d2a38..79f42d1e1fe 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -200,7 +200,7 @@ public function testMainNavigationMenuWithFrontMatterVisible()
         ]);
     }
 
-    public function testMainNavigationMenuWithFrontMatterGroup()
+    public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsRegardlessOfConfigSetting()
     {
         // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
 
@@ -215,7 +215,7 @@ public function testMainNavigationMenuWithFrontMatterGroup()
         ]);
     }
 
-    public function testMainNavigationMenuWithFrontMatterCategory()
+    public function testMainNavigationMenuWithExplicitFrontMatterCategoryUsesDropdownsRegardlessOfConfigSetting()
     {
         // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
 

From 080d2043864b35d7851090d810a231c0c0160c5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:11:10 +0100
Subject: [PATCH 0760/2811] Move up conditional

---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b490ac19bc2..00ed144add6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -120,14 +120,14 @@ protected function canAddRoute(Route $route): bool
 
     protected function canGroupRoute(Route $route): bool
     {
-        if (! $this->usesGroups) {
-            return false;
-        }
-
         if (! $this->generatesSidebar) {
             return $route->getPage()->navigationMenuGroup() !== null;
         }
 
+        if (! $this->usesGroups) {
+            return false;
+        }
+
         return true;
     }
 

From 8f171ad20e19e161204a57ca5bd6e6d505dab49f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:29:22 +0100
Subject: [PATCH 0761/2811] Expect root item with the group name and the
 children as the pages

---
 .../AutomaticNavigationConfigurationsTest.php        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 79f42d1e1fe..3c9f8219b1c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -202,12 +202,8 @@ public function testMainNavigationMenuWithFrontMatterVisible()
 
     public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsRegardlessOfConfigSetting()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['label' => 'Group 1', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1']),
@@ -217,12 +213,8 @@ public function testMainNavigationMenuWithExplicitFrontMatterGroupUsesDropdownsR
 
     public function testMainNavigationMenuWithExplicitFrontMatterCategoryUsesDropdownsRegardlessOfConfigSetting()
     {
-        // TODO: For new v2 system, this should insert a root item with the group name and the children as the pages
-
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Bar', 'group' => 'group-1'],
-            ['label' => 'Baz', 'group' => 'group-1'],
+            ['label' => 'Group 1', 'children' => ['Foo', 'Bar', 'Baz']],
         ], [
             new MarkdownPage('foo', ['navigation.category' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.category' => 'Group 1']),

From 353603bb9ff22dedb1ac778b06ffac1cb3465e7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 11:37:19 +0100
Subject: [PATCH 0762/2811] Expect that menu items are always grouped when set
 in front matter

---
 .../Feature/AutomaticNavigationConfigurationsTest.php    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 3c9f8219b1c..61ae342659d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -284,7 +284,10 @@ public function testMainNavigationMenuWithFrontMatterGroupAndCategory()
     {
         // Since the main key in the navigation schema is 'group', that takes precedence over its 'category' alias
 
-        $this->assertMenuEquals(array_fill(0, 3, ['group' => 'group-1']), [
+        $this->assertMenuEquals([[
+            'label' => 'Group 1',
+            'children' => ['Foo', 'Bar', 'Baz'],
+        ]], [
             new MarkdownPage('foo', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('bar', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
             new MarkdownPage('baz', ['navigation.group' => 'Group 1', 'navigation.category' => 'Group 2']),
@@ -486,8 +489,8 @@ public function testMainNavigationMenuItemsWithTheSameLabelAreNotFilteredForDupl
     public function testMainNavigationMenuItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
         $this->assertMenuEquals([
-            ['label' => 'Foo', 'group' => 'group-1'],
-            ['label' => 'Foo', 'group' => 'group-2'],
+            ['label' => 'Group 1', 'children' => ['Foo']],
+            ['label' => 'Group 2', 'children' => ['Foo']],
         ], [
             new MarkdownPage('foo', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 1']),
             new MarkdownPage('bar', ['navigation.label' => 'Foo', 'navigation.group' => 'Group 2']),

From 7c754535ce9c3e673d8e7236d6fedb9eb293d310 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 13:46:20 +0100
Subject: [PATCH 0763/2811] Remove resolved hotpatches from test

Fixed in https://github.com/hydephp/develop/pull/1597
---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 61ae342659d..ad5ac5a0712 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -399,7 +399,6 @@ public function testMainNavigationMenuWithConfigLabels()
 
     public function testMainNavigationDropdownLabelsCanBeSetInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
         config(['hyde.navigation.labels' => ['hello' => 'World']]);
 
         $this->assertMenuEquals(['World'], [
@@ -1184,8 +1183,6 @@ public function testMainMenuNavigationGroupCasing()
 
     public function testMainMenuNavigationGroupCasingUsingFrontMatter()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']); // TODO This should NOT be necessary when using front matter
-
         // If the user explicitly sets the group, we should respect that and assume it's already formatted correctly
 
         $this->assertMenuEquals(['Hello World'], [new MarkdownPage('foo', ['navigation.group' => 'Hello World'])]);

From e84e0f0e2e5f3942261fc5ad4e933529b71e8aeb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 21:53:47 +0100
Subject: [PATCH 0764/2811] Add method to add multiple children at once

---
 .../Framework/Features/Navigation/NavItem.php | 12 +++++++++-
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5be8695d751..f80db61238c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -208,7 +208,17 @@ public function addChild(NavItem $item): static
         return $this;
     }
 
-    // Todo add method to add multiple children at once?
+    /**
+     * Add multiple navigation items to the children of the navigation item.
+     */
+    public function addChildren(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addChild($item);
+        }
+
+        return $this;
+    }
 
     protected static function normalizeGroupKey(?string $group): ?string
     {
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 754d536f1ac..0b925e936c8 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -404,4 +404,26 @@ public function testAddChildMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChild($child));
     }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChildren([$child1, $child2]);
+
+        $this->assertSame([$child1, $child2], $parent->getChildren());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+    }
 }

From cb580ed31a70a1d14a72f31cf4c47a2bceda7901 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 28 Feb 2024 21:54:41 +0100
Subject: [PATCH 0765/2811] Update todo

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index f80db61238c..89b7943214a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -93,7 +93,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
-     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups.
+     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups. (technically it only makes sense for the main navigation menu, but it's not enforced in the code, and the sidebar does use this method)
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.

From 0d53a8fb46812263de48ef5d1b5e8aa8c73f9bd2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:14:48 +0100
Subject: [PATCH 0766/2811] Create positioning priority constants in the
 navigation menu class

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 84779c79eb9..93b54bb1bfe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,6 +17,10 @@
  */
 abstract class NavigationMenu
 {
+    public const FIRST = 0;
+    public const MIDDLE = 500;
+    public const LAST = 999;
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
     protected Collection $items;
 

From b37b99a36e54b3e6e36c9c0413c7157f3f58830b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:16:12 +0100
Subject: [PATCH 0767/2811] Update factory to use menu class constant

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index e131e6adb21..76f3fa6d3f6 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Framework\Factories\Concerns\CoreDataObject;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 
 use function basename;
@@ -30,7 +31,6 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     final public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
-    protected const FALLBACK_PRIORITY = 999;
     protected const CONFIG_OFFSET = 500;
 
     protected readonly ?string $label;
@@ -99,7 +99,7 @@ protected function makePriority(): int
     {
         return $this->searchForPriorityInFrontMatter()
             ?? $this->searchForPriorityInConfigs()
-            ?? self::FALLBACK_PRIORITY;
+            ?? NavigationMenu::LAST;
     }
 
     private function searchForLabelInFrontMatter(): ?string

From 80d6c9251e0d0f34d1e2e0a82f877df33995f97e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:18:32 +0100
Subject: [PATCH 0768/2811] Use base positioning constant for priority offset

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 76f3fa6d3f6..c3bca4c8f7c 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -31,8 +31,6 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     final public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
-    protected const CONFIG_OFFSET = 500;
-
     protected readonly ?string $label;
     protected readonly ?string $group;
     protected readonly ?bool $hidden;
@@ -230,7 +228,7 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
             return $this->offset(
                 array_flip($config)[$pageKey] ?? null,
-                self::CONFIG_OFFSET
+                NavigationMenu::MIDDLE
             );
         }
 

From 4807e9ff946ea1d67cffa54ea4f52cd99f011fce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:22:54 +0100
Subject: [PATCH 0769/2811] Use priority constant

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 89b7943214a..4aa3ab8f828 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -101,7 +101,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? 999, $label, $items);
+        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From d4e94e6db78a3b30ac8bcb2e4b940de97159bedf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:25:40 +0100
Subject: [PATCH 0770/2811] Use priority constants

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4aa3ab8f828..5e1ece187d7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = 500, ?string $group = null, array $children = [])
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::MIDDLE, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -72,7 +72,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = 500): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::MIDDLE): static
     {
         return new static($href, $label, $priority);
     }

From aaa17a01ca0e4cecbaaa82ba1375f8476a10ae62 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:26:57 +0100
Subject: [PATCH 0771/2811] Remove first constant

---
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 93b54bb1bfe..81cb0da760c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,7 +17,6 @@
  */
 abstract class NavigationMenu
 {
-    public const FIRST = 0;
     public const MIDDLE = 500;
     public const LAST = 999;
 

From 59175a353b1febf5a1643c884bf249ea01dc4253 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 10:27:30 +0100
Subject: [PATCH 0772/2811] Rename middle constant to default

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c3bca4c8f7c..adf2eacbb78 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -228,7 +228,7 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
             return $this->offset(
                 array_flip($config)[$pageKey] ?? null,
-                NavigationMenu::MIDDLE
+                NavigationMenu::DEFAULT
             );
         }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5e1ece187d7..94125f51ba0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::MIDDLE, ?string $group = null, array $children = [])
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
@@ -72,7 +72,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::MIDDLE): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
     {
         return new static($href, $label, $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 81cb0da760c..979b952b95c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,7 +17,7 @@
  */
 abstract class NavigationMenu
 {
-    public const MIDDLE = 500;
+    public const DEFAULT = 500;
     public const LAST = 999;
 
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */

From 44a7adde0c6324da54d2a562f60b9f157a1333c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:48:27 +0100
Subject: [PATCH 0773/2811] Remove todo

No longer planned
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 94125f51ba0..52a03092b26 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -19,8 +19,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @todo Consider splitting facade methods to actual facade class.
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route

From b851af8918f34e3f95a7e6f547285c1582314f6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:50:14 +0100
Subject: [PATCH 0774/2811] Elaborate dropdown method parameter documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 52a03092b26..79489b46247 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,7 +95,7 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
     public static function dropdown(string $label, array $items, ?int $priority = null): static
     {

From 06c73286c81a2105a9e606ec8f8bd3b23908f0a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:51:02 +0100
Subject: [PATCH 0775/2811] Change documentation wording

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 79489b46247..50b9decf093 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -76,9 +76,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
     }
 
     /**
-     * Create a new navigation menu item leading to a Route model.
+     * Create a new navigation menu item leading to a Route instance.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route model or route key
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.

From e172453909c06fffe50f23921b8fcad03d590773 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:51:42 +0100
Subject: [PATCH 0776/2811] Clarify usage documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 50b9decf093..43ae6e3bb58 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,7 +31,7 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** The "slugified" version of the label. */
+    /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */

From d2653e24523d09acb7d3415456e9e70375d0b41e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:52:33 +0100
Subject: [PATCH 0777/2811] Add more code documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43ae6e3bb58..4b324da512c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -34,7 +34,11 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /**
+     * Navigation items can be turned into dropdowns or sidebar groups by adding children.
+     *
+     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
     protected array $children;
 
     /**

From df90de8c9a6fb9d34a8c67015025fef2593d4ed6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:52:52 +0100
Subject: [PATCH 0778/2811] Revert "Add more code documentation"

This reverts commit d2653e24523d09acb7d3415456e9e70375d0b41e.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4b324da512c..43ae6e3bb58 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -34,11 +34,7 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /**
-     * Navigation items can be turned into dropdowns or sidebar groups by adding children.
-     *
-     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $children;
 
     /**

From df04558ec731205a90e5f4a62569ebb7d537c7ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:54:22 +0100
Subject: [PATCH 0779/2811] Add code documentation to class description

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 43ae6e3bb58..ce298a39ba1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -23,6 +23,8 @@
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route
  *   3. You can use NavItem::forLink() for an external or un-routed link
+ *
+ * Navigation items can be turned into dropdowns or sidebar groups by adding children.
  */
 class NavItem implements Stringable
 {

From 6aafad56c642d4c2e152a7f5f03e3e51f96aec3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:54:33 +0100
Subject: [PATCH 0780/2811] Add notes about parent destination state

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ce298a39ba1..87938516e73 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -25,6 +25,8 @@
  *   3. You can use NavItem::forLink() for an external or un-routed link
  *
  * Navigation items can be turned into dropdowns or sidebar groups by adding children.
+ * Note that doing so will mean that any link on the parent will no longer be clickable,
+ * as clicking the parent label will open the dropdown instead of leading to the destination.
  */
 class NavItem implements Stringable
 {

From 635d553245923bce0dbe7eef1e5de7f0d585df24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 11:58:13 +0100
Subject: [PATCH 0781/2811] Fix improper access to protected property

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index a2d05aeb00b..060e228eb0b 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item->hasChildren())
-                        <x-hyde::navigation.dropdown :label="$item->label" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From 7cace47b5f2faac24cc50712e0d1b8edf0d31644 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 12:35:19 +0100
Subject: [PATCH 0782/2811] Remove destinations from items with children for a
 clearer state

These can't be clicked to returning null makes it clearer that the destination is disabled (for example when adding children to an existing instance)
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 packages/framework/tests/Unit/NavItemTest.php               | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 87938516e73..a1132d02950 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -117,8 +117,12 @@ public function __toString(): string
     /**
      * Get the destination route of the navigation item.
      */
-    public function getDestination(): Route
+    public function getDestination(): ?Route
     {
+        if ($this->hasChildren()) {
+            return null;
+        }
+
         return $this->destination;
     }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 0b925e936c8..4e864540cd7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertSame($route, $item->getDestination());
+        $this->assertNull($item->getDestination());
         $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->getChildren());
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertSame('', $item->getDestination()->getLink());
+        $this->assertNull($item->getDestination());
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());

From 4047320ee268b68a229b50f8ffbe046725a3827c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 13:44:27 +0100
Subject: [PATCH 0783/2811] Remove todo for an issue I don't think is possible

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a1132d02950..b1d09fb2621 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -233,6 +233,6 @@ protected static function normalizeGroupKey(?string $group): ?string
 
     protected static function makeIdentifier(string $label): string
     {
-        return Str::slug($label); // Todo: If it's a dropdown based on a subdirectory, we should use the subdirectory as the identifier (start by making a test to see if it's even possible to add a differing label)
+        return Str::slug($label);
     }
 }

From 5405db0d94f90be0469a56ab182dc313fdbabeef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 13:49:03 +0100
Subject: [PATCH 0784/2811] Coalesce assign parent group when added child group
 is null

---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b1d09fb2621..e6ecb310e8d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,7 +207,7 @@ public function isCurrent(): bool
      */
     public function addChild(NavItem $item): static
     {
-        // Todo: Ensure that the item has a group identifier by creating it from the label if it doesn't exist?
+        $item->group ??= $this->group;
 
         $this->children[] = $item;
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 4e864540cd7..b5ff9c6c0b7 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -426,4 +426,26 @@ public function testAddChildrenMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
     }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroup());
+        $this->assertSame('bar', $child->getGroup());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroup());
+        $this->assertSame('foo', $child->getGroup());
+    }
 }

From 439d9c6992c6102d0c5202a40a57752c6feb2eca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:37:09 +0100
Subject: [PATCH 0785/2811] Rename NavItem `dropdown` method to `forGroup`

Also considered using "grouped" but "forGroup" matches the other facade methods.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 +---
 .../Features/Navigation/NavigationMenuGenerator.php         | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php     | 4 ++--
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 packages/framework/tests/Unit/NavItemTest.php               | 6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e6ecb310e8d..ab4ca0bcabd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,13 +95,11 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new dropdown navigation menu item.
      *
-     * @TODO: Might be more semantic to have this named something else, as it also includes sidebars groups. (technically it only makes sense for the main navigation menu, but it's not enforced in the code, and the sidebar does use this method)
-     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function dropdown(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
         return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 00ed144add6..bf82a3bbd5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -160,7 +160,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavItem
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::dropdown($this->normalizeGroupLabel($label), [], $priority);
+        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 0666afeb8b8..2163dce6d6d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -230,7 +230,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavItem::fromRoute(Routes::get('index')),
-            NavItem::dropdown('Foo', [
+            NavItem::forGroup('Foo', [
                 NavItem::fromRoute(Routes::get('foo/bar')),
             ]),
         ]);
@@ -251,7 +251,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavItem::fromRoute(Routes::get('index')),
             NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::dropdown('Bar', [
+            NavItem::forGroup('Bar', [
                 NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 35de82258a4..b2da470a8c5 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -267,10 +267,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('Bar', [
+                NavItem::forGroup('Bar', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::dropdown('Foo', [
+                NavItem::forGroup('Foo', [
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -288,7 +288,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::dropdown('Foo', [
+                NavItem::forGroup('Foo', [
                     NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
                     NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index b5ff9c6c0b7..1816633e0d1 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -263,7 +263,7 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
 
     public function testDropdownFacade()
     {
-        $item = NavItem::dropdown('foo', []);
+        $item = NavItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getChildren());
@@ -276,14 +276,14 @@ public function testDropdownFacadeWithChildren()
             new NavItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavItem::dropdown('foo', $children);
+        $item = NavItem::forGroup('foo', $children);
         $this->assertSame($children, $item->getChildren());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavItem::dropdown('foo', [], 500);
+        $item = NavItem::forGroup('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }

From 37cb4a83441be2099d592427b2e81c11303dfeff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:56:02 +0100
Subject: [PATCH 0786/2811] Call static method statically

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ab4ca0bcabd..0394d192294 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = $this->makeIdentifier($label);
+        $this->identifier = static::makeIdentifier($label);
         $this->children = $children;
     }
 

From e28ae7c8ba55a6507f021f3955f41d025734e05e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:56:49 +0100
Subject: [PATCH 0787/2811] Use explicit cast for equality comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0394d192294..18ee08de286 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === (string) $this->destination;
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /**

From 228e3d4d59d15751332f32ec0f25d828f26be8a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 18:57:28 +0100
Subject: [PATCH 0788/2811] Use existing helper for equality comparison

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 18ee08de286..50e2c563bf7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return $this->destination->is(Hyde::currentRoute());
     }
 
     /**

From 734c95e4f157ffd201b85444986868acbb6ab0b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:04:52 +0100
Subject: [PATCH 0789/2811] Revert "Use existing helper for equality
 comparison"

This reverts commit 228e3d4d59d15751332f32ec0f25d828f26be8a0 as existing helper depends on route keys which do not exist on external routes.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 50e2c563bf7..18ee08de286 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -197,7 +197,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return $this->destination->is(Hyde::currentRoute());
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /**

From faa87b4c403ba0797853b23482dcc7462560874b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:05:28 +0100
Subject: [PATCH 0790/2811] Clarify method description context

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 18ee08de286..17a8a750186 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -193,7 +193,7 @@ public function hasChildren(): bool
     }
 
     /**
-     * Check if the NavItem instance is the current page.
+     * Check if the NavItem instance is the current page being rendered.
      */
     public function isCurrent(): bool
     {

From 8c43c4f63670de6999cad50ce1d7758380812925 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:07:11 +0100
Subject: [PATCH 0791/2811] Move fallback value to default parameter value

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 17a8a750186..b6181fb08e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,9 +99,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
-        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static('', $label, $priority, $label, $items);
     }
 
     /**

From 2d90f7cdc4801a6961586820fd3a623deb6968e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:07:52 +0100
Subject: [PATCH 0792/2811] Remove null type support from facade helper method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6181fb08e8..37686076f92 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,9 +97,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
         return new static('', $label, $priority, $label, $items);
     }

From 9042071b6848715807e3ad3a294aeca42cf34ad6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:11:23 +0100
Subject: [PATCH 0793/2811] Revert "Remove null type support from facade helper
 method"

This reverts commit 2d90f7cdc4801a6961586820fd3a623deb6968e1.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 37686076f92..b6181fb08e8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,9 +97,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
         return new static('', $label, $priority, $label, $items);
     }

From 12ac55f81d7eb5eb117355b2b8ad3a3ca3627212 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:11:26 +0100
Subject: [PATCH 0794/2811] Revert "Move fallback value to default parameter
 value"

This reverts commit 8c43c4f63670de6999cad50ce1d7758380812925.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6181fb08e8..17a8a750186 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,9 +99,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority, $label, $items);
+        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From 1eb85a6ba139d899b61a7ac9d065bf3d895c6f33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:15:30 +0100
Subject: [PATCH 0795/2811] Move up method in source

---
 .../Framework/Features/Navigation/NavItem.php    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 17a8a750186..0b7f2e29cc1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -71,14 +71,6 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
         );
     }
 
-    /**
-     * Create a new navigation menu item leading to an external URI.
-     */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
-    {
-        return new static($href, $label, $priority);
-    }
-
     /**
      * Create a new navigation menu item leading to a Route instance.
      *
@@ -92,6 +84,14 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
         return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
+    /**
+     * Create a new navigation menu item leading to an external URI.
+     */
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
+    {
+        return new static($href, $label, $priority);
+    }
+
     /**
      * Create a new dropdown navigation menu item.
      *

From 6af588a94ea443c173bfeb85afcb069341f84d36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:17:22 +0100
Subject: [PATCH 0796/2811] Deprecate `NavItem::fromRoute()` method

We don't need two methods that do almost the same thing. I'm going to merge them, keeping the name of the other one to match the other similar helpers.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0b7f2e29cc1..429c4180153 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -60,6 +60,8 @@ public function __construct(Route|string $destination, string $label, int $prior
 
     /**
      * Create a new navigation menu item from a route.
+     *
+     * @deprecated Use NavItem::forRoute() instead.
      */
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {

From 6ddd33ed1770d770de9c9d5cfcb5d010f47dafe7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:18:48 +0100
Subject: [PATCH 0797/2811] Inline usage of deprecated method for merged
 replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 429c4180153..08fd6cb011d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,7 +83,12 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
+        return new static(
+            $route instanceof Route ? $route : Routes::getOrFail($route),
+            $label ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuLabel(),
+            $priority ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuPriority(),
+            $group ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**

From b67d9a5304e3028862a585519699ed905b29a2c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:22:27 +0100
Subject: [PATCH 0798/2811] Revert "Inline usage of deprecated method for
 merged replacement"

This reverts commit 6ddd33ed1770d770de9c9d5cfcb5d010f47dafe7.
---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 08fd6cb011d..429c4180153 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,12 +83,7 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return new static(
-            $route instanceof Route ? $route : Routes::getOrFail($route),
-            $label ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuLabel(),
-            $priority ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuPriority(),
-            $group ?? $route instanceof Route ? $route : Routes::getOrFail($route)->getPage()->navigationMenuGroup(),
-        );
+        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
     }
 
     /**

From 83235f0ee946819cec5836b8fcaaefa8cdaa1f99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:27:37 +0100
Subject: [PATCH 0799/2811] Introduce local variable

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 429c4180153..42e351ba0f1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -83,7 +83,9 @@ public static function fromRoute(Route $route, ?string $label = null, ?int $prio
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return static::fromRoute($route instanceof Route ? $route : Routes::getOrFail($route), $label, $priority, $group);
+        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+
+        return static::fromRoute($route, $label, $priority, $group);
     }
 
     /**

From f14bc66a3573ea5b59fe6712a180257b718a10e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:27:58 +0100
Subject: [PATCH 0800/2811] Reinline usage of deprecated method for merged
 replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 42e351ba0f1..7198c985f4a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -85,7 +85,12 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return static::fromRoute($route, $label, $priority, $group);
+        return new static(
+            $route,
+            $label ?? $route->getPage()->navigationMenuLabel(),
+            $priority ?? $route->getPage()->navigationMenuPriority(),
+            $group ?? $route->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**

From 870e00400c132c8e290726e5d3e929eb0a7aeb7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:40:32 +0100
Subject: [PATCH 0801/2811] Update deprecated method to point to replacement

---
 .../src/Framework/Features/Navigation/NavItem.php          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7198c985f4a..e10ce0feffd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -65,12 +65,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        return new static(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        return static::forRoute($route, $label, $priority, $group);
     }
 
     /**

From 1edb2f2255da8cec7060edddd9dff94114e2b54c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 19:50:07 +0100
Subject: [PATCH 0802/2811] Replace all usages of `fromRoute` with `forRoute`

---
 .../Navigation/NavigationMenuGenerator.php    |  6 +--
 .../tests/Feature/NavigationMenuTest.php      | 44 +++++++++----------
 .../Services/DocumentationSidebarTest.php     | 32 +++++++-------
 .../Unit/DocumentationSidebarUnitTest.php     |  2 +-
 .../tests/Unit/NavItemIsCurrentHelperTest.php | 26 +++++------
 packages/framework/tests/Unit/NavItemTest.php | 24 +++++-----
 6 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index bf82a3bbd5c..342a696d96b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavItem::fromRoute($route));
+                    $this->items->put($route->getRouteKey(), NavItem::forRoute($route));
                 }
             }
         });
@@ -79,7 +79,7 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavItem::fromRoute(DocumentationPage::home()));
+                $this->items->push(NavItem::forRoute(DocumentationPage::home()));
             }
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavItem::fromRoute($route);
+        $item = NavItem::forRoute($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2163dce6d6d..2bd704cc40e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -38,7 +38,7 @@ public function testGenerateMethodCreatesCollectionOfNavItems()
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
-            NavItem::fromRoute(Routes::get('docs/index')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -98,7 +98,7 @@ public function testExternalLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('https://example.com', 'foo'),
         ]);
 
@@ -113,7 +113,7 @@ public function testPathLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
         ]);
 
@@ -131,7 +131,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
             NavItem::forLink('foo', 'foo'),
         ]);
@@ -150,7 +150,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestina
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('foo', 'foo'),
             NavItem::forLink('bar', 'foo'),
         ]);
@@ -168,9 +168,9 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forLink('bar', 'Foo'),
-            NavItem::fromRoute(Routes::get('foo')),
+            NavItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('docs/index')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavItem::fromRoute(Routes::get('index'))]);
+        $expected = collect([NavItem::forRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute(Routes::get('foo/bar')),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::fromRoute(Routes::get('index')),
+            NavItem::forRoute(Routes::get('index')),
             NavItem::forGroup('Foo', [
-                NavItem::fromRoute(Routes::get('foo/bar')),
+                NavItem::forRoute(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavItem::fromRoute(Routes::get('index')),
-            NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
+            NavItem::forRoute(Routes::get('index')),
+            NavItem::forRoute((new MarkdownPage('foo'))->getRoute()),
             NavItem::forGroup('Bar', [
-                NavItem::fromRoute((new MarkdownPage('bar/baz'))->getRoute()),
+                NavItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index b2da470a8c5..5195d1f3fdc 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/a'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/b'), priority: 999),
+                NavItem::forRoute(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavItem::fromRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavItem::fromRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
+                NavItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
+                NavItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::fromRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavItem::fromRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavItem::fromRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
+                NavItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
+                NavItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -268,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->assertEquals(
             collect([
                 NavItem::forGroup('Bar', [
-                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
                 NavItem::forGroup('Foo', [
-                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -289,8 +289,8 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->assertEquals(
             collect([
                 NavItem::forGroup('Foo', [
-                    NavItem::fromRoute(Routes::get('docs/bar'), priority: 999),
-                    NavItem::fromRoute(Routes::get('docs/foo'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/index'))]),
+            collect([NavItem::forRoute(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::fromRoute(Routes::get('docs/test-0'))]),
+            collect([NavItem::forRoute(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index fc3b74ea55f..ee75d74d943 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -226,7 +226,7 @@ public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
         $page = new DocumentationPage('foo');
         $child = new DocumentationPage('bar');
         $menu = new DocumentationSidebar([
-            NavItem::fromRoute($page->getRoute())->addChild(NavItem::fromRoute($child->getRoute())),
+            NavItem::forRoute($page->getRoute())->addChild(NavItem::forRoute($child->getRoute())),
         ]);
 
         $this->assertTrue($menu->hasGroups());
diff --git a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php b/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
index d9500006247..97aa4de6f6f 100644
--- a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
+++ b/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
@@ -34,19 +34,19 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::fromRoute(Routes::get('index'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentLink()
@@ -58,13 +58,13 @@ public function testIsCurrentUsingCurrentLink()
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute(Routes::get('index'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isCurrent());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
@@ -76,49 +76,49 @@ public function testIsCurrentUsingNotCurrentLink()
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::fromRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::fromRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 1816633e0d1..525dad28367 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -169,7 +169,7 @@ public function testGetChildrenWithNoChildren()
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavItem::fromRoute($route);
+        $item = NavItem::forRoute($route);
 
         $this->assertSame($route, $item->getDestination());
     }
@@ -178,7 +178,7 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavItem::fromRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavItem::forRoute(Routes::get('index')));
     }
 
     public function testForLink()
@@ -241,24 +241,24 @@ public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavItem::fromRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
@@ -309,8 +309,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::fromRoute(new Route(new InMemoryPage('foo')))->isCurrent());
-        $this->assertFalse(NavItem::fromRoute(new Route(new InMemoryPage('bar')))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isCurrent());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -335,7 +335,7 @@ public function testGetGroupWithGroup()
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::fromRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
     }
 
     public function testGetGroupForRouteWithGroup()
@@ -367,7 +367,7 @@ public function testIdentifierWithCustomLabel()
 
     public function testIdentifierFromRouteKey()
     {
-        $item = NavItem::fromRoute(Routes::get('index'));
+        $item = NavItem::forRoute(Routes::get('index'));
         $this->assertSame('home', $item->getIdentifier());
     }
 

From e9cbf99d60f746da1592defc18410aa0406ab10c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 20:39:46 +0100
Subject: [PATCH 0803/2811] Breaking: Remove method `NavItem::fromRoute()`

---
 .../src/Framework/Features/Navigation/NavItem.php      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e10ce0feffd..8db55c61800 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,16 +58,6 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->children = $children;
     }
 
-    /**
-     * Create a new navigation menu item from a route.
-     *
-     * @deprecated Use NavItem::forRoute() instead.
-     */
-    public static function fromRoute(Route $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
-    {
-        return static::forRoute($route, $label, $priority, $group);
-    }
-
     /**
      * Create a new navigation menu item leading to a Route instance.
      *

From 5970a041a45879e218392a5d04c7e9f0156be331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 20:51:26 +0100
Subject: [PATCH 0804/2811] Annotate child array generics

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8db55c61800..15761616734 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -43,6 +43,8 @@ class NavItem implements Stringable
 
     /**
      * Create a new navigation menu item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
@@ -208,6 +210,8 @@ public function addChild(NavItem $item): static
 
     /**
      * Add multiple navigation items to the children of the navigation item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
     public function addChildren(array $items): static
     {

From 87dbc8029904cb5f19c528c575af77081926c7d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:10:34 +0100
Subject: [PATCH 0805/2811] Update `NavItem::$destination` property to be
 nullable

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 15761616734..8d7c0c9b57b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -30,7 +30,7 @@
  */
 class NavItem implements Stringable
 {
-    protected Route $destination;
+    protected ?Route $destination;
     protected string $label;
     protected int $priority;
     protected ?string $group;
@@ -46,7 +46,7 @@ class NavItem implements Stringable
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From ab95f50e5217dd8f4896db8a096b2f40cfe09586 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:30:19 +0100
Subject: [PATCH 0806/2811] Set destination to null when creating group items

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8d7c0c9b57b..7bd1b7dc451 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -97,7 +97,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, ?int $priority = null): static
     {
-        return new static('', $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }
 
     /**

From fa9c01d05deab0984d7d6794fb0a2e07e6eb85a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:38:05 +0100
Subject: [PATCH 0807/2811] Document null state reasoning

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7bd1b7dc451..bd2925125cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -27,6 +27,7 @@
  * Navigation items can be turned into dropdowns or sidebar groups by adding children.
  * Note that doing so will mean that any link on the parent will no longer be clickable,
  * as clicking the parent label will open the dropdown instead of leading to the destination.
+ * For this reason, dropdown items will have their destination set to null.
  */
 class NavItem implements Stringable
 {
@@ -109,7 +110,7 @@ public function __toString(): string
     }
 
     /**
-     * Get the destination route of the navigation item.
+     * Get the destination route of the navigation item. For dropdowns, this will return null.
      */
     public function getDestination(): ?Route
     {

From f1d9ca7fdb8f4f99f40af54b9efaef5b7eb2ebba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:41:32 +0100
Subject: [PATCH 0808/2811] Enforce group destination null state when adding
 children

Provides a consistent state
---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bd2925125cf..cf385c108c9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -205,6 +205,7 @@ public function addChild(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->children[] = $item;
+        $this->destination = null;
 
         return $this;
     }

From c12f3de85d422708d9f0567f1df9c7a19eeacc88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:41:40 +0100
Subject: [PATCH 0809/2811] Document null state enforcement

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index cf385c108c9..c963e0dc6fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -199,6 +199,8 @@ public function isCurrent(): bool
 
     /**
      * Add a navigation item to the children of the navigation item.
+     *
+     * This will turn the parent item into a dropdown. Its destination will be set to null.
      */
     public function addChild(NavItem $item): static
     {

From 7c08dc66edee0824861e0e70b1ea184ea8932dd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 21:57:14 +0100
Subject: [PATCH 0810/2811] Construct children using helper to enforce type
 state

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c963e0dc6fc..77047479849 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -58,7 +58,7 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->children = $children;
+        $this->addChildren($children);
     }
 
     /**

From 46dd08dd0ad2ab210bf3b6c01649e2c97b605504 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 29 Feb 2024 22:05:06 +0100
Subject: [PATCH 0811/2811] Ensure children are constructed

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77047479849..e09a420f998 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,6 +206,10 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
+        if (!isset($this->children)) {
+            $this->children = [];
+        }
+
         $this->children[] = $item;
         $this->destination = null;
 

From abf031618c82ac91f4bd7a610aaaa9b4f4d31f83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:02:12 +0100
Subject: [PATCH 0812/2811] Revert "Ensure children are constructed"

This reverts commit 46dd08dd0ad2ab210bf3b6c01649e2c97b605504.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e09a420f998..77047479849 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -206,10 +206,6 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        if (!isset($this->children)) {
-            $this->children = [];
-        }
-
         $this->children[] = $item;
         $this->destination = null;
 

From 5b43c7c0eaeb3aedbe0bdca2e9d42e3932ddb573 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:02:39 +0100
Subject: [PATCH 0813/2811] Initialize children property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 77047479849..31ccb67b004 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -40,7 +40,7 @@ class NavItem implements Stringable
     protected string $identifier;
 
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
-    protected array $children;
+    protected array $children = [];
 
     /**
      * Create a new navigation menu item.

From aeff6c45919f135da7e4032e76214a2107c91294 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:04:40 +0100
Subject: [PATCH 0814/2811] Remove redundant null return for null type

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 31ccb67b004..d71e642c7e6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -114,10 +114,6 @@ public function __toString(): string
      */
     public function getDestination(): ?Route
     {
-        if ($this->hasChildren()) {
-            return null;
-        }
-
         return $this->destination;
     }
 

From c76ec470fd9f48305e08e2d8b72e22d091bbf95b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:12:28 +0100
Subject: [PATCH 0815/2811] Add default value to method signature

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d71e642c7e6..cbec59c07ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -96,7 +96,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = null): static
+    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
         return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
     }

From edb8b50f9f073d67a351b64b510fe7e2b181dcf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:37:41 +0100
Subject: [PATCH 0816/2811] Add null coalesce to default priority in generator

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 342a696d96b..b407234ff98 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -160,7 +160,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavItem
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority);
+        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string

From 305b53bb328c1bd377888af4ed2ec7024ccc357e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:38:27 +0100
Subject: [PATCH 0817/2811] Remove null coalesce moved to default value

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index cbec59c07ba..577ebbe19fd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -98,7 +98,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
     {
-        return new static(null, $label, $priority ?? NavigationMenu::LAST, $label, $items);
+        return new static(null, $label, $priority, $label, $items);
     }
 
     /**

From 4036c3c3174e497ca3388440624c19fca825f346 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 12:49:55 +0100
Subject: [PATCH 0818/2811] Remove nullable priority parameter type

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 577ebbe19fd..c487e8094a2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -94,9 +94,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
-     * @param  int|null  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
+     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, ?int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
         return new static(null, $label, $priority, $label, $items);
     }

From 418db0055b95d065628c03290f85d3a680647da2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 13:02:18 +0100
Subject: [PATCH 0819/2811] Document constructor

---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c487e8094a2..4132e9bd2f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -45,7 +45,11 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children
+     * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
+     * @param  string  $label  The label of the navigation item.
+     * @param  int  $priority  The priority to determine the order of the navigation item.
+     * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children  If the item is a dropdown, these are the items to be included in the dropdown.
      */
     public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
     {

From e6c8cc252bb2c8d42b667db456911d9e1661be82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:05:42 +0100
Subject: [PATCH 0820/2811] Rename protected `$destination` property to
 `$route`

---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4132e9bd2f6..a3e08699405 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -31,7 +31,7 @@
  */
 class NavItem implements Stringable
 {
-    protected ?Route $destination;
+    protected ?Route $route;
     protected string $label;
     protected int $priority;
     protected ?string $group;
@@ -57,7 +57,7 @@ public function __construct(Route|string|null $destination, string $label, int $
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
-        $this->destination = $destination;
+        $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
@@ -118,7 +118,7 @@ public function __toString(): string
      */
     public function getDestination(): ?Route
     {
-        return $this->destination;
+        return $this->route;
     }
 
     /**
@@ -126,7 +126,7 @@ public function getDestination(): ?Route
      */
     public function getLink(): string
     {
-        return (string) $this->destination;
+        return (string) $this->route;
     }
 
     /**
@@ -194,7 +194,7 @@ public function hasChildren(): bool
      */
     public function isCurrent(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
     /**
@@ -207,7 +207,7 @@ public function addChild(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->children[] = $item;
-        $this->destination = null;
+        $this->route = null;
 
         return $this;
     }

From 0d74b95b043f8dccc0c6cb75d648e50f4fcd3f1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:06:21 +0100
Subject: [PATCH 0821/2811] Breaking: Rename `NavItem` method `getDestination`
 to `getRoute`

Since the destination property in v2 is normalized to always be a route it no longer makes sense to have a divergent name for it.
---
 .../components/docs/sidebar-item.blade.php    |  4 +--
 .../Framework/Features/Navigation/NavItem.php |  4 +--
 packages/framework/tests/Unit/NavItemTest.php | 32 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index cb0274b5304..6ffdf19c025 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
     ]) role="listitem">
     @if($item->isCurrent())
-        <a href="{{ $item->getDestination() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getDestination() }}" @class([$grouped
+        <a href="{{ $item->getRoute() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a3e08699405..ec15982bc4f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -116,7 +116,7 @@ public function __toString(): string
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
      */
-    public function getDestination(): ?Route
+    public function getRoute(): ?Route
     {
         return $this->route;
     }
@@ -144,7 +144,7 @@ public function getLabel(): string
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getDestination()->getPageClass() === DocumentationPage::class) {
+        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 525dad28367..eeb3294fd7c 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -44,36 +44,36 @@ public function testConstruct()
         $route = new Route(new MarkdownPage());
         $item = new NavItem($route, 'Test', 500);
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
     }
 
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->getDestination());
+        $this->assertSame($route, (new NavItem($route, 'Home'))->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->getDestination());
+        $this->assertSame($route, (new NavItem('index', 'Home'))->getRoute());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
         $item = new NavItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getDestination());
-        $this->assertSame('https://example.com', (string) $item->getDestination());
+        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
+        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
+        $this->assertSame('https://example.com', (string) $item->getRoute());
     }
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
         $item = new NavItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getDestination());
-        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
-        $this->assertSame('foo', (string) $item->getDestination());
+        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
+        $this->assertSame('foo', (string) $item->getRoute());
     }
 
     public function testCanConstructWithChildren()
@@ -86,7 +86,7 @@ public function testCanConstructWithChildren()
         $item = new NavItem($route, 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getDestination());
+        $this->assertNull($item->getRoute());
         $this->assertSame(500, $item->getPriority());
 
         $this->assertCount(2, $item->getChildren());
@@ -111,7 +111,7 @@ public function testCanConstructWithChildrenWithoutRoute()
         $item = new NavItem('', 'Test', 500, null, $children);
 
         $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getDestination());
+        $this->assertNull($item->getRoute());
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -122,7 +122,7 @@ public function testGetDestination()
         $route = new Route(new InMemoryPage('foo'));
         $navItem = new NavItem($route, 'Page', 500);
 
-        $this->assertSame($route, $navItem->getDestination());
+        $this->assertSame($route, $navItem->getRoute());
     }
 
     public function testGetLink()
@@ -171,7 +171,7 @@ public function testFromRoute()
         $route = new Route(new MarkdownPage());
         $item = NavItem::forRoute($route);
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
     }
 
     public function testToString()
@@ -185,7 +185,7 @@ public function testForLink()
     {
         $item = NavItem::forLink('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->getDestination());
+        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -200,7 +200,7 @@ public function testForRoute()
         $route = Routes::get('404');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
     }
@@ -210,7 +210,7 @@ public function testForIndexRoute()
         $route = Routes::get('index');
         $item = NavItem::forRoute($route, 'foo');
 
-        $this->assertSame($route, $item->getDestination());
+        $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }

From 64c3e0e6fc9eeff4a33eaba012b4551071126521 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:18:48 +0100
Subject: [PATCH 0822/2811] Breaking: Rename `NavItem` method `isCurrent` to
 `isActive`

While the method is implemented by using the `currentRoute` helper, the actual end usage is to compare active state, so it makes more sense for this to use that in the name.

   - `isActive()` is more common and may be more intuitive to other developers, as it explicitly suggests that the method is checking if the item is active.
   - `isCurrent()` is also clear, but it might be slightly less common in this context. It still conveys the intended meaning effectively.
---
 .../components/docs/sidebar-item.blade.php    |  4 +-
 .../navigation/navigation-link.blade.php      |  4 +-
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 ...Test.php => NavItemIsActiveHelperTest.php} | 70 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php | 10 +--
 5 files changed, 45 insertions(+), 45 deletions(-)
 rename packages/framework/tests/Unit/{NavItemIsCurrentHelperTest.php => NavItemIsActiveHelperTest.php} (90%)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index 6ffdf19c025..cab03d7c3f3 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,9 +1,9 @@
 @props(['grouped' => false])
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'
-        : 'active bg-black/5 dark:bg-black/10' => $item->isCurrent()
+        : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
-    @if($item->isCurrent())
+    @if($item->isActive())
         <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index dbb5407245a..048faaa6cba 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
-<a href="{{ $item }}" {!! $item->isCurrent() ? 'aria-current="page"' : '' !!} @class([
+<a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
     'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
-    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isCurrent()
+    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ec15982bc4f..6601a7a0027 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -192,7 +192,7 @@ public function hasChildren(): bool
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
-    public function isCurrent(): bool
+    public function isActive(): bool
     {
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
diff --git a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php b/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
similarity index 90%
rename from packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
rename to packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
index 97aa4de6f6f..bbd6d82b4d2 100644
--- a/packages/framework/tests/Unit/NavItemIsCurrentHelperTest.php
+++ b/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
@@ -18,7 +18,7 @@
  *
  * @see \Hyde\Framework\Testing\Unit\NavItemTest
  */
-class NavItemIsCurrentHelperTest extends UnitTestCase
+class NavItemIsActiveHelperTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -34,205 +34,205 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isCurrent());
+        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isCurrent());
+        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isCurrent());
+        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isCurrent());
+        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index eeb3294fd7c..614f24baef3 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -22,7 +22,7 @@
  *
  * @covers \Hyde\Framework\Features\Navigation\NavItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemIsCurrentHelperTest
+ * @see \Hyde\Framework\Testing\Unit\NavItemIsActiveHelperTest
  */
 class NavItemTest extends UnitTestCase
 {
@@ -309,8 +309,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isCurrent());
-        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isCurrent());
+        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -319,8 +319,8 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavItem::forLink('foo', 'bar')->isCurrent());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isCurrent());
+        $this->assertFalse(NavItem::forLink('foo', 'bar')->isActive());
+        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()

From f17a412c77f2480862797816a00ec111600a96d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 15:23:47 +0100
Subject: [PATCH 0823/2811] Breaking: Rename `NavItem` method `getGroup` to
 `getGroupIdentifier`

Renames `getGroup()` to `getGroupIdentifier()` to clarify the purpose of the method.
---
 .../Framework/Features/Navigation/NavItem.php |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../AutomaticNavigationConfigurationsTest.php |  2 +-
 .../Services/DocumentationSidebarTest.php     |  2 +-
 packages/framework/tests/Unit/NavItemTest.php | 20 +++++++++----------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 6601a7a0027..631183c8ed0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -156,7 +156,7 @@ public function getPriority(): int
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
-    public function getGroup(): ?string
+    public function getGroupIdentifier(): ?string
     {
         return $this->group;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b407234ff98..fdc5cf33415 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::forRoute($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroup() ?? 'Other') : $item->getGroup();
+        $groupName = $this->generatesSidebar ? ($item->getGroupIdentifier() ?? 'Other') : $item->getGroupIdentifier();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ad5ac5a0712..8c20c50acda 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1317,7 +1317,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroup(), $item->getPriority(), $item->getChildren());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getChildren());
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 5195d1f3fdc..89c4d055e7d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroup());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroupIdentifier());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 614f24baef3..607e976911a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -146,7 +146,7 @@ public function testGetPriority()
     public function testGetGroup()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroup());
+        $this->assertNull($navItem->getGroupIdentifier());
     }
 
     public function testGetChildren()
@@ -325,28 +325,28 @@ public function testIsCurrentWithExternalRoute()
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroup());
+        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupIdentifier());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroup());
+        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupIdentifier());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupIdentifier());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroup());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupIdentifier());
     }
 
     public function testGroupKeysAreNormalized()
     {
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroup());
+        $this->assertSame('foo-bar', $item->getGroupIdentifier());
     }
 
     public function testIdentifier()
@@ -434,8 +434,8 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroup());
-        $this->assertSame('bar', $child->getGroup());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
@@ -445,7 +445,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroup());
-        $this->assertSame('foo', $child->getGroup());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
     }
 }

From 9646b5b55ec05d4ab1ca04f6754cf33206dcfd31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 17:02:54 +0100
Subject: [PATCH 0824/2811] Breaking: Rename `NavItem` method `getLink` to
 `getUrl`

Renames `getLink()` to `getUrl()` for clarity on what the method returns.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 ++--
 packages/framework/tests/Unit/NavItemTest.php               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 631183c8ed0..b6d245d1cb2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -110,7 +110,7 @@ public static function forGroup(string $label, array $items, int $priority = Nav
      */
     public function __toString(): string
     {
-        return $this->getLink();
+        return $this->getUrl();
     }
 
     /**
@@ -124,7 +124,7 @@ public function getRoute(): ?Route
     /**
      * Resolve the destination link of the navigation item.
      */
-    public function getLink(): string
+    public function getUrl(): string
     {
         return (string) $this->route;
     }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 607e976911a..5ecc2bb8d32 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -95,8 +95,8 @@ public function testCanConstructWithChildren()
         $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
         $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
 
-        $this->assertSame('foo.html', $item->getChildren()[0]->getLink());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getLink());
+        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
 
         $this->assertSame(500, $item->getChildren()[0]->getPriority());
         $this->assertSame(500, $item->getChildren()[1]->getPriority());
@@ -128,7 +128,7 @@ public function testGetDestination()
     public function testGetLink()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getLink());
+        $this->assertSame('foo.html', $navItem->getUrl());
     }
 
     public function testGetLabel()

From b40f49d29ea1827b8abeb3cfb9572dfc5e28682e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 16:04:35 +0100
Subject: [PATCH 0825/2811] Create NavGroupItem.php

---
 .../src/Framework/Features/Navigation/NavGroupItem.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavGroupItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
new file mode 100644
index 00000000000..29a95c96912
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavGroupItem
+{
+    //
+}

From e56696e6c7d40f542661350e069ff51e51436d65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 16:51:58 +0100
Subject: [PATCH 0826/2811] Class `NavGroupItem` extends `NavItem`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 29a95c96912..cef48c39482 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class NavGroupItem
+class NavGroupItem extends NavItem
 {
     //
 }

From 2ba269ea8bf1105d43dc45662ec57e648c4c3d63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:11:02 +0100
Subject: [PATCH 0827/2811] Begin move of child items array to child class

---
 .../src/Framework/Features/Navigation/NavGroupItem.php     | 7 ++++++-
 .../src/Framework/Features/Navigation/NavItem.php          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index cef48c39482..2bd4f505a5e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -6,5 +6,10 @@
 
 class NavGroupItem extends NavItem
 {
-    //
+    /**
+     * @deprecated Rename to $items
+     *
+     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    protected array $children = [];
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b6d245d1cb2..3b2e836ee8b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -39,7 +39,7 @@ class NavItem implements Stringable
     /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @deprecated Use NavGroupItem::$items instead */
     protected array $children = [];
 
     /**

From f469ab266a86c5a2fadb2e0270ba52c13c1bf170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:22:29 +0100
Subject: [PATCH 0828/2811] Update static group constructor to point to new
 class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3b2e836ee8b..178695f313c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -102,7 +102,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new static(null, $label, $priority, $label, $items);
+        return new NavGroupItem(null, $label, $priority, $label, $items);
     }
 
     /**

From d64e6c06e57c1ff85946f489d62bde509a691bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:26:37 +0100
Subject: [PATCH 0829/2811] Move getChildren method to child class

---
 .../Framework/Features/Navigation/NavGroupItem.php   | 12 ++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 2bd4f505a5e..32a8b3dbab1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,4 +12,16 @@ class NavGroupItem extends NavItem
      * @var array<\Hyde\Framework\Features\Navigation\NavItem>
      */
     protected array $children = [];
+
+    /**
+     * Get the children of the navigation item.
+     *
+     * For the main navigation menu, this stores any dropdown items.
+     *
+     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 178695f313c..4440159f4be 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -169,18 +169,6 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
-    /**
-     * Get the children of the navigation item.
-     *
-     * For the main navigation menu, this stores any dropdown items.
-     *
-     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
-    public function getChildren(): array
-    {
-        return $this->children;
-    }
-
     /**
      * Check if the NavItem instance has children.
      */

From f30baaf9b7f5fe86b3dc42c55390da30e3c47df9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:29:30 +0100
Subject: [PATCH 0830/2811] Add temporary deprecated compatibility

---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4440159f4be..1cb7976c60a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -169,6 +169,14 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
+    /**
+     * @deprecated Should not be called on this class
+     */
+    public function getChildren(): array
+    {
+        return $this->children;
+    }
+
     /**
      * Check if the NavItem instance has children.
      */

From 3fa5fdf6b85d0b6e3c7ab0e389826a20d3f5527c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:31:47 +0100
Subject: [PATCH 0831/2811] Begin hasChildren method move

---
 .../src/Framework/Features/Navigation/NavGroupItem.php    | 8 ++++++++
 .../src/Framework/Features/Navigation/NavItem.php         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 32a8b3dbab1..7180f9d0fad 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -24,4 +24,12 @@ public function getChildren(): array
     {
         return $this->children;
     }
+
+    /**
+     * Check if the NavItem instance has children.
+     */
+    public function hasChildren(): bool
+    {
+        return count($this->children) > 0;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 1cb7976c60a..0da63796bc4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -178,7 +178,7 @@ public function getChildren(): array
     }
 
     /**
-     * Check if the NavItem instance has children.
+     * @deprecated Should not be called on this class
      */
     public function hasChildren(): bool
     {

From c55ded4dbda866cb0ef88fe623c00d9e03d54d11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:32:58 +0100
Subject: [PATCH 0832/2811] Begin addChild method move

---
 .../Features/Navigation/NavGroupItem.php          | 15 +++++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 7180f9d0fad..9fe41aaf1b2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -32,4 +32,19 @@ public function hasChildren(): bool
     {
         return count($this->children) > 0;
     }
+
+    /**
+     * Add a navigation item to the children of the navigation item.
+     *
+     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     */
+    public function addChild(NavItem $item): static
+    {
+        $item->group ??= $this->group;
+
+        $this->children[] = $item;
+        $this->route = null;
+
+        return $this;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0da63796bc4..32f7f2547e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -194,9 +194,7 @@ public function isActive(): bool
     }
 
     /**
-     * Add a navigation item to the children of the navigation item.
-     *
-     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     * @deprecated Should not be called on this class
      */
     public function addChild(NavItem $item): static
     {

From 10480ccb4d538dcdf65809b249527de7c1e9656b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:33:25 +0100
Subject: [PATCH 0833/2811] Begin addChildren method move

---
 .../Framework/Features/Navigation/NavGroupItem.php | 14 ++++++++++++++
 .../src/Framework/Features/Navigation/NavItem.php  |  4 +---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 9fe41aaf1b2..71cc89bc3fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -47,4 +47,18 @@ public function addChild(NavItem $item): static
 
         return $this;
     }
+
+    /**
+     * Add multiple navigation items to the children of the navigation item.
+     *
+     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     */
+    public function addChildren(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addChild($item);
+        }
+
+        return $this;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 32f7f2547e1..7405c2548f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -207,9 +207,7 @@ public function addChild(NavItem $item): static
     }
 
     /**
-     * Add multiple navigation items to the children of the navigation item.
-     *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     * @deprecated Should not be called on this class
      */
     public function addChildren(array $items): static
     {

From 12512e5df4a2d3eaa45a4786672bb3adf5d12d74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:33:54 +0100
Subject: [PATCH 0834/2811] Add todo

---
 .../src/Framework/Features/Navigation/NavGroupItem.php         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 71cc89bc3fc..edd892493ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @todo Consider extracting trait for shared code with navigation menu class
+ */
 class NavGroupItem extends NavItem
 {
     /**

From 9996039a993111c4b81c8c3177cfdc79853aaa1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:35:47 +0100
Subject: [PATCH 0835/2811] Create initial child constructor

---
 .../src/Framework/Features/Navigation/NavGroupItem.php      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index edd892493ab..65c12f08be6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,6 +16,12 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
+    public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
+    {
+        parent::__construct(null, $label, $priority, $label);
+        $this->children = $children;
+    }
+
     /**
      * Get the children of the navigation item.
      *

From eceb24b8d1457375d6709e280f18669d6dae995c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:40:11 +0100
Subject: [PATCH 0836/2811] Fix constructor call

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7405c2548f7..c0dd042a613 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -102,7 +102,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new NavGroupItem(null, $label, $priority, $label, $items);
+        return new NavGroupItem($label, $priority, $items);
     }
 
     /**

From a4c04085d0a9d1b1797acac56dad3638f7ac05ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:40:15 +0100
Subject: [PATCH 0837/2811] Normalize label as group key

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 65c12f08be6..61bd32caa77 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -18,7 +18,7 @@ class NavGroupItem extends NavItem
 
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
-        parent::__construct(null, $label, $priority, $label);
+        parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->children = $children;
     }
 

From 5822bf7381c0d05a0c2e63b822f833f99b4bb336 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:44:13 +0100
Subject: [PATCH 0838/2811] Add children using method

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 61bd32caa77..bd1fb1adef7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -19,7 +19,7 @@ class NavGroupItem extends NavItem
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
-        $this->children = $children;
+        $this->addChildren($children);
     }
 
     /**

From b4928c51bf00fe46427a782623951be8b32a3b1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 1 Mar 2024 21:44:34 +0100
Subject: [PATCH 0839/2811] Remove child constructor from base class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c0dd042a613..8e41a4c3567 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -62,7 +62,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->addChildren($children);
     }
 
     /**

From fadcc4639cffc056cc4f17be0c1da869e8b3043c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:46:54 +0100
Subject: [PATCH 0840/2811] Revert "Remove child constructor from base class"

This reverts commit b4928c51bf00fe46427a782623951be8b32a3b1d.
---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8e41a4c3567..c0dd042a613 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -62,6 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
+        $this->addChildren($children);
     }
 
     /**

From 5d7330681bb6f1d720dd95087e947a437d9b8381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:49:28 +0100
Subject: [PATCH 0841/2811] Deprecate child parameter

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index c0dd042a613..4d7ce432adf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\DocumentationPage;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -49,9 +50,8 @@ class NavItem implements Stringable
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $children  If the item is a dropdown, these are the items to be included in the dropdown.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, #[Deprecated] array $children = [])
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From 02e836e7b38e9bc975577b8472b3fca99819d693 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:51:46 +0100
Subject: [PATCH 0842/2811] Create NavGroupItemTest.php

---
 .../framework/tests/Unit/NavGroupItemTest.php | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavGroupItemTest.php

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
new file mode 100644
index 00000000000..ab1d985b33e
--- /dev/null
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Support\Models\RenderData;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
+ */
+class NavGroupItemTest extends UnitTestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        self::$hasSetUpKernel = false;
+
+        self::needsKernel();
+        self::mockConfig();
+    }
+
+    protected function setUp(): void
+    {
+        Render::swap(new RenderData());
+    }
+}

From 737734d904a171db22d34fdcb4d38b4be87b1788 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 11:53:15 +0100
Subject: [PATCH 0843/2811] Move group specific tests to new unit test

---
 .../framework/tests/Unit/NavGroupItemTest.php | 141 ++++++++++++++++++
 packages/framework/tests/Unit/NavItemTest.php | 137 -----------------
 2 files changed, 141 insertions(+), 137 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ab1d985b33e..68cda33f6cd 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -4,9 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Features\Navigation\NavItem;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
@@ -25,4 +29,141 @@ protected function setUp(): void
     {
         Render::swap(new RenderData());
     }
+
+    public function testCanConstructWithChildren()
+    {
+        $route = new Route(new MarkdownPage());
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem($route, 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->getLabel());
+        $this->assertNull($item->getRoute());
+        $this->assertSame(500, $item->getPriority());
+
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
+
+        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
+        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
+
+        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
+        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
+
+        $this->assertSame(500, $item->getChildren()[0]->getPriority());
+        $this->assertSame(500, $item->getChildren()[1]->getPriority());
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+        $item = new NavItem('', 'Test', 500, null, $children);
+
+        $this->assertSame('Test', $item->getLabel());
+        $this->assertNull($item->getRoute());
+
+        $this->assertCount(2, $item->getChildren());
+        $this->assertSame($children, $item->getChildren());
+    }
+
+    public function testGetChildren()
+    {
+        $children = [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ];
+
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $this->assertSame($children, $navItem->getChildren());
+    }
+
+    public function testGetChildrenWithNoChildren()
+    {
+        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertEmpty($navItem->getChildren());
+    }
+
+    public function testHasChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $this->assertFalse($item->hasChildren());
+    }
+
+    public function testHasChildrenWithChildren()
+    {
+        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
+        ]);
+        $this->assertTrue($item->hasChildren());
+    }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChildren([$child1, $child2]);
+
+        $this->assertSame([$child1, $child2], $parent->getChildren());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+    }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('bar', $child->getGroupIdentifier());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+
+        $parent->addChild($child);
+
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
+    }
+
+    public function testCanAddItemToDropdown()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame([], $parent->getChildren());
+
+        $parent->addChild($child);
+
+        $this->assertSame([$child], $parent->getChildren());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+
+        $this->assertSame($parent, $parent->addChild($child));
+    }
 }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 5ecc2bb8d32..a56e057365b 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -76,47 +76,6 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
         $this->assertSame('foo', (string) $item->getRoute());
     }
 
-    public function testCanConstructWithChildren()
-    {
-        $route = new Route(new MarkdownPage());
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-        $item = new NavItem($route, 'Test', 500, null, $children);
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-        $this->assertSame(500, $item->getPriority());
-
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
-
-        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
-        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
-
-        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
-
-        $this->assertSame(500, $item->getChildren()[0]->getPriority());
-        $this->assertSame(500, $item->getChildren()[1]->getPriority());
-    }
-
-    public function testCanConstructWithChildrenWithoutRoute()
-    {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-        $item = new NavItem('', 'Test', 500, null, $children);
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
-    }
-
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));
@@ -149,23 +108,6 @@ public function testGetGroup()
         $this->assertNull($navItem->getGroupIdentifier());
     }
 
-    public function testGetChildren()
-    {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
-
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
-        $this->assertSame($children, $navItem->getChildren());
-    }
-
-    public function testGetChildrenWithNoChildren()
-    {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertEmpty($navItem->getChildren());
-    }
-
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
@@ -288,21 +230,6 @@ public function testDropdownFacadeWithCustomPriority()
         $this->assertSame(500, $item->getPriority());
     }
 
-    public function testHasChildren()
-    {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
-        $this->assertFalse($item->hasChildren());
-    }
-
-    public function testHasChildrenWithChildren()
-    {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
-        $this->assertTrue($item->hasChildren());
-    }
-
     public function testIsCurrent()
     {
         Render::swap(Mockery::mock(RenderData::class, [
@@ -384,68 +311,4 @@ public function testIdentifierUsesLabelForExternalRoute()
         $item = NavItem::forLink('https://example.com', 'Foo Bar');
         $this->assertSame('foo-bar', $item->getIdentifier());
     }
-
-    public function testCanAddItemToDropdown()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
-
-        $this->assertSame([], $parent->getChildren());
-
-        $parent->addChild($child);
-
-        $this->assertSame([$child], $parent->getChildren());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
-
-        $this->assertSame($parent, $parent->addChild($child));
-    }
-
-    public function testCanAddMultipleItemsToDropdown()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
-
-        $this->assertSame([], $parent->getChildren());
-
-        $parent->addChildren([$child1, $child2]);
-
-        $this->assertSame([$child1, $child2], $parent->getChildren());
-    }
-
-    public function testAddChildrenMethodReturnsSelf()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
-
-        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
-    }
-
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
-
-        $parent->addChild($child);
-
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('bar', $child->getGroupIdentifier());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
-    {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
-
-        $parent->addChild($child);
-
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
-    }
 }

From 8c54d451e2226ad349b8cd7632420b68e6476b05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:09:57 +0100
Subject: [PATCH 0844/2811] Begin refactoring test to use the new child class

---
 .../framework/tests/Unit/NavGroupItemTest.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 68cda33f6cd..4e6db8e7af0 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -11,6 +11,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
@@ -32,12 +33,11 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $route = new Route(new MarkdownPage());
         $children = [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
-        $item = new NavItem($route, 'Test', 500, null, $children);
+        $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -62,7 +62,7 @@ public function testCanConstructWithChildrenWithoutRoute()
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
-        $item = new NavItem('', 'Test', 500, null, $children);
+        $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -78,25 +78,25 @@ public function testGetChildren()
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ];
 
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500, null, $children);
+        $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $navItem = new NavGroupItem('Page', 500);
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500);
+        $item = new NavGroupItem('Test', 500);
         $this->assertFalse($item->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, null, [
+        $item = new NavGroupItem('Test', 500, [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
             new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
         ]);
@@ -105,7 +105,7 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -118,7 +118,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -127,29 +127,29 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('parent', $parent->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
 
         $parent->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
+        $this->assertSame('parent', $parent->getGroupIdentifier());
+        $this->assertSame('parent', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -161,7 +161,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavItem(new Route(new MarkdownPage()), 'Parent', 500, 'foo');
+        $parent = new NavGroupItem('Parent', 500);
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));

From 0132df14a25ff54d151b8cdb9fb65e7b1ea52e91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:17:15 +0100
Subject: [PATCH 0845/2811] Refactor test to use normalized mock data

Co-Authored-By: GPT 3.5 Turbo <openai-machine-user@hydephp.com>
---
 .../framework/tests/Unit/NavGroupItemTest.php | 39 +++++++------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4e6db8e7af0..b8415b0f000 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -33,10 +33,7 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -45,23 +42,11 @@ public function testCanConstructWithChildren()
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
-
-        $this->assertSame('Foo', $item->getChildren()[0]->getLabel());
-        $this->assertSame('Bar', $item->getChildren()[1]->getLabel());
-
-        $this->assertSame('foo.html', $item->getChildren()[0]->getUrl());
-        $this->assertSame('bar.html', $item->getChildren()[1]->getUrl());
-
-        $this->assertSame(500, $item->getChildren()[0]->getPriority());
-        $this->assertSame(500, $item->getChildren()[1]->getPriority());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -73,10 +58,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetChildren()
     {
-        $children = [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ];
+        $children = $this->createNavItems(['foo', 'bar']);
 
         $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
@@ -96,10 +78,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo', 500),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar', 500),
-        ]);
+        $item = new NavGroupItem('Test', 500, $this->createNavItems(['foo', 'bar']));
         $this->assertTrue($item->hasChildren());
     }
 
@@ -166,4 +145,14 @@ public function testAddChildMethodReturnsSelf()
 
         $this->assertSame($parent, $parent->addChild($child));
     }
+
+    private function createNavItems(array $pages): array
+    {
+        $navItems = [];
+        foreach ($pages as $page) {
+            $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+        }
+
+        return $navItems;
+    }
 }

From dcff0fd8735a04b5f109f8f53f6bd8c312bf8637 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:23:48 +0100
Subject: [PATCH 0846/2811] Inline constant parameter value

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8415b0f000..ae1c63b952d 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,6 +148,7 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(array $pages): array
     {
+        $pages = ['foo', 'bar'];
         $navItems = [];
         foreach ($pages as $page) {
             $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);

From cb141dc685bcb05a8f27b0c22bb3cd7640dbef7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:23:52 +0100
Subject: [PATCH 0847/2811] Remove unused parameter

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ae1c63b952d..4f4c821779b 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 
     public function testCanConstructWithChildren()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -46,7 +46,7 @@ public function testCanConstructWithChildren()
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
         $item = new NavGroupItem('Test', 500, $children);
 
         $this->assertSame('Test', $item->getLabel());
@@ -58,7 +58,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetChildren()
     {
-        $children = $this->createNavItems(['foo', 'bar']);
+        $children = $this->createNavItems();
 
         $navItem = new NavGroupItem('Page', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
@@ -78,7 +78,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, $this->createNavItems(['foo', 'bar']));
+        $item = new NavGroupItem('Test', 500, $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 
@@ -146,7 +146,7 @@ public function testAddChildMethodReturnsSelf()
         $this->assertSame($parent, $parent->addChild($child));
     }
 
-    private function createNavItems(array $pages): array
+    private function createNavItems(): array
     {
         $pages = ['foo', 'bar'];
         $navItems = [];

From 847197d1053d74fbba6b6db04778e85e49e19517 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:26:07 +0100
Subject: [PATCH 0848/2811] Inline loop

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4f4c821779b..a055b752e36 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,12 +148,8 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(): array
     {
-        $pages = ['foo', 'bar'];
-        $navItems = [];
-        foreach ($pages as $page) {
-            $navItems[] = new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
-        }
-
-        return $navItems;
+        return array_map(function(string $page): NavItem {
+            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+        }, ['foo', 'bar']);
     }
 }

From e9d46dc391f2b705fb23ba538bf67f526d81ee4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:28:08 +0100
Subject: [PATCH 0849/2811] Remove priority data not needed for test

---
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index a055b752e36..21e43c13414 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -66,13 +66,13 @@ public function testGetChildren()
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Page', 500);
+        $navItem = new NavGroupItem('Page');
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Test', 500);
+        $item = new NavGroupItem('Test');
         $this->assertFalse($item->hasChildren());
     }
 
@@ -84,7 +84,7 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -97,7 +97,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
 
@@ -106,7 +106,7 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
 
         $parent->addChild($child);
@@ -117,7 +117,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
 
         $parent->addChild($child);
@@ -128,7 +128,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -140,7 +140,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent', 500);
+        $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
@@ -149,7 +149,7 @@ public function testAddChildMethodReturnsSelf()
     private function createNavItems(): array
     {
         return array_map(function(string $page): NavItem {
-            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page), 500);
+            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
         }, ['foo', 'bar']);
     }
 }

From f8872ac523c0f3199e4ae2e5508de4c137fa6664 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:28:37 +0100
Subject: [PATCH 0850/2811] Normalize test label

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 21e43c13414..2291344ba6a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -60,25 +60,25 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Page', 500, $children);
+        $navItem = new NavGroupItem('Parent', 500, $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Page');
+        $navItem = new NavGroupItem('Parent');
         $this->assertEmpty($navItem->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Test');
+        $item = new NavGroupItem('Parent');
         $this->assertFalse($item->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Test', 500, $this->createNavItems());
+        $item = new NavGroupItem('Parent', 500, $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 

From ae4ff97df02ce24c77905b5b21b410347caf238a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:29:12 +0100
Subject: [PATCH 0851/2811] Formatting

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 2291344ba6a..e76e0390a7a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -148,7 +148,7 @@ public function testAddChildMethodReturnsSelf()
 
     private function createNavItems(): array
     {
-        return array_map(function(string $page): NavItem {
+        return array_map(function (string $page): NavItem {
             return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
         }, ['foo', 'bar']);
     }

From 09801f8734c5b1ee6a5e81bc0bbff9aaf7e43f21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:31:32 +0100
Subject: [PATCH 0852/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index bd1fb1adef7..74e60331d47 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,6 +16,7 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
+    // Todo: Consider putting children before priority as it is more commonly used
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));

From f8697b553ca062187307f899327197234d43f743 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:41:59 +0100
Subject: [PATCH 0853/2811] Move group priority logic to new child class

---
 .../Features/Navigation/NavGroupItem.php      | 19 +++++++++++++++++++
 .../Framework/Features/Navigation/NavItem.php |  9 ---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 74e60331d47..14ebb714881 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
+
+use function min;
+use function collect;
+
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
  */
@@ -71,4 +76,18 @@ public function addChildren(array $items): static
 
         return $this;
     }
+
+    /**
+     * Get the priority to determine the order of the navigation item.
+     *
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     */
+    public function getPriority(): int
+    {
+        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
+            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+        }
+
+        return parent::getPriority();
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4d7ce432adf..ed12bd60ab6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Pages\DocumentationPage;
 use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
@@ -13,8 +12,6 @@
 use Stringable;
 use Hyde\Support\Models\ExternalRoute;
 
-use function min;
-use function collect;
 use function is_string;
 
 /**
@@ -139,15 +136,9 @@ public function getLabel(): string
 
     /**
      * Get the priority to determine the order of the navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
-            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
-        }
-
         return $this->priority;
     }
 

From 4e0c4ad500131b8120d601455a30c9889def57fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:47:10 +0100
Subject: [PATCH 0854/2811] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 14ebb714881..b10aa1ddf8d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->children[0]->getRoute()->getPageClass() === DocumentationPage::class) {
+        if ($this->hasChildren() && ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class)) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From be87703d51b8b9ce1f5eb7ce2949dab04f50efd0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:49:56 +0100
Subject: [PATCH 0855/2811] Improve priority state testing

---
 .../framework/tests/Unit/NavGroupItemTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index e76e0390a7a..8dbb849bb36 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
@@ -146,6 +147,34 @@ public function testAddChildMethodReturnsSelf()
         $this->assertSame($parent, $parent->addChild($child));
     }
 
+    public function testGetPriorityUsesDefaultPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithNoChildrenUsesGroupPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithChildrenUsesGroupPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
+        $parent->addChild($child);
+        $this->assertSame(500, $parent->getPriority());
+    }
+
+    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
+    {
+        $parent = new NavGroupItem('Parent');
+        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
+        $parent->addChild($child);
+        $this->assertSame(400, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From 59974c62107a644ed1d7da798cf74ea2c3007976 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 12:55:36 +0100
Subject: [PATCH 0856/2811] Test get priority handles mixed child types

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8dbb849bb36..8862f614600 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -11,6 +11,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
+use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 
@@ -175,6 +176,19 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
         $this->assertSame(400, $parent->getPriority());
     }
 
+    public function testGetPriorityHandlesMixedChildTypes()
+    {
+        $parent = new NavGroupItem('Parent');
+
+        $types = HydeCoreExtension::getPageClasses();
+        foreach ($types as $type) {
+            $child = new NavItem(new Route(new $type()), 'Child', 100);
+            $parent->addChild($child);
+        }
+
+        $this->assertSame(500, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From 765e57cbb0d5ec84020e0c2348c40002f490048b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:40:57 +0100
Subject: [PATCH 0857/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b10aa1ddf8d..d1a55509d43 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,6 +22,7 @@ class NavGroupItem extends NavItem
     protected array $children = [];
 
     // Todo: Consider putting children before priority as it is more commonly used
+    // Todo use last priority as default for groups
     public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));

From 556eb76848ef6a25ad25a6ed3be1c9a90b1635c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:41:07 +0100
Subject: [PATCH 0858/2811] Add todo

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index d1a55509d43..8e14a6c02a5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -82,6 +82,8 @@ public function addChildren(array $items): static
      * Get the priority to determine the order of the navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
+     *
+     * @todo Ensure support for external URLs
      */
     public function getPriority(): int
     {

From 9e83cdc70e7ee42bdbb6bab904fd637595f43b7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:49:45 +0100
Subject: [PATCH 0859/2811] Extract helper method

---
 .../src/Framework/Features/Navigation/NavGroupItem.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 8e14a6c02a5..70e8c9ab960 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -87,10 +87,15 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class)) {
+        if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
             return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
     }
+
+    protected function containsOnlyDocumentationPages(): bool
+    {
+        return ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class);
+    }
 }

From c6860bd1cbf9644db7fbcb8213458c066317a292 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:56:15 +0100
Subject: [PATCH 0860/2811] Add more accurate state logic

For example, if it's a main menu group we don't want to change positioning if the docs index is linked. We don't have information here about which menu type it is, so this is a fair compromise.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 70e8c9ab960..29942a09e2a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,6 +96,6 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return ($this->children[0]->getRoute()->getPageClass() === DocumentationPage::class);
+        return collect($this->getChildren())->every(fn (NavItem $child): bool => $child->getRoute()->getPageClass() === DocumentationPage::class);
     }
 }

From a1e41fc9aebb6bb602d8a3f912c2d1adc44a2c6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:58:06 +0100
Subject: [PATCH 0861/2811] Convert the arrow function to a traditional closure

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 29942a09e2a..b39e13d4e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,6 +96,8 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return collect($this->getChildren())->every(fn (NavItem $child): bool => $child->getRoute()->getPageClass() === DocumentationPage::class);
+        return collect($this->getChildren())->every(function (NavItem $child): bool {
+            return $child->getRoute()->getPageClass() === DocumentationPage::class;
+        });
     }
 }

From 145fa3f086cf57bedb777954157ffb9180eaed4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 13:58:44 +0100
Subject: [PATCH 0862/2811] Return false to ensure support for external URLs

---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  7 +++++--
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b39e13d4e28..791d1069829 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\ExternalRoute;
 
 use function min;
 use function collect;
@@ -82,8 +83,6 @@ public function addChildren(array $items): static
      * Get the priority to determine the order of the navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
-     *
-     * @todo Ensure support for external URLs
      */
     public function getPriority(): int
     {
@@ -97,6 +96,10 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
+            if ($child->getRoute() instanceof ExternalRoute) {
+                return false;
+            }
+
             return $child->getRoute()->getPageClass() === DocumentationPage::class;
         });
     }
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8862f614600..57aff482b10 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,6 +189,16 @@ public function testGetPriorityHandlesMixedChildTypes()
         $this->assertSame(500, $parent->getPriority());
     }
 
+    public function testGetPriorityHandlesExternalUrlChild()
+    {
+        $parent = new NavGroupItem('Parent');
+
+        $child = new NavItem('foo', 'Child', 400);
+        $parent->addChild($child);
+
+        $this->assertSame(500, $parent->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return array_map(function (string $page): NavItem {

From ecd86765787c25f2db2fc941701278d015511cfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:00:50 +0100
Subject: [PATCH 0863/2811] Use instanceof check

Mainly for style
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 791d1069829..b755d5d525e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -100,7 +100,7 @@ protected function containsOnlyDocumentationPages(): bool
                 return false;
             }
 
-            return $child->getRoute()->getPageClass() === DocumentationPage::class;
+            return $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From 8a3d9baae1e20ac599ce710a03a72d49811f21e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:02:27 +0100
Subject: [PATCH 0864/2811] Simplify conditional returns

---
 .../src/Framework/Features/Navigation/NavGroupItem.php      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index b755d5d525e..e2374f6e5ef 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,11 +96,7 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
-            if ($child->getRoute() instanceof ExternalRoute) {
-                return false;
-            }
-
-            return $child->getRoute()->getPage() instanceof DocumentationPage;
+            return ! $child->getRoute() instanceof ExternalRoute && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From 18f30081b47082788330ea96ad41f83fd6bbcf19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:03:26 +0100
Subject: [PATCH 0865/2811] Add clarifying parentheses

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index e2374f6e5ef..a40f763f419 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -96,7 +96,7 @@ public function getPriority(): int
     protected function containsOnlyDocumentationPages(): bool
     {
         return collect($this->getChildren())->every(function (NavItem $child): bool {
-            return ! $child->getRoute() instanceof ExternalRoute && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From de7710fd00f1c84b55f26240ec1ce0c26b6d5411 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:05:34 +0100
Subject: [PATCH 0866/2811] Preevaluate constant loop

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 57aff482b10..d5a3e055b52 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -201,8 +201,9 @@ public function testGetPriorityHandlesExternalUrlChild()
 
     private function createNavItems(): array
     {
-        return array_map(function (string $page): NavItem {
-            return new NavItem(new Route(new InMemoryPage($page)), ucfirst($page));
-        }, ['foo', 'bar']);
+        return [
+            new NavItem(new Route(new InMemoryPage('foo')), ucfirst('foo')),
+            new NavItem(new Route(new InMemoryPage('bar')), ucfirst('bar')),
+        ];
     }
 }

From aeb7f0553b09d167ecb8e770ef8084afe8c06b22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:05:50 +0100
Subject: [PATCH 0867/2811] Inline variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d5a3e055b52..4e56ec5cd0a 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -180,8 +180,7 @@ public function testGetPriorityHandlesMixedChildTypes()
     {
         $parent = new NavGroupItem('Parent');
 
-        $types = HydeCoreExtension::getPageClasses();
-        foreach ($types as $type) {
+        foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Child', 100);
             $parent->addChild($child);
         }

From db5d53478192ffdde48d8a38b5bee03ffeeb0be2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:07:26 +0100
Subject: [PATCH 0868/2811] Use "last" priority as default value to match
 generator

It's more common to have groups last, so we use that for the default value
---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  3 +--
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index a40f763f419..83472819f87 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -23,8 +23,7 @@ class NavGroupItem extends NavItem
     protected array $children = [];
 
     // Todo: Consider putting children before priority as it is more commonly used
-    // Todo use last priority as default for groups
-    public function __construct(string $label, int $priority = NavigationMenu::DEFAULT, array $children = [])
+    public function __construct(string $label, int $priority = NavigationMenu::LAST, array $children = [])
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->addChildren($children);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4e56ec5cd0a..1266152633e 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -151,13 +151,13 @@ public function testAddChildMethodReturnsSelf()
     public function testGetPriorityUsesDefaultPriority()
     {
         $parent = new NavGroupItem('Parent');
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
         $parent = new NavGroupItem('Parent');
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
@@ -165,7 +165,7 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
         $parent = new NavGroupItem('Parent');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
         $parent->addChild($child);
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
@@ -185,7 +185,7 @@ public function testGetPriorityHandlesMixedChildTypes()
             $parent->addChild($child);
         }
 
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChild()
@@ -195,7 +195,7 @@ public function testGetPriorityHandlesExternalUrlChild()
         $child = new NavItem('foo', 'Child', 400);
         $parent->addChild($child);
 
-        $this->assertSame(500, $parent->getPriority());
+        $this->assertSame(999, $parent->getPriority());
     }
 
     private function createNavItems(): array

From fb2309f65ec4a05a0887a250f7c5dc57eaf9e2db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:11:47 +0100
Subject: [PATCH 0869/2811] Put children before priority as it is more commonly
 used

---
 .../src/Framework/Features/Navigation/NavGroupItem.php    | 3 +--
 .../src/Framework/Features/Navigation/NavItem.php         | 2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php        | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 83472819f87..c73a67d8900 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,8 +22,7 @@ class NavGroupItem extends NavItem
      */
     protected array $children = [];
 
-    // Todo: Consider putting children before priority as it is more commonly used
-    public function __construct(string $label, int $priority = NavigationMenu::LAST, array $children = [])
+    public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
         $this->addChildren($children);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index ed12bd60ab6..8f8aec95e0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -99,7 +99,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
     {
-        return new NavGroupItem($label, $priority, $items);
+        return new NavGroupItem($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1266152633e..5aa7161b4ac 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', 500, $children);
+        $item = new NavGroupItem('Test', $children, 500);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -49,7 +49,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', 500, $children);
+        $item = new NavGroupItem('Test', $children, 500);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -62,7 +62,7 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', 500, $children);
+        $navItem = new NavGroupItem('Parent', $children, 500);
         $this->assertSame($children, $navItem->getChildren());
     }
 
@@ -80,7 +80,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', 500, $this->createNavItems());
+        $item = new NavGroupItem('Parent', $this->createNavItems(), 500);
         $this->assertTrue($item->hasChildren());
     }
 

From 2d03ee3d03f03323d5eb171be6d42a4379b776d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:19:06 +0100
Subject: [PATCH 0870/2811] Add todo

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index c73a67d8900..1f009847e12 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,6 +12,7 @@
 
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
+ * @todo Consider inheritance issues with static constructors from NavItem class
  */
 class NavGroupItem extends NavItem
 {

From efda56f625fa173a1ef1e10bf19de4b5c0d2ec7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:22:12 +0100
Subject: [PATCH 0871/2811] Replace default value with named argument

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 5aa7161b4ac..21976d56dc1 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -87,8 +87,8 @@ public function testHasChildrenWithChildren()
     public function testCanAddMultipleItemsToDropdown()
     {
         $parent = new NavGroupItem('Parent');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -100,8 +100,8 @@ public function testCanAddMultipleItemsToDropdown()
     public function testAddChildrenMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Parent');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', 500, 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', 500, 'foo');
+        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
         $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
     }
@@ -109,7 +109,7 @@ public function testAddChildrenMethodReturnsSelf()
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'bar');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $parent->addChild($child);
 
@@ -131,7 +131,7 @@ public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     public function testCanAddItemToDropdown()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -143,7 +143,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
     }

From 2d98fb08a7ba758e79e48933cea030647034c2ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:22:22 +0100
Subject: [PATCH 0872/2811] Remove test data not affecting test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 21976d56dc1..ed7cd253c60 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -120,7 +120,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
     {
         $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 500);
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child');
 
         $parent->addChild($child);
 

From fc74bba18822e41daa72bc15743f4fcc0fcf0890 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:23:30 +0100
Subject: [PATCH 0873/2811] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ed7cd253c60..7f7e0de864b 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -68,14 +68,12 @@ public function testGetChildren()
 
     public function testGetChildrenWithNoChildren()
     {
-        $navItem = new NavGroupItem('Parent');
-        $this->assertEmpty($navItem->getChildren());
+        $this->assertEmpty((new NavGroupItem('Parent'))->getChildren());
     }
 
     public function testHasChildren()
     {
-        $item = new NavGroupItem('Parent');
-        $this->assertFalse($item->hasChildren());
+        $this->assertFalse((new NavGroupItem('Parent'))->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
@@ -150,14 +148,12 @@ public function testAddChildMethodReturnsSelf()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $parent = new NavGroupItem('Parent');
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Parent');
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()

From 7cc42d915df91a4443e4390e511cfc0687b926e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:23:58 +0100
Subject: [PATCH 0874/2811] Remove unnecessary setup method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 7f7e0de864b..619dca2c304 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -8,9 +8,7 @@
 use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\RenderData;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
@@ -28,11 +26,6 @@ public static function setUpBeforeClass(): void
         self::mockConfig();
     }
 
-    protected function setUp(): void
-    {
-        Render::swap(new RenderData());
-    }
-
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();

From d14f273487815231a074419913ad999a052bc300 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:24:14 +0100
Subject: [PATCH 0875/2811] Remove unnecessary state modifier

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 619dca2c304..aa3f1356478 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -20,8 +20,6 @@ class NavGroupItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
-        self::$hasSetUpKernel = false;
-
         self::needsKernel();
         self::mockConfig();
     }

From 7ff0a934452b990a511087593b16f992e19cc21c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:28:28 +0100
Subject: [PATCH 0876/2811] Split out general assertions

---
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index aa3f1356478..7d3ad04ad11 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -24,14 +24,24 @@ public static function setUpBeforeClass(): void
         self::mockConfig();
     }
 
-    public function testCanConstructWithChildren()
+    public function testCanConstruct()
     {
-        $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children, 500);
+        $item = new NavGroupItem('Test');
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
-        $this->assertSame(500, $item->getPriority());
+        $this->assertSame(999, $item->getPriority());
+    }
+
+    public function testCanConstructWithPriority()
+    {
+        $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
+    }
+
+    public function testCanConstructWithChildren()
+    {
+        $children = $this->createNavItems();
+        $item = new NavGroupItem('Test', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());

From 0d791bf6a4d3c6a7a139848ee75a8d1e1e82437f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:28:58 +0100
Subject: [PATCH 0877/2811] Remove test data not affecting test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 7d3ad04ad11..ec8d878c965 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -50,7 +50,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children, 500);
+        $item = new NavGroupItem('Test', $children);
 
         $this->assertSame('Test', $item->getLabel());
         $this->assertNull($item->getRoute());
@@ -63,7 +63,7 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', $children, 500);
+        $navItem = new NavGroupItem('Parent', $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
@@ -79,7 +79,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', $this->createNavItems(), 500);
+        $item = new NavGroupItem('Parent', $this->createNavItems());
         $this->assertTrue($item->hasChildren());
     }
 

From 84922f6af080e6ca3874baef302d6c8a14ded2c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:44:44 +0100
Subject: [PATCH 0878/2811] Extract and scope down assertions for more granular
 tests

---
 .../framework/tests/Unit/NavGroupItemTest.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ec8d878c965..eecbf3fee0e 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -26,11 +26,7 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $item = new NavGroupItem('Test');
-
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-        $this->assertSame(999, $item->getPriority());
+        $this->assertSame('Test', (new NavGroupItem('Test'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
@@ -38,6 +34,16 @@ public function testCanConstructWithPriority()
         $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
     }
 
+    public function testDefaultPriorityValueIsLast()
+    {
+        $this->assertSame(999, (new NavGroupItem('Test'))->getPriority());
+    }
+
+    public function testDestinationIsAlwaysNull()
+    {
+        $this->assertNull((new NavGroupItem('Test'))->getRoute());
+    }
+
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
@@ -52,9 +58,6 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Test', $children);
 
-        $this->assertSame('Test', $item->getLabel());
-        $this->assertNull($item->getRoute());
-
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
     }

From f6f32e426a9d4eb67a09d40b11acb0397df8eb65 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:44:55 +0100
Subject: [PATCH 0879/2811] Inline variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index eecbf3fee0e..3aa944e0fd4 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -82,8 +82,7 @@ public function testHasChildren()
 
     public function testHasChildrenWithChildren()
     {
-        $item = new NavGroupItem('Parent', $this->createNavItems());
-        $this->assertTrue($item->hasChildren());
+        $this->assertTrue((new NavGroupItem('Parent', $this->createNavItems()))->hasChildren());
     }
 
     public function testCanAddMultipleItemsToDropdown()

From 7fa70c2614b10f2ae52525b20f3ae535d5b229f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:46:10 +0100
Subject: [PATCH 0880/2811] Normalize test data strings

---
 .../framework/tests/Unit/NavGroupItemTest.php | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 3aa944e0fd4..1f7ce0b1122 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -26,28 +26,28 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $this->assertSame('Test', (new NavGroupItem('Test'))->getLabel());
+        $this->assertSame('Foo', (new NavGroupItem('Foo'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
     {
-        $this->assertSame(500, (new NavGroupItem('Test', priority: 500))->getPriority());
+        $this->assertSame(500, (new NavGroupItem('Foo', priority: 500))->getPriority());
     }
 
     public function testDefaultPriorityValueIsLast()
     {
-        $this->assertSame(999, (new NavGroupItem('Test'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testDestinationIsAlwaysNull()
     {
-        $this->assertNull((new NavGroupItem('Test'))->getRoute());
+        $this->assertNull((new NavGroupItem('Foo'))->getRoute());
     }
 
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children);
+        $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -56,7 +56,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavItems();
-        $item = new NavGroupItem('Test', $children);
+        $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getChildren());
         $this->assertSame($children, $item->getChildren());
@@ -66,28 +66,28 @@ public function testGetChildren()
     {
         $children = $this->createNavItems();
 
-        $navItem = new NavGroupItem('Parent', $children);
+        $navItem = new NavGroupItem('Foo', $children);
         $this->assertSame($children, $navItem->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()
     {
-        $this->assertEmpty((new NavGroupItem('Parent'))->getChildren());
+        $this->assertEmpty((new NavGroupItem('Foo'))->getChildren());
     }
 
     public function testHasChildren()
     {
-        $this->assertFalse((new NavGroupItem('Parent'))->hasChildren());
+        $this->assertFalse((new NavGroupItem('Foo'))->hasChildren());
     }
 
     public function testHasChildrenWithChildren()
     {
-        $this->assertTrue((new NavGroupItem('Parent', $this->createNavItems()))->hasChildren());
+        $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
@@ -100,7 +100,7 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
@@ -109,29 +109,29 @@ public function testAddChildrenMethodReturnsSelf()
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('parent', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
-    public function testAddingAnItemWithNoGroupKeyUsesParentIdentifier()
+    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $parent = new NavGroupItem('Parent');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child');
+        $parent = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $parent->addChild($child);
 
-        $this->assertSame('parent', $parent->getGroupIdentifier());
-        $this->assertSame('parent', $child->getGroupIdentifier());
+        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame([], $parent->getChildren());
@@ -143,7 +143,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
 
         $this->assertSame($parent, $parent->addChild($child));
@@ -151,17 +151,17 @@ public function testAddChildMethodReturnsSelf()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Parent'))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
         $parent->addChild($child);
         $this->assertSame(999, $parent->getPriority());
@@ -169,7 +169,7 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
         $parent->addChild($child);
         $this->assertSame(400, $parent->getPriority());
@@ -177,7 +177,7 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
 
     public function testGetPriorityHandlesMixedChildTypes()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Child', 100);
@@ -189,7 +189,7 @@ public function testGetPriorityHandlesMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChild()
     {
-        $parent = new NavGroupItem('Parent');
+        $parent = new NavGroupItem('Foo');
 
         $child = new NavItem('foo', 'Child', 400);
         $parent->addChild($child);

From 1d34e75031058d40e20efdbe7cd8d1b743bf5b4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:08 +0100
Subject: [PATCH 0881/2811] Remove unnecessary test data

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1f7ce0b1122..5b045c224e8 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -132,7 +132,7 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     public function testCanAddItemToDropdown()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([], $parent->getChildren());
 
@@ -144,7 +144,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($parent, $parent->addChild($child));
     }
@@ -162,7 +162,7 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', 400, 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
         $parent->addChild($child);
         $this->assertSame(999, $parent->getPriority());
     }

From a356a179db122428d473a7e4b0ba116e723c5f1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:37 +0100
Subject: [PATCH 0882/2811] Clarify test method naming

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 5b045c224e8..b4cf5940bd0 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -175,7 +175,7 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
         $this->assertSame(400, $parent->getPriority());
     }
 
-    public function testGetPriorityHandlesMixedChildTypes()
+    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
         $parent = new NavGroupItem('Foo');
 

From b22a68567bc22d3d7e21651997ffc8fe040a7d9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:50:51 +0100
Subject: [PATCH 0883/2811] Clarify test method naming

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b4cf5940bd0..29e2e4085e2 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -187,7 +187,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $this->assertSame(999, $parent->getPriority());
     }
 
-    public function testGetPriorityHandlesExternalUrlChild()
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
         $parent = new NavGroupItem('Foo');
 

From 9f4ef9c0a216a973a3ac2e3f60b13eb621a8b7cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:51:06 +0100
Subject: [PATCH 0884/2811] Normalize test value

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 29e2e4085e2..86a87d13850 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -170,9 +170,9 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
         $parent = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 400);
+        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
         $parent->addChild($child);
-        $this->assertSame(400, $parent->getPriority());
+        $this->assertSame(100, $parent->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
@@ -191,7 +191,7 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
         $parent = new NavGroupItem('Foo');
 
-        $child = new NavItem('foo', 'Child', 400);
+        $child = new NavItem('foo', 'Child', 100);
         $parent->addChild($child);
 
         $this->assertSame(999, $parent->getPriority());

From b74040f550c5592736dfa274dc7c4c380ee90fc6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:51:51 +0100
Subject: [PATCH 0885/2811] Simplify test assembly

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 86a87d13850..17a87a41da9 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,10 +189,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo');
-
-        $child = new NavItem('foo', 'Child', 100);
-        $parent->addChild($child);
+        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Child', 100)]);
 
         $this->assertSame(999, $parent->getPriority());
     }

From 846ac42e41b83bede6ad1a820c76176add822c91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:52:13 +0100
Subject: [PATCH 0886/2811] Normalize test data

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 17a87a41da9..6cd2cedc0ab 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -180,7 +180,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $parent = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavItem(new Route(new $type()), 'Child', 100);
+            $child = new NavItem(new Route(new $type()), 'Bar', 100);
             $parent->addChild($child);
         }
 
@@ -189,7 +189,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Child', 100)]);
+        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
         $this->assertSame(999, $parent->getPriority());
     }

From 87e3ad62efb45b221853731a77e1be912fbf81bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:52:30 +0100
Subject: [PATCH 0887/2811] Normalize local test variable naming

---
 .../framework/tests/Unit/NavGroupItemTest.php | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 6cd2cedc0ab..6e8730df8e5 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -87,66 +87,66 @@ public function testHasChildrenWithChildren()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([], $parent->getChildren());
+        $this->assertSame([], $group->getChildren());
 
-        $parent->addChildren([$child1, $child2]);
+        $group->addChildren([$child1, $child2]);
 
-        $this->assertSame([$child1, $child2], $parent->getChildren());
+        $this->assertSame([$child1, $child2], $group->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame($parent, $parent->addChildren([$child1, $child2]));
+        $this->assertSame($group, $group->addChildren([$child1, $child2]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupIdentifier());
         $this->assertSame('bar', $child->getGroupIdentifier());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame('foo', $parent->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupIdentifier());
         $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([], $parent->getChildren());
+        $this->assertSame([], $group->getChildren());
 
-        $parent->addChild($child);
+        $group->addChild($child);
 
-        $this->assertSame([$child], $parent->getChildren());
+        $this->assertSame([$child], $group->getChildren());
     }
 
     public function testAddChildMethodReturnsSelf()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($parent, $parent->addChild($child));
+        $this->assertSame($group, $group->addChild($child));
     }
 
     public function testGetPriorityUsesDefaultPriority()
@@ -161,37 +161,37 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-        $parent->addChild($child);
-        $this->assertSame(999, $parent->getPriority());
+        $group->addChild($child);
+        $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
-        $parent->addChild($child);
-        $this->assertSame(100, $parent->getPriority());
+        $group->addChild($child);
+        $this->assertSame(100, $group->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
-        $parent = new NavGroupItem('Foo');
+        $group = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Bar', 100);
-            $parent->addChild($child);
+            $group->addChild($child);
         }
 
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $parent = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
+        $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
-        $this->assertSame(999, $parent->getPriority());
+        $this->assertSame(999, $group->getPriority());
     }
 
     private function createNavItems(): array

From 8b07dacead872f25f0f074612dd9ebbb26f4850c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:09 +0100
Subject: [PATCH 0888/2811] Split out test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 6e8730df8e5..b8dcda595fb 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -187,13 +187,20 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $this->assertSame(999, $group->getPriority());
     }
 
-    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    public function testGetPriorityHandlesStringUrlChildGracefully()
     {
         $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
 
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    {
+        $group = new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]);
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
     private function createNavItems(): array
     {
         return [

From 2b746d0f1fb967dc08e7884e14c858d9bb3b951e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:30 +0100
Subject: [PATCH 0889/2811] Inline variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8dcda595fb..18bb62548aa 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,16 +189,12 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $group = new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $group = new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     private function createNavItems(): array

From 64c02e313b6c339719b9347e7d4cdbaee7aa11cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:53:47 +0100
Subject: [PATCH 0890/2811] Evaluate function call

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 18bb62548aa..4128067c315 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -200,8 +200,8 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
     private function createNavItems(): array
     {
         return [
-            new NavItem(new Route(new InMemoryPage('foo')), ucfirst('foo')),
-            new NavItem(new Route(new InMemoryPage('bar')), ucfirst('bar')),
+            new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavItem(new Route(new InMemoryPage('bar')), 'Bar'),
         ];
     }
 }

From 725d7c95dc468908b5d7a2643a8af3fa220d7547 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:56:48 +0100
Subject: [PATCH 0891/2811] Formatting

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 4128067c315..de08b8d6242 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -65,8 +65,8 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetChildren()
     {
         $children = $this->createNavItems();
-
         $navItem = new NavGroupItem('Foo', $children);
+
         $this->assertSame($children, $navItem->getChildren());
     }
 

From d956811b08ceeddbb51f488b73df1acc3463c89e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:57:58 +0100
Subject: [PATCH 0892/2811] Normalize variable name

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index de08b8d6242..d890504f1ab 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -65,9 +65,9 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetChildren()
     {
         $children = $this->createNavItems();
-        $navItem = new NavGroupItem('Foo', $children);
+        $item = new NavGroupItem('Foo', $children);
 
-        $this->assertSame($children, $navItem->getChildren());
+        $this->assertSame($children, $item->getChildren());
     }
 
     public function testGetChildrenWithNoChildren()

From a6d66488d8f8ed33cc4f5bcccb54a3d03769ae69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:58:35 +0100
Subject: [PATCH 0893/2811] Remove unnecessary operations from test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d890504f1ab..31c3c64d8aa 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -101,10 +101,8 @@ public function testCanAddMultipleItemsToDropdown()
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame($group, $group->addChildren([$child1, $child2]));
+        $this->assertSame($group, $group->addChildren([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()

From fe5e598a9736e57d8866be9e56e210b5141ce1ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:59:14 +0100
Subject: [PATCH 0894/2811] Remove unnecessary assertion

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 31c3c64d8aa..c54cef5fe03 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -91,8 +91,6 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([], $group->getChildren());
-
         $group->addChildren([$child1, $child2]);
 
         $this->assertSame([$child1, $child2], $group->getChildren());

From ff5d8df12b6cff8baf09091a5c61bc35cdc58c3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 14:59:55 +0100
Subject: [PATCH 0895/2811] Simplify test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c54cef5fe03..a84a8ec0286 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -91,9 +91,7 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $group->addChildren([$child1, $child2]);
-
-        $this->assertSame([$child1, $child2], $group->getChildren());
+        $this->assertSame([$child1, $child2], $group->addChildren([$child1, $child2])->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()

From df730b609ae123b1f5c4d53314beebcab60abcfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:00:50 +0100
Subject: [PATCH 0896/2811] Add missing unit test

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index a84a8ec0286..c7be4220dae 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,6 +85,14 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
+    public function testCanAddItemsToDropdown()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
+    }
+
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');

From 6aee109111f3af3997d8c4b78b1693757c0d58ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:01:14 +0100
Subject: [PATCH 0897/2811] Introduce local variable

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c7be4220dae..23fb904c6f1 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -99,7 +99,9 @@ public function testCanAddMultipleItemsToDropdown()
         $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
         $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
 
-        $this->assertSame([$child1, $child2], $group->addChildren([$child1, $child2])->getChildren());
+        $items = [$child1, $child2];
+        
+        $this->assertSame($items, $group->addChildren($items)->getChildren());
     }
 
     public function testAddChildrenMethodReturnsSelf()

From b6bc915999d2d54f5fe6a4cf9d9d601e4019a88b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:01:33 +0100
Subject: [PATCH 0898/2811] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 23fb904c6f1..d5956d56b35 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,11 +96,12 @@ public function testCanAddItemsToDropdown()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child1 = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-        $child2 = new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo');
-
-        $items = [$child1, $child2];
         
+        $items = [
+            new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo'),
+            new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo')
+        ];
+
         $this->assertSame($items, $group->addChildren($items)->getChildren());
     }
 

From 3a7eaf14a2912d31058cf2d382f0ef5f0a15c435 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:02:42 +0100
Subject: [PATCH 0899/2811] Use the helper method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index d5956d56b35..88f0d3b56f5 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,11 +96,7 @@ public function testCanAddItemsToDropdown()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        
-        $items = [
-            new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo'),
-            new NavItem(new Route(new MarkdownPage()), 'Child 2', group: 'foo')
-        ];
+        $items = $this->createNavItems();
 
         $this->assertSame($items, $group->addChildren($items)->getChildren());
     }

From f28d636a6eac176453322772bdf74413dae234ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:03:53 +0100
Subject: [PATCH 0900/2811] Merge overlapping tests

---
 .../framework/tests/Unit/NavGroupItemTest.php    | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 88f0d3b56f5..ef6c4ae7249 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,14 +85,6 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
-    public function testCanAddItemsToDropdown()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
-    }
-
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
@@ -133,13 +125,9 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame([], $group->getChildren());
-
-        $group->addChild($child);
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
 
-        $this->assertSame([$child], $group->getChildren());
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
     }
 
     public function testAddChildMethodReturnsSelf()

From d9a9e213cc74db61b09fbaadb16767ae41e0fde3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:04:14 +0100
Subject: [PATCH 0901/2811] Reorder tests

---
 .../framework/tests/Unit/NavGroupItemTest.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ef6c4ae7249..16e78cd5910 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -85,6 +85,22 @@ public function testHasChildrenWithChildren()
         $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
     }
 
+    public function testCanAddItemToDropdown()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+
+        $this->assertSame([$child], $group->addChild($child)->getChildren());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $group = new NavGroupItem('Foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame($group, $group->addChild($child));
+    }
+
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
@@ -122,22 +138,6 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
         $this->assertSame('foo', $child->getGroupIdentifier());
     }
 
-    public function testCanAddItemToDropdown()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
-
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame($group, $group->addChild($child));
-    }
-
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());

From d740acc0f00fcaf359a77ba11a5acf4aec65fd1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:04:43 +0100
Subject: [PATCH 0902/2811] Simplify test object

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 16e78cd5910..524428e48bd 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -88,7 +88,7 @@ public function testHasChildrenWithChildren()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child 1', group: 'foo');
+        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addChild($child)->getChildren());
     }

From 75f679f8a88ccb3bc6fe167ed624b0b66eba88a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:06:08 +0100
Subject: [PATCH 0903/2811] Clean up and improve tests

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 524428e48bd..334011af395 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -150,17 +150,19 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
-        $group->addChild($child);
+        $group = new NavGroupItem('Foo', [new NavItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+
         $this->assertSame(999, $group->getPriority());
     }
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new DocumentationPage()), 'Foo', 100);
-        $group->addChild($child);
+        $group = new NavGroupItem('Foo', [
+            new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
+        ]);
+
         $this->assertSame(100, $group->getPriority());
     }
 

From 103794a042a954d6284d5b36be3b610255a3d777 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:06:47 +0100
Subject: [PATCH 0904/2811] Add reverse order to improve accuracy

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 334011af395..62fe54152b4 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -157,11 +157,19 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
 
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
-        $group = new NavGroupItem('Foo', [
+        $items = [
             new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
             new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
             new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
-        ]);
+        ];
+
+        $group = new NavGroupItem('Foo', $items);
+
+        $this->assertSame(100, $group->getPriority());
+
+        $items = array_reverse($items);
+
+        $group = new NavGroupItem('Foo', $items);
 
         $this->assertSame(100, $group->getPriority());
     }

From c10ec520937405835102a218c29c32c90a5d3418 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:07:06 +0100
Subject: [PATCH 0905/2811] Inline local variables

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 62fe54152b4..30a6ba3de1c 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -163,15 +163,8 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
             new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
-        $group = new NavGroupItem('Foo', $items);
-
-        $this->assertSame(100, $group->getPriority());
-
-        $items = array_reverse($items);
-
-        $group = new NavGroupItem('Foo', $items);
-
-        $this->assertSame(100, $group->getPriority());
+        $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
+        $this->assertSame(100, (new NavGroupItem('Foo', array_reverse($items)))->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()

From 92ed65374c81776a06c8bf9d1ff9ab384b85ce6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:13:52 +0100
Subject: [PATCH 0906/2811] Change visibility

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 30a6ba3de1c..370a42e4a5d 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,7 +189,7 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    private function createNavItems(): array
+    protected function createNavItems(): array
     {
         return [
             new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),

From 0479139b2e18aa05d4c3a77b70fefc9282e81f75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:15:14 +0100
Subject: [PATCH 0907/2811] No longer construct children in base class

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8f8aec95e0c..b0a0cdec774 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -59,7 +59,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
         $this->identifier = static::makeIdentifier($label);
-        $this->addChildren($children);
     }
 
     /**

From 2b61a147a37b88f5004fb2449665881dd9b4a9ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 15:20:45 +0100
Subject: [PATCH 0908/2811] Remove children parameter from base class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b0a0cdec774..451a354f1d1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,7 @@ class NavItem implements Stringable
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null, #[Deprecated] array $children = [])
+    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From a5396d65a2fe00e42b39d2b82b6c6fbfd8a33674 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:27:45 +0100
Subject: [PATCH 0909/2811] Update static constructors to use self to prevent
 inheritance issues

It does not make sense to create NavGroupItem::forRoute and ::forLink, this serves as a compromise for now.
---
 .../Features/Navigation/NavGroupItem.php       |  1 -
 .../Framework/Features/Navigation/NavItem.php  |  8 ++++----
 .../framework/tests/Unit/NavGroupItemTest.php  | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1f009847e12..c73a67d8900 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -12,7 +12,6 @@
 
 /**
  * @todo Consider extracting trait for shared code with navigation menu class
- * @todo Consider inheritance issues with static constructors from NavItem class
  */
 class NavGroupItem extends NavItem
 {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 451a354f1d1..0a4857480bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -69,11 +69,11 @@ public function __construct(Route|string|null $destination, string $label, int $
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return new static(
+        return new self(
             $route,
             $label ?? $route->getPage()->navigationMenuLabel(),
             $priority ?? $route->getPage()->navigationMenuPriority(),
@@ -84,9 +84,9 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
     /**
      * Create a new navigation menu item leading to an external URI.
      */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): static
+    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
-        return new static($href, $label, $priority);
+        return new self($href, $label, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 370a42e4a5d..8eae025f789 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -189,6 +189,24 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
+    public function testForRoute()
+    {
+        $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
+
+        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertSame(NavItem::class, $item::class);
+    }
+
+    public function testForLink()
+    {
+        $item = NavGroupItem::forLink('foo', 'bar');
+
+        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertSame(NavItem::class, $item::class);
+    }
+
     protected function createNavItems(): array
     {
         return [

From 8f0232d40bba727f9a61a6b04b1962497d94501f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:30:32 +0100
Subject: [PATCH 0910/2811] Add spacing

---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index c73a67d8900..92ffb49b7f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -25,6 +25,7 @@ class NavGroupItem extends NavItem
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
+
         $this->addChildren($children);
     }
 

From f7eaa13548cad16c0bba8e37b64f5de75d8304d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:30:42 +0100
Subject: [PATCH 0911/2811] Remove unused import

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0a4857480bc..0e9339467f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;

From 8ffb4539e2561d4a0052e5a7e4be9c6a0834f450 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 2 Mar 2024 16:32:59 +0100
Subject: [PATCH 0912/2811] Rename children property and accessors to items

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../Features/Navigation/NavGroupItem.php      | 16 +++++++--------
 .../Framework/Features/Navigation/NavItem.php | 10 +++++-----
 .../AutomaticNavigationConfigurationsTest.php |  2 +-
 .../Services/DocumentationSidebarTest.php     |  2 +-
 .../framework/tests/Unit/NavGroupItemTest.php | 20 +++++++++----------
 packages/framework/tests/Unit/NavItemTest.php |  4 ++--
 7 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 2485420d786..b160e95ff09 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -15,7 +15,7 @@
                     @endif
                 </header>
                 <ul class="sidebar-group-items ml-4 px-2 mb-2" role="list" @if($sidebar->isCollapsible()) x-show="groupOpen" @endif>
-                    @foreach ($group->getChildren() as $item)
+                    @foreach ($group->getItems() as $item)
                         @include('hyde::components.docs.sidebar-item', ['grouped' => true])
                     @endforeach
                 </ul>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 92ffb49b7f9..1e4e52de7e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -16,11 +16,9 @@
 class NavGroupItem extends NavItem
 {
     /**
-     * @deprecated Rename to $items
-     *
      * @var array<\Hyde\Framework\Features\Navigation\NavItem>
      */
-    protected array $children = [];
+    protected array $items = [];
 
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
     {
@@ -36,9 +34,9 @@ public function __construct(string $label, array $children = [], int $priority =
      *
      * @return array<\Hyde\Framework\Features\Navigation\NavItem>
      */
-    public function getChildren(): array
+    public function getItems(): array
     {
-        return $this->children;
+        return $this->items;
     }
 
     /**
@@ -46,7 +44,7 @@ public function getChildren(): array
      */
     public function hasChildren(): bool
     {
-        return count($this->children) > 0;
+        return count($this->items) > 0;
     }
 
     /**
@@ -58,7 +56,7 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        $this->children[] = $item;
+        $this->items[] = $item;
         $this->route = null;
 
         return $this;
@@ -86,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getChildren())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
@@ -94,7 +92,7 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return collect($this->getChildren())->every(function (NavItem $child): bool {
+        return collect($this->getItems())->every(function (NavItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 0e9339467f9..40e278bda7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -37,7 +37,7 @@ class NavItem implements Stringable
     protected string $identifier;
 
     /** @deprecated Use NavGroupItem::$items instead */
-    protected array $children = [];
+    protected array $items = [];
 
     /**
      * Create a new navigation menu item.
@@ -161,9 +161,9 @@ public function getIdentifier(): string
     /**
      * @deprecated Should not be called on this class
      */
-    public function getChildren(): array
+    public function getItems(): array
     {
-        return $this->children;
+        return $this->items;
     }
 
     /**
@@ -171,7 +171,7 @@ public function getChildren(): array
      */
     public function hasChildren(): bool
     {
-        return count($this->children) > 0;
+        return count($this->items) > 0;
     }
 
     /**
@@ -189,7 +189,7 @@ public function addChild(NavItem $item): static
     {
         $item->group ??= $this->group;
 
-        $this->children[] = $item;
+        $this->items[] = $item;
         $this->route = null;
 
         return $this;
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8c20c50acda..310bb492d0b 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1317,7 +1317,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getChildren());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getItems());
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 89c4d055e7d..1fa84d1155d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getChildren())->first()->getGroupIdentifier());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupIdentifier());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 8eae025f789..28fa612f644 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -49,8 +49,8 @@ public function testCanConstructWithChildren()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -58,21 +58,21 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertCount(2, $item->getChildren());
-        $this->assertSame($children, $item->getChildren());
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
     }
 
-    public function testGetChildren()
+    public function testGetItems()
     {
         $children = $this->createNavItems();
         $item = new NavGroupItem('Foo', $children);
 
-        $this->assertSame($children, $item->getChildren());
+        $this->assertSame($children, $item->getItems());
     }
 
-    public function testGetChildrenWithNoChildren()
+    public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavGroupItem('Foo'))->getChildren());
+        $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
     }
 
     public function testHasChildren()
@@ -90,7 +90,7 @@ public function testCanAddItemToDropdown()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addChild($child)->getChildren());
+        $this->assertSame([$child], $group->addChild($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -106,7 +106,7 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavGroupItem('Foo');
         $items = $this->createNavItems();
 
-        $this->assertSame($items, $group->addChildren($items)->getChildren());
+        $this->assertSame($items, $group->addChildren($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index a56e057365b..aeff0c59a51 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -208,7 +208,7 @@ public function testDropdownFacade()
         $item = NavItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame([], $item->getChildren());
+        $this->assertSame([], $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -219,7 +219,7 @@ public function testDropdownFacadeWithChildren()
         ];
 
         $item = NavItem::forGroup('foo', $children);
-        $this->assertSame($children, $item->getChildren());
+        $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 

From 4805c8e0744398efe41d2ebf03cfc9534465a38e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 3 Mar 2024 12:23:09 +0100
Subject: [PATCH 0913/2811] Collapse PHPDoc

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1e4e52de7e5..1ec4ff87b86 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -15,9 +15,7 @@
  */
 class NavGroupItem extends NavItem
 {
-    /**
-     * @var array<\Hyde\Framework\Features\Navigation\NavItem>
-     */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)

From 08b7936fe850ea3159288e25e17e5682be6a1088 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 3 Mar 2024 12:26:43 +0100
Subject: [PATCH 0914/2811] Deprecate `NavGroupItem::hasChildren` method

This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 1ec4ff87b86..0b1206f3be4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -39,6 +39,8 @@ public function getItems(): array
 
     /**
      * Check if the NavItem instance has children.
+     *
+     * @deprecated This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
      */
     public function hasChildren(): bool
     {

From a68bb5b80eef40f15caf718093deec316b00a47d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:03:32 +0100
Subject: [PATCH 0915/2811] Remove tests for deprecated method

---
 packages/framework/tests/Unit/NavGroupItemTest.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 28fa612f644..1f37834c191 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -75,16 +75,6 @@ public function testGetItemsWithNoItems()
         $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
     }
 
-    public function testHasChildren()
-    {
-        $this->assertFalse((new NavGroupItem('Foo'))->hasChildren());
-    }
-
-    public function testHasChildrenWithChildren()
-    {
-        $this->assertTrue((new NavGroupItem('Foo', $this->createNavItems()))->hasChildren());
-    }
-
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');

From 1506ac8a968e8d681fc603aee34c8cf832aa7258 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:13:23 +0100
Subject: [PATCH 0916/2811] Fall back to parent class priority

For example if there are no pages
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 0b1206f3be4..ff8b9c725cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority())) ?? parent::getPriority();
         }
 
         return parent::getPriority();

From f1b40c80916caa712bbdb542e2159f568eda8b4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:13:37 +0100
Subject: [PATCH 0917/2811] Revert "Fall back to parent class priority"

This reverts commit 1506ac8a968e8d681fc603aee34c8cf832aa7258.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index ff8b9c725cf..0b1206f3be4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -84,7 +84,7 @@ public function addChildren(array $items): static
     public function getPriority(): int
     {
         if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority())) ?? parent::getPriority();
+            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();

From 027952690e3c2dbc0494a840b316874565891a99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:14:10 +0100
Subject: [PATCH 0918/2811] Return false if items are empty

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 0b1206f3be4..82305efe884 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -92,6 +92,10 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
+        if (empty($this->getItems())) {
+            return false;
+        }
+
         return collect($this->getItems())->every(function (NavItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });

From 95654afffa1189a4d4db0b79a4635f553cdc9a43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 20:14:27 +0100
Subject: [PATCH 0919/2811] Remove state logic that is now unnecessary

---
 .../src/Framework/Features/Navigation/NavGroupItem.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 82305efe884..8470f5f07ca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -83,7 +83,7 @@ public function addChildren(array $items): static
      */
     public function getPriority(): int
     {
-        if ($this->hasChildren() && $this->containsOnlyDocumentationPages()) {
+        if ($this->containsOnlyDocumentationPages()) {
             return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
         }
 

From 91ea31f5b17c4d7cfbb5bee947663a96e31a8860 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:18:00 +0100
Subject: [PATCH 0920/2811] Use instanceof check to determine child state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 11cb904cc7c..c931dd1a34c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,7 +88,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item->hasChildren());
+        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
 

From 92bebfa833ec46a3f62a89580e4f4458043f2315 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:32:05 +0100
Subject: [PATCH 0921/2811] Use instanceof check to determine child state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c931dd1a34c..853d84606cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,7 +61,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavItem $item): bool => $item->hasChildren());
+        return $this->getItems()->contains(fn (NavItem $item): bool => $item instanceof NavGroupItem);
     }
 
     /**

From 4c8780ee77e1c5c1f9a9cb477a2305af905b0e55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 21:58:08 +0100
Subject: [PATCH 0922/2811] Update test for new system

---
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index ee75d74d943..8e1a5d3457e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
-use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -218,15 +218,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemHasChildren()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavGroupItemInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
-        $page = new DocumentationPage('foo');
-        $child = new DocumentationPage('bar');
         $menu = new DocumentationSidebar([
-            NavItem::forRoute($page->getRoute())->addChild(NavItem::forRoute($child->getRoute())),
+            new NavGroupItem('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());

From e67382344f8dcde04957785c4a3b9e19a45ff7f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 9 Mar 2024 22:03:07 +0100
Subject: [PATCH 0923/2811] Remove `NavGroupItem::hasChildren` method

This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
---
 .../src/Framework/Features/Navigation/NavGroupItem.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 8470f5f07ca..371e1b5fc6f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -37,16 +37,6 @@ public function getItems(): array
         return $this->items;
     }
 
-    /**
-     * Check if the NavItem instance has children.
-     *
-     * @deprecated This is no longer needed, as it does not make sense to check if a group has children. Compare the instance type instead.
-     */
-    public function hasChildren(): bool
-    {
-        return count($this->items) > 0;
-    }
-
     /**
      * Add a navigation item to the children of the navigation item.
      *

From 7f8c773eb3053a9197cdbfcf40e939f37046ee1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 13:01:17 +0100
Subject: [PATCH 0924/2811] Remove `NavItem::addChildren` method from base
 class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 40e278bda7c..4d2697f270c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -195,18 +195,6 @@ public function addChild(NavItem $item): static
         return $this;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function addChildren(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addChild($item);
-        }
-
-        return $this;
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From ad021c58258d8791e0fd4e1be9fa51c41a6281b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 13:33:53 +0100
Subject: [PATCH 0925/2811] Remove `NavItem::addChild` method from base class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 4d2697f270c..8d776013aea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -182,19 +182,6 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function addChild(NavItem $item): static
-    {
-        $item->group ??= $this->group;
-
-        $this->items[] = $item;
-        $this->route = null;
-
-        return $this;
-    }
-
     protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From c35cb8043a93606a9a815bf452400eaf183878a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:23:06 +0100
Subject: [PATCH 0926/2811] Remove `NavItem::hasChildren` method

Instead, compare if the NavItem in an instance of the NavGroupItem class
---
 .../resources/views/layouts/navigation.blade.php          | 2 +-
 .../src/Framework/Features/Navigation/NavItem.php         | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 060e228eb0b..fc7aad53803 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -35,7 +35,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item->hasChildren())
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 8d776013aea..d503a9d4f5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -166,14 +166,6 @@ public function getItems(): array
         return $this->items;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function hasChildren(): bool
-    {
-        return count($this->items) > 0;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */

From 86306bfce495c669117e97af15d5dff418a3906e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:23:38 +0100
Subject: [PATCH 0927/2811] Get items using new method

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index fc7aad53803..600d310fbd6 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -36,7 +36,7 @@
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
-                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getChildren()"/>
+                        <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         @include('hyde::components.navigation.navigation-link')
                     @endif

From d5febfd0c2fdd2929e0a98ba05dfe9ed0a9cafce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:26:21 +0100
Subject: [PATCH 0928/2811] Narrow down return types to child class

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 2 +-
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d503a9d4f5c..d73b015d8db 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -95,7 +95,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): static
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
     {
         return new NavGroupItem($label, $items, $priority);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index fdc5cf33415..842e8e75263 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,7 +146,7 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavItem
+    protected function getOrCreateGroupItem(string $groupName): NavGroupItem
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
@@ -154,7 +154,7 @@ protected function getOrCreateGroupItem(string $groupName): NavItem
         return $group ?? $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): NavItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 

From 6404ddc65d03be26fb1a4f2305df9120aead33ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:30:21 +0100
Subject: [PATCH 0929/2811] Return instance only if it is for a group

This means that items that have the same route key as a group identifier is ignored here
---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 842e8e75263..4c78f119be9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -151,7 +151,11 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        return $group ?? $this->createGroupItem($groupKey, $groupName);
+        if ($group instanceof NavGroupItem) {
+            return $group;
+        }
+
+        return $this->createGroupItem($groupKey, $groupName);
     }
 
     protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem

From be43166ed6b8b4f3e8e292653b625b0ac68bcde0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 17:34:09 +0100
Subject: [PATCH 0930/2811] Replace conflicting navigation items with grouped
 version

---
 .../Features/Navigation/NavigationMenuGenerator.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4c78f119be9..0ac947cc0bd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -153,6 +153,16 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
 
         if ($group instanceof NavGroupItem) {
             return $group;
+        } elseif ($group instanceof NavItem) {
+            // We are trying to add children to an existing navigation menu item,
+            // so here we create a new instance to replace the base one, this
+            // does mean we lose the destination as we can't link to them.
+
+            $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
+
+            $this->items->put($groupKey, $item);
+
+            return $item;
         }
 
         return $this->createGroupItem($groupKey, $groupName);

From fddae2c652131b66a824a8b0dc6dec6ffcfd4eee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 20:27:14 +0100
Subject: [PATCH 0931/2811] Add marker for needed documentation

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 0ac947cc0bd..f41fa696e26 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -158,6 +158,9 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
 
+            // Todo: Add note in documentation about this behavior
+            // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
+
             $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);

From 201ca2d10e66874a52f8fb892c7de7f53ade610d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 10 Mar 2024 20:35:35 +0100
Subject: [PATCH 0932/2811] Remove `NavItem::getItems` method from base class

Moved to the new NavGroupItem class
---
 .../src/Framework/Features/Navigation/NavItem.php         | 8 --------
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 3 ++-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d73b015d8db..d7acc2016f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -158,14 +158,6 @@ public function getIdentifier(): string
         return $this->identifier;
     }
 
-    /**
-     * @deprecated Should not be called on this class
-     */
-    public function getItems(): array
-    {
-        return $this->items;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 310bb492d0b..7ce6a2dcb75 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,6 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1317,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item->getItems());
+            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 

From eb55ce31eb1b3b326be3c897c723d9e51e608471 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:03:41 +0100
Subject: [PATCH 0933/2811] Deprecate group parameter

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 853d84606cb..c2e83fd0f8e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -69,7 +70,7 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(string $group): bool
+    public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);

From 4ca2b69d0965d26488e56f797f9990b033219928 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:27:24 +0100
Subject: [PATCH 0934/2811] Deprecate `isGroupActive` method

This makes more sense as a method on the NavGroupItem class.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c2e83fd0f8e..3a77e90031e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,6 +69,8 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
+     *
+     * @deprecated This makes more sense as a method on the NavGroupItem class.
      */
     public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {

From f04a630abe3c408ecfa30357bb3d3e1b1c267222 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:42:29 +0100
Subject: [PATCH 0935/2811] Revert "Deprecate `isGroupActive` method"

This reverts commit 4ca2b69d0965d26488e56f797f9990b033219928.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3a77e90031e..c2e83fd0f8e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,8 +69,6 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
-     *
-     * @deprecated This makes more sense as a method on the NavGroupItem class.
      */
     public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
     {

From a480e4e3e5b6807eed4625ef8c559e0f8dd46eb0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:42:44 +0100
Subject: [PATCH 0936/2811] Revert "Deprecate group parameter"

This reverts commit eb55ce31eb1b3b326be3c897c723d9e51e608471.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c2e83fd0f8e..853d84606cb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,7 +7,6 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 
@@ -70,7 +69,7 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      */
-    public function isGroupActive(#[Deprecated('We should be able to get all the needed data from the instance and render data')]string $group): bool
+    public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);

From a2df70f636696d5f66f7ffd0150299589069e099 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 11:47:31 +0100
Subject: [PATCH 0937/2811] Document why code location is weird

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 853d84606cb..8dabcbf5254 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -68,6 +68,8 @@ public function hasGroups(): bool
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
+     *
+     * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
     {

From 8f6ba5ff49131a3d84f9771b3f6399de76710af5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:44:53 +0100
Subject: [PATCH 0938/2811] Deprecate the NavItem identifier property

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d7acc2016f6..9b39c5fda9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,7 +33,7 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
+    /** @deprecated The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
     protected string $identifier;
 
     /** @deprecated Use NavGroupItem::$items instead */
@@ -152,6 +152,8 @@ public function getGroupIdentifier(): ?string
 
     /**
      * Get the identifier of the navigation item.
+     *
+     * @deprecated This only seems to be used by groups so might want to move it there and rename it to getGroupKey to match usages
      */
     public function getIdentifier(): string
     {

From d415e910cf472f6dcc186dc5313dde9fec5ba6ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:47:43 +0100
Subject: [PATCH 0939/2811] Use group identifier for comparison

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index b160e95ff09..92326932f83 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -7,7 +7,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getIdentifier()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupIdentifier()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())

From b3d12375a660d0647a086c77042b683ce036f05b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 12:55:24 +0100
Subject: [PATCH 0940/2811] Use group identifier instead of deprecated base
 identifier

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index f41fa696e26..b2860bd4345 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addChild($item);
 
-        if (! $this->items->has($groupItem->getIdentifier())) {
-            $this->items->put($groupItem->getIdentifier(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupIdentifier())) {
+            $this->items->put($groupItem->getGroupIdentifier(), $groupItem);
         }
     }
 

From e830cdaca6b1550b518130a9ccae73a76e65b149 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:18:13 +0100
Subject: [PATCH 0941/2811] Rename NavItem method `getGroupIdentifier` to
 `getGroupKey`

Matches the documented usage better
---
 .../views/components/docs/sidebar-items.blade.php    |  2 +-
 .../src/Framework/Features/Navigation/NavItem.php    |  4 ++--
 .../Features/Navigation/NavigationMenuGenerator.php  |  6 +++---
 .../AutomaticNavigationConfigurationsTest.php        |  2 +-
 .../Feature/Services/DocumentationSidebarTest.php    |  2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php   |  8 ++++----
 packages/framework/tests/Unit/NavItemTest.php        | 12 ++++++------
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 92326932f83..e06a90e94c5 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -7,7 +7,7 @@
 @else
     <ul id="sidebar-items" role="list">
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupIdentifier()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 9b39c5fda9b..457341a5910 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -141,11 +141,11 @@ public function getPriority(): int
     }
 
     /**
-     * Get the group identifier of the navigation item, if any.
+     * Get the group identifier key of the navigation item, if any.
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
-    public function getGroupIdentifier(): ?string
+    public function getGroupKey(): ?string
     {
         return $this->group;
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b2860bd4345..4bbc163efc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,14 +135,14 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavItem::forRoute($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroupIdentifier() ?? 'Other') : $item->getGroupIdentifier();
+        $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
         $groupItem->addChild($item);
 
-        if (! $this->items->has($groupItem->getGroupIdentifier())) {
-            $this->items->put($groupItem->getGroupIdentifier(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupKey())) {
+            $this->items->put($groupItem->getGroupKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 7ce6a2dcb75..0de6e2ee60a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1318,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupIdentifier(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+            return new TestNavItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 1fa84d1155d..01aa15b3430 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -157,7 +157,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupIdentifier());
+        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index 1f37834c191..b8bc2caad15 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -113,8 +113,8 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $group->addChild($child);
 
-        $this->assertSame('foo', $group->getGroupIdentifier());
-        $this->assertSame('bar', $child->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('bar', $child->getGroupKey());
     }
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
@@ -124,8 +124,8 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
         $group->addChild($child);
 
-        $this->assertSame('foo', $group->getGroupIdentifier());
-        $this->assertSame('foo', $child->getGroupIdentifier());
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('foo', $child->getGroupKey());
     }
 
     public function testGetPriorityUsesDefaultPriority()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index aeff0c59a51..d6362b5579d 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -105,7 +105,7 @@ public function testGetPriority()
     public function testGetGroup()
     {
         $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroupIdentifier());
+        $this->assertNull($navItem->getGroupKey());
     }
 
     public function testFromRoute()
@@ -252,28 +252,28 @@ public function testIsCurrentWithExternalRoute()
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupIdentifier());
+        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupIdentifier());
+        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupIdentifier());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupIdentifier());
+        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
     {
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroupIdentifier());
+        $this->assertSame('foo-bar', $item->getGroupKey());
     }
 
     public function testIdentifier()

From 711ef0305b25711c2344ee091d7dee50c5bd7c39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:22:20 +0100
Subject: [PATCH 0942/2811] Improve code documentation

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 457341a5910..3a994ecf6f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -144,6 +144,7 @@ public function getPriority(): int
      * Get the group identifier key of the navigation item, if any.
      *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     * It's based on the "slugified" group label, or the subdirectory name if that is how.
      */
     public function getGroupKey(): ?string
     {

From d15b710aa6fc9a47359c920cb978c578a3590fbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:24:33 +0100
Subject: [PATCH 0943/2811] Improve code documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3a994ecf6f6..3ace9af6ab4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -143,8 +143,10 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * When using automatic subdirectory based groups, the subdirectory name is the group key.
+     * Otherwise, the group key is a "slugified" version of the group's label.
+     *
      * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     * It's based on the "slugified" group label, or the subdirectory name if that is how.
      */
     public function getGroupKey(): ?string
     {

From 029b01db18be6e044a561e595cda2f7482dacee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:26:51 +0100
Subject: [PATCH 0944/2811] Use group key for comparison

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8dabcbf5254..8d1d2567c29 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,7 +92,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getIdentifier();
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 2352dced085ba60335a705876a598fecb307c912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 13:28:01 +0100
Subject: [PATCH 0945/2811] Remove unnecessary NavItem identifier feature

---
 .../Framework/Features/Navigation/NavItem.php | 14 --------
 packages/framework/tests/Unit/NavItemTest.php | 36 -------------------
 2 files changed, 50 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 3ace9af6ab4..a787d4ea25f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -33,9 +33,6 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group;
 
-    /** @deprecated The "slugified" version of the label used to uniquely identify the item for things like active state comparisons. */
-    protected string $identifier;
-
     /** @deprecated Use NavGroupItem::$items instead */
     protected array $items = [];
 
@@ -57,7 +54,6 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->label = $label;
         $this->priority = $priority;
         $this->group = static::normalizeGroupKey($group);
-        $this->identifier = static::makeIdentifier($label);
     }
 
     /**
@@ -153,16 +149,6 @@ public function getGroupKey(): ?string
         return $this->group;
     }
 
-    /**
-     * Get the identifier of the navigation item.
-     *
-     * @deprecated This only seems to be used by groups so might want to move it there and rename it to getGroupKey to match usages
-     */
-    public function getIdentifier(): string
-    {
-        return $this->identifier;
-    }
-
     /**
      * Check if the NavItem instance is the current page being rendered.
      */
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index d6362b5579d..98093b7628e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -275,40 +275,4 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
-
-    public function testIdentifier()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500);
-
-        $this->assertSame('test', $item->getIdentifier());
-    }
-
-    public function testIdentifierWithCustomLabel()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Foo Bar', 500);
-
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
-
-    public function testIdentifierFromRouteKey()
-    {
-        $item = NavItem::forRoute(Routes::get('index'));
-        $this->assertSame('home', $item->getIdentifier());
-    }
-
-    public function testIdentifierUsesLabelWhenRouteKeyIsFalsy()
-    {
-        $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Foo Bar', 500);
-
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
-
-    public function testIdentifierUsesLabelForExternalRoute()
-    {
-        $item = NavItem::forLink('https://example.com', 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getIdentifier());
-    }
 }

From cc5bad4133dad8782d1b0fe3129caa37bd2067d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:16:34 +0100
Subject: [PATCH 0946/2811] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8d1d2567c29..64ed8edd555 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,6 +88,8 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active.
 
+        // Todo: It may make more sense to handle this logic in the view, as it's a UI concern and this is a data model.
+
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);

From c549371c057a9de367e4c526b6b86bc63cfcc8ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:19:22 +0100
Subject: [PATCH 0947/2811] Rename `addChild` method to `addItem`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php |  4 ++--
 .../Features/Navigation/NavigationMenuGenerator.php    |  2 +-
 packages/framework/tests/Unit/NavGroupItemTest.php     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 371e1b5fc6f..6b61bfcf297 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -42,7 +42,7 @@ public function getItems(): array
      *
      * This will turn the parent item into a dropdown. Its destination will be set to null.
      */
-    public function addChild(NavItem $item): static
+    public function addItem(NavItem $item): static
     {
         $item->group ??= $this->group;
 
@@ -60,7 +60,7 @@ public function addChild(NavItem $item): static
     public function addChildren(array $items): static
     {
         foreach ($items as $item) {
-            $this->addChild($item);
+            $this->addItem($item);
         }
 
         return $this;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4bbc163efc0..5aacd70441e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -139,7 +139,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
-        $groupItem->addChild($item);
+        $groupItem->addItem($item);
 
         if (! $this->items->has($groupItem->getGroupKey())) {
             $this->items->put($groupItem->getGroupKey(), $groupItem);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index b8bc2caad15..ea5513813e2 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -80,7 +80,7 @@ public function testCanAddItemToDropdown()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addChild($child)->getItems());
+        $this->assertSame([$child], $group->addItem($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -88,7 +88,7 @@ public function testAddChildMethodReturnsSelf()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($group, $group->addChild($child));
+        $this->assertSame($group, $group->addItem($child));
     }
 
     public function testCanAddMultipleItemsToDropdown()
@@ -111,7 +111,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $group->addChild($child);
+        $group->addItem($child);
 
         $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('bar', $child->getGroupKey());
@@ -122,7 +122,7 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
         $group = new NavGroupItem('Foo');
         $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
 
-        $group->addChild($child);
+        $group->addItem($child);
 
         $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('foo', $child->getGroupKey());
@@ -163,7 +163,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavItem(new Route(new $type()), 'Bar', 100);
-            $group->addChild($child);
+            $group->addItem($child);
         }
 
         $this->assertSame(999, $group->getPriority());

From 76a50691d5a114b51d37e6930575eb16416ac8c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:19:40 +0100
Subject: [PATCH 0948/2811] Rename `addChildren` method to `addItems`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++--
 packages/framework/tests/Unit/NavGroupItemTest.php            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 6b61bfcf297..6b090f4750f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -22,7 +22,7 @@ public function __construct(string $label, array $children = [], int $priority =
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
 
-        $this->addChildren($children);
+        $this->addItems($children);
     }
 
     /**
@@ -57,7 +57,7 @@ public function addItem(NavItem $item): static
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
-    public function addChildren(array $items): static
+    public function addItems(array $items): static
     {
         foreach ($items as $item) {
             $this->addItem($item);
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index ea5513813e2..c76f37aa346 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -96,14 +96,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavGroupItem('Foo');
         $items = $this->createNavItems();
 
-        $this->assertSame($items, $group->addChildren($items)->getItems());
+        $this->assertSame($items, $group->addItems($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
 
-        $this->assertSame($group, $group->addChildren([]));
+        $this->assertSame($group, $group->addItems([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()

From 1ba5848654ef2e01ebc1ef30a27be12fb8d546c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:21:17 +0100
Subject: [PATCH 0949/2811] Change named `$children` parameter to `$items`

---
 .../src/Framework/Features/Navigation/NavGroupItem.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 6b090f4750f..792386b033e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -18,11 +18,11 @@ class NavGroupItem extends NavItem
     /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
     protected array $items = [];
 
-    public function __construct(string $label, array $children = [], int $priority = NavigationMenu::LAST)
+    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
         parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
 
-        $this->addItems($children);
+        $this->addItems($items);
     }
 
     /**

From d8ece8fdd3c317468047b14aaf0f4b396de7072c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 16:29:29 +0100
Subject: [PATCH 0950/2811] Remove route null writing not needed for standalone
 class

Since splitting out the class this is already null from the start
---
 .../framework/src/Framework/Features/Navigation/NavGroupItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 792386b033e..4f3cb6fb1aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -47,7 +47,6 @@ public function addItem(NavItem $item): static
         $item->group ??= $this->group;
 
         $this->items[] = $item;
-        $this->route = null;
 
         return $this;
     }

From a1b82f0da486b9ea79821f6758b8d346a55f6c0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:06:05 +0100
Subject: [PATCH 0951/2811] Update class documentation

---
 .../Framework/Features/Navigation/NavGroupItem.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 4f3cb6fb1aa..72bd92a3ac8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -11,6 +11,8 @@
 use function collect;
 
 /**
+ * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
 class NavGroupItem extends NavItem
@@ -26,7 +28,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
     }
 
     /**
-     * Get the children of the navigation item.
+     * Get the items of the grouped navigation item.
      *
      * For the main navigation menu, this stores any dropdown items.
      *
@@ -38,9 +40,7 @@ public function getItems(): array
     }
 
     /**
-     * Add a navigation item to the children of the navigation item.
-     *
-     * This will turn the parent item into a dropdown. Its destination will be set to null.
+     * Add a navigation item to the grouped navigation item.
      */
     public function addItem(NavItem $item): static
     {
@@ -52,7 +52,7 @@ public function addItem(NavItem $item): static
     }
 
     /**
-     * Add multiple navigation items to the children of the navigation item.
+     * Add multiple navigation items to the grouped navigation item.
      *
      * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
      */
@@ -66,7 +66,7 @@ public function addItems(array $items): static
     }
 
     /**
-     * Get the priority to determine the order of the navigation item.
+     * Get the priority to determine the order of the grouped navigation item.
      *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
      */

From a4d9207e1f714c8c2ea780f1055a1987fe19b52e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:18:45 +0100
Subject: [PATCH 0952/2811] Remove unused helper method

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a787d4ea25f..5f2ffe3a200 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -161,9 +161,4 @@ protected static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    protected static function makeIdentifier(string $label): string
-    {
-        return Str::slug($label);
-    }
 }

From 563444e11d4af9af4bb64dfe038981975a6a5f1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:18:53 +0100
Subject: [PATCH 0953/2811] Normalize documentation terms

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5f2ffe3a200..5921d6af9a6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -42,7 +42,7 @@ class NavItem implements Stringable
      * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
-     * @param  string|null  $group  The dropdown/group identifier of the navigation item, if any.
+     * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
     public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {

From ff4e949556c0ae49b80d947b707fb63663362efc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:19:00 +0100
Subject: [PATCH 0954/2811] Remove outdated documentation

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5921d6af9a6..d18c5b451e3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -20,11 +20,6 @@
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavItem::fromRoute() to use data from the route
  *   3. You can use NavItem::forLink() for an external or un-routed link
- *
- * Navigation items can be turned into dropdowns or sidebar groups by adding children.
- * Note that doing so will mean that any link on the parent will no longer be clickable,
- * as clicking the parent label will open the dropdown instead of leading to the destination.
- * For this reason, dropdown items will have their destination set to null.
  */
 class NavItem implements Stringable
 {

From 6e7835e7614b316493d080a4c0b8b295cc0be7fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:35:31 +0100
Subject: [PATCH 0955/2811] Update documentation order

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index d18c5b451e3..a9cd1a6ca48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -134,10 +134,10 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
      * When using automatic subdirectory based groups, the subdirectory name is the group key.
      * Otherwise, the group key is a "slugified" version of the group's label.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
      */
     public function getGroupKey(): ?string
     {

From 8b52836b6043a81485a9b79e94f71c7aa30834c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:42:14 +0100
Subject: [PATCH 0956/2811] Create NavigationHtmlLayoutsTest.php

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
new file mode 100644
index 00000000000..eeef142f3d9
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * Very high level tests for navigation menu and sidebar view layouts.
+ */
+class NavigationHtmlLayoutsTest extends TestCase
+{
+    //
+}

From 50ee2c29f9d8ae9a18d8d2adb1a18752a0b0168d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:43:13 +0100
Subject: [PATCH 0957/2811] Add crosslinks between similarly functioning tests

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php     | 2 ++
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0de6e2ee60a..fa018501b9e 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -26,6 +26,8 @@
 /**
  * High-level broad-spectrum tests for the automatic navigation configurations, testing various setups.
  *
+ * @see \Hyde\Framework\Testing\Unit\Views\NavigationHtmlLayoutsTest
+ *
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index eeef142f3d9..25c265ac3e2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -8,6 +8,8 @@
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
+ *
+ * @see \Hyde\Framework\Testing\Feature\AutomaticNavigationConfigurationsTest
  */
 class NavigationHtmlLayoutsTest extends TestCase
 {

From a4653545c4fe0128f7ed80c3052897d109c382ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:44:54 +0100
Subject: [PATCH 0958/2811] Copy over base helpers from similar test

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 25c265ac3e2..01886830afb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -5,6 +5,9 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
+use Hyde\Pages\Concerns\HydePage;
+use Hyde\Framework\Testing\Feature\TestKernel;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -13,5 +16,18 @@
  */
 class NavigationHtmlLayoutsTest extends TestCase
 {
-    //
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+
+    protected function withPages(array $pages): static
+    {
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
+    }
 }

From 783543f4133746ce8d949d50a689b6ffbfcff1e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:57:08 +0100
Subject: [PATCH 0959/2811] Move container access back to view

---
 .../resources/views/components/docs/sidebar.blade.php         | 4 ++++
 packages/framework/resources/views/layouts/docs.blade.php     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 0196551d310..e6698715522 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -1,3 +1,7 @@
+@php
+    $sidebar = app('navigation.sidebar');
+@endphp
+
 <aside id="sidebar" x-cloak :class="sidebarOpen ? 'visible left-0' : 'invisible -left-64 md:visible md:left-0'" class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30 md:flex flex-col shadow-lg md:shadow-none transition-all duration-300">
     <header id="sidebar-header" class="h-16">
         @include('hyde::components.docs.sidebar-brand')
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index e6bdb4886cf..3f66d821517 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -8,7 +8,7 @@
 
     @include('hyde::components.skip-to-content-button')
     @include('hyde::components.docs.mobile-navigation')
-    @include('hyde::components.docs.sidebar', ['sidebar' => app('navigation.sidebar')])
+    @include('hyde::components.docs.sidebar')
 
     <main id="content" class="dark:bg-gray-900 min-h-screen bg-gray-50 md:bg-white absolute top-16 md:top-0 w-screen md:left-64 md:w-[calc(100vw_-_16rem)]">
         @include('hyde::components.docs.documentation-article')

From c95b3e333d4ac16a713f57ba598b8c4e93becb84 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 17:47:29 +0100
Subject: [PATCH 0960/2811] Copy over test kernel

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 01886830afb..4902212f78c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,7 +7,6 @@
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
-use Hyde\Framework\Testing\Feature\TestKernel;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -31,3 +30,19 @@ protected function withPages(array $pages): static
         return $this;
     }
 }
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
+}

From 43107a652b20c402362e82c340cef3af64965347 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:02:28 +0100
Subject: [PATCH 0961/2811] Set up base testing API scaffolding

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4902212f78c..328bf7fdeec 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,6 +7,11 @@
 use Hyde\Testing\TestCase;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\Concerns\HydePage;
+use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
@@ -21,6 +26,22 @@ protected function setUp(): void
 
         $this->kernel = new TestKernel();
         HydeKernel::setInstance($this->kernel);
+
+        app()->instance('navigation.main', null);
+        app()->instance('navigation.sidebar', null);
+
+        $this->mockPage();
+        $this->mockRoute();
+    }
+
+    public function testMainNavigationMenu()
+    {
+        $this->menu()->assertTrue();
+    }
+
+    public function testDocumentationSidebarMenu()
+    {
+        $this->sidebar()->assertTrue();
     }
 
     protected function withPages(array $pages): static
@@ -29,6 +50,52 @@ protected function withPages(array $pages): static
 
         return $this;
     }
+
+    protected function menu(?array $withPages = null): RenderedNavigationMenu
+    {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
+        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
+        app()->instance('navigation.main', $menu);
+
+        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'));
+    }
+
+    protected function sidebar(?array $withPages = null): RenderedNavigationMenu
+    {
+        if ($withPages) {
+            $this->withPages($withPages);
+        }
+
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        app()->instance('navigation.sidebar', $menu);
+
+        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'));
+    }
+
+    protected function render(string $view): string
+    {
+        return view($view)->render();
+    }
+}
+
+class RenderedNavigationMenu
+{
+    protected NavigationHtmlLayoutsTest $test;
+    protected string $html;
+
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
+    {
+        $this->test = $test;
+        $this->html = $html;
+    }
+
+    public function assertTrue(): void
+    {
+        $this->test->assertTrue(true);
+    }
 }
 
 class TestKernel extends HydeKernel

From 173039ab9184b046874fb446f286f6314c124baa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:06:25 +0100
Subject: [PATCH 0962/2811] Add type parameter to test helper

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 328bf7fdeec..2eb333c73ac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -60,7 +60,7 @@ protected function menu(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'));
+        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'), MainNavigationMenu::class);
     }
 
     protected function sidebar(?array $withPages = null): RenderedNavigationMenu
@@ -72,7 +72,7 @@ protected function sidebar(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'));
+        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'), DocumentationSidebar::class);
     }
 
     protected function render(string $view): string
@@ -85,11 +85,13 @@ class RenderedNavigationMenu
 {
     protected NavigationHtmlLayoutsTest $test;
     protected string $html;
+    protected string $type;
 
-    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {
         $this->test = $test;
         $this->html = $html;
+        $this->type = $type;
     }
 
     public function assertTrue(): void

From 59b654790f7833f1a12b2899d00dd3d648e5f7e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:11:03 +0100
Subject: [PATCH 0963/2811] Add testing helper to die with HTML contents

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 2eb333c73ac..7483c2d3717 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Foundation\HydeKernel;
+use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -98,6 +101,15 @@ public function assertTrue(): void
     {
         $this->test->assertTrue(true);
     }
+
+    #[NoReturn]
+    public function dd(bool $writeHtml = true): void
+    {
+        if ($writeHtml) {
+            file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
+        }
+        exit(trim($this->html)."\n\n");
+    }
 }
 
 class TestKernel extends HydeKernel

From 9fdeb6716fcf5754cb2b6a90813bf6c06baa9a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:12:23 +0100
Subject: [PATCH 0964/2811] Add newline

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7483c2d3717..f0e150c2c75 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -108,6 +108,7 @@ public function dd(bool $writeHtml = true): void
         if ($writeHtml) {
             file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
         }
+
         exit(trim($this->html)."\n\n");
     }
 }

From c68853c5cd55221db3055b27ab134997144b9bdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:29:33 +0100
Subject: [PATCH 0965/2811] Experimental HTML parser setup

See quirks at https://stackoverflow.com/a/70303134/5700388
---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f0e150c2c75..1ef83a9a8b5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -111,6 +111,36 @@ public function dd(bool $writeHtml = true): void
 
         exit(trim($this->html)."\n\n");
     }
+
+    protected function parseHtml(): DOMDocument
+    {
+        $dom = new DOMDocument();
+        $document = $this->html;
+
+        $html = <<<HTML
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Test Document</title>
+</head>
+<body>
+    <main id="test-content">
+        $document
+    </main>
+</body>
+</html>
+HTML;
+
+        try {
+            $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
+        } catch (Throwable $exception) {
+            throw $exception;
+        }
+
+        return $dom;
+    }
 }
 
 class TestKernel extends HydeKernel

From e407f2fedfcd96516a7b25c1ec802de434aa2103 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:30:17 +0100
Subject: [PATCH 0966/2811] Unwrap try

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1ef83a9a8b5..276b7092eb8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -133,11 +133,7 @@ protected function parseHtml(): DOMDocument
 </html>
 HTML;
 
-        try {
-            $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
-        } catch (Throwable $exception) {
-            throw $exception;
-        }
+        $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
 
         return $dom;
     }

From 374467d04b7d76b4e8ec1332c77595671f3c56b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:30:49 +0100
Subject: [PATCH 0967/2811] Remove wrapper document

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 276b7092eb8..edcc32a9f1f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -115,25 +115,8 @@ public function dd(bool $writeHtml = true): void
     protected function parseHtml(): DOMDocument
     {
         $dom = new DOMDocument();
-        $document = $this->html;
-
-        $html = <<<HTML
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Test Document</title>
-</head>
-<body>
-    <main id="test-content">
-        $document
-    </main>
-</body>
-</html>
-HTML;
-
-        $dom->loadHTML($html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
+
+        $dom->loadHTML($this->html, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING | LIBXML_NOERROR | LIBXML_PARSEHUGE);
 
         return $dom;
     }

From 94248683b72727fadb5048c6e3c77d0feef50612 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:01 +0100
Subject: [PATCH 0968/2811] Parse HTML into test AST

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index edcc32a9f1f..37b35988f0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -89,12 +89,15 @@ class RenderedNavigationMenu
     protected NavigationHtmlLayoutsTest $test;
     protected string $html;
     protected string $type;
+    protected DOMDocument $ast;
 
     public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {
         $this->test = $test;
         $this->html = $html;
         $this->type = $type;
+
+        $this->ast = $this->parseHtml();
     }
 
     public function assertTrue(): void

From 23b65d4dcf322defb8b887c26081935dd57f1c7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:13 +0100
Subject: [PATCH 0969/2811] Add noinspection tag

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 37b35988f0a..f1a38e7962e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection PhpComposerExtensionStubsInspection */
+
 declare(strict_types=1);
 
 namespace Hyde\Framework\Testing\Unit\Views;

From 473654169b23f1ebea5ae2e9374b3e90659aee8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:31:32 +0100
Subject: [PATCH 0970/2811] Import class

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f1a38e7962e..17562e68a0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -7,6 +7,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Hyde;
+use DOMDocument;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
 use Hyde\Foundation\HydeKernel;

From 5f425a0997847615bc72ce47b91ac0c1fe52e38f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:37:20 +0100
Subject: [PATCH 0971/2811] Add base assertion

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 17562e68a0a..597f3b44f98 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -101,6 +101,8 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html, strin
         $this->type = $type;
 
         $this->ast = $this->parseHtml();
+
+        $this->test->assertNotEmpty($this->html);
     }
 
     public function assertTrue(): void

From 8c30a5af4afd1dee948359804d6a3310fd1be8a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:38:43 +0100
Subject: [PATCH 0972/2811] Readonly test data

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 597f3b44f98..55390620f2b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -89,10 +89,10 @@ protected function render(string $view): string
 
 class RenderedNavigationMenu
 {
-    protected NavigationHtmlLayoutsTest $test;
-    protected string $html;
-    protected string $type;
-    protected DOMDocument $ast;
+    protected readonly NavigationHtmlLayoutsTest $test;
+    protected readonly string $html;
+    protected readonly string $type;
+    protected readonly DOMDocument $ast;
 
     public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
     {

From 93cc298f357b3a68d780eaaba63ecee71bd5b61c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:40:53 +0100
Subject: [PATCH 0973/2811] Refactor to split out child testing helper classes

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 55390620f2b..59634351a97 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -57,7 +57,7 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(?array $withPages = null): RenderedNavigationMenu
+    protected function menu(?array $withPages = null): RenderedMainNavigationMenu
     {
         if ($withPages) {
             $this->withPages($withPages);
@@ -66,10 +66,10 @@ protected function menu(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::layouts.navigation'), MainNavigationMenu::class);
+        return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
 
-    protected function sidebar(?array $withPages = null): RenderedNavigationMenu
+    protected function sidebar(?array $withPages = null): RenderedDocumentationSidebarMenu
     {
         if ($withPages) {
             $this->withPages($withPages);
@@ -78,7 +78,7 @@ protected function sidebar(?array $withPages = null): RenderedNavigationMenu
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);
 
-        return new RenderedNavigationMenu($this, $this->render('hyde::components.docs.sidebar'), DocumentationSidebar::class);
+        return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
     protected function render(string $view): string
@@ -87,18 +87,18 @@ protected function render(string $view): string
     }
 }
 
-class RenderedNavigationMenu
+abstract class RenderedNavigationMenu
 {
     protected readonly NavigationHtmlLayoutsTest $test;
     protected readonly string $html;
-    protected readonly string $type;
     protected readonly DOMDocument $ast;
 
-    public function __construct(NavigationHtmlLayoutsTest $test, string $html, string $type)
+    protected const TYPE = null;
+
+    public function __construct(NavigationHtmlLayoutsTest $test, string $html)
     {
         $this->test = $test;
         $this->html = $html;
-        $this->type = $type;
 
         $this->ast = $this->parseHtml();
 
@@ -114,7 +114,7 @@ public function assertTrue(): void
     public function dd(bool $writeHtml = true): void
     {
         if ($writeHtml) {
-            file_put_contents(Hyde::path(Str::kebab(class_basename($this->type)).'.html'), $this->html);
+            file_put_contents(Hyde::path(Str::kebab(class_basename(static::TYPE)).'.html'), $this->html);
         }
 
         exit(trim($this->html)."\n\n");
@@ -130,6 +130,16 @@ protected function parseHtml(): DOMDocument
     }
 }
 
+class RenderedMainNavigationMenu extends RenderedNavigationMenu
+{
+    protected const TYPE = MainNavigationMenu::class;
+}
+
+class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
+{
+    protected const TYPE = DocumentationSidebar::class;
+}
+
 class TestKernel extends HydeKernel
 {
     protected ?RouteCollection $mockRoutes = null;

From 03e08c37ef5d4d9c36d71ee1396757046b25816d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:55:38 +0100
Subject: [PATCH 0974/2811] Assert has element identifiers

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 59634351a97..a8fdeac5f7e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,12 +42,12 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $this->menu()->assertTrue();
+        $this->menu()->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $this->sidebar()->assertTrue();
+        $this->sidebar()->assertHasId('sidebar');
     }
 
     protected function withPages(array $pages): static
@@ -110,6 +110,16 @@ public function assertTrue(): void
         $this->test->assertTrue(true);
     }
 
+    public function assertHasId(string $id): static
+    {
+        $node = $this->ast->documentElement;
+
+        $this->test->assertTrue($node->hasAttribute('id'));
+        $this->test->assertSame($id, $node->getAttribute('id'));
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From fc7743605fdaf29d5382098435668ebe822817ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:56:33 +0100
Subject: [PATCH 0975/2811] Introduce local variables

Just want cleaner diffs for now
---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a8fdeac5f7e..f712bd1eae5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,12 +42,14 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $this->menu()->assertHasId('main-navigation');
+        $menu = $this->menu();
+        $menu->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $this->sidebar()->assertHasId('sidebar');
+        $sidebar = $this->sidebar();
+        $sidebar->assertHasId('sidebar');
     }
 
     protected function withPages(array $pages): static

From 6e48b26edf25665ef58799816fca1cc815151804 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 18:57:36 +0100
Subject: [PATCH 0976/2811] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f712bd1eae5..140b1d90e2e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -43,12 +43,14 @@ protected function setUp(): void
     public function testMainNavigationMenu()
     {
         $menu = $this->menu();
+
         $menu->assertHasId('main-navigation');
     }
 
     public function testDocumentationSidebarMenu()
     {
         $sidebar = $this->sidebar();
+
         $sidebar->assertHasId('sidebar');
     }
 

From 9cdce01d825105ae661327729100a1f225667da6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:01:38 +0100
Subject: [PATCH 0977/2811] Remove now unused testing helper

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 140b1d90e2e..16b57d78324 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -109,11 +109,6 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html)
         $this->test->assertNotEmpty($this->html);
     }
 
-    public function assertTrue(): void
-    {
-        $this->test->assertTrue(true);
-    }
-
     public function assertHasId(string $id): static
     {
         $node = $this->ast->documentElement;

From a28f3d018469b7ea16180591bc089bacefce6be3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:02:41 +0100
Subject: [PATCH 0978/2811] Clean up test semantics

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 16b57d78324..b8881353401 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -42,16 +42,16 @@ protected function setUp(): void
 
     public function testMainNavigationMenu()
     {
-        $menu = $this->menu();
-
-        $menu->assertHasId('main-navigation');
+        $this->menu()
+            ->assertHasId('main-navigation')
+            ->finish();
     }
 
     public function testDocumentationSidebarMenu()
     {
-        $sidebar = $this->sidebar();
-
-        $sidebar->assertHasId('sidebar');
+        $this->sidebar()
+            ->assertHasId('sidebar')
+            ->finish();
     }
 
     protected function withPages(array $pages): static
@@ -109,6 +109,11 @@ public function __construct(NavigationHtmlLayoutsTest $test, string $html)
         $this->test->assertNotEmpty($this->html);
     }
 
+    public function finish(): void
+    {
+        // Empty method to provide cleaner diffs when using method chaining.
+    }
+
     public function assertHasId(string $id): static
     {
         $node = $this->ast->documentElement;

From 8a5e878bda9778f4bf1272d7e490d2814dbb1736 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:05:24 +0100
Subject: [PATCH 0979/2811] Assert has elements

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b8881353401..46afbd8c372 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -51,6 +51,9 @@ public function testDocumentationSidebarMenu()
     {
         $this->sidebar()
             ->assertHasId('sidebar')
+            ->assertHasElement('sidebar-header')
+            ->assertHasElement('sidebar-navigation')
+            ->assertHasElement('sidebar-footer')
             ->finish();
     }
 
@@ -124,6 +127,13 @@ public function assertHasId(string $id): static
         return $this;
     }
 
+    public function assertHasElement(string $id): static
+    {
+        $this->test->assertNotNull($this->ast->getElementById($id), 'Element with ID "'.$id.'" not found in the HTML.');
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From abcc389ce197c75a90d38ee5aa0d464a9fb4c62e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:09:03 +0100
Subject: [PATCH 0980/2811] Search for the element in the entire HTML

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 46afbd8c372..be9fec3d8b7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -6,6 +6,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use DOMXPath;
 use Hyde\Hyde;
 use DOMDocument;
 use Hyde\Testing\TestCase;
@@ -129,7 +130,15 @@ public function assertHasId(string $id): static
 
     public function assertHasElement(string $id): static
     {
-        $this->test->assertNotNull($this->ast->getElementById($id), 'Element with ID "'.$id.'" not found in the HTML.');
+        $element = $this->ast->getElementById($id);
+
+        if ($element === null) {
+            // Search for the element in the entire HTML.
+            $xpath = new DOMXPath($this->ast);
+            $element = $xpath->query("//*[@id='$id']")->item(0);
+        }
+
+        $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');
 
         return $this;
     }

From b4aed110d56aafc59741635f6a3f1d0cbe36071b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:12:43 +0100
Subject: [PATCH 0981/2811] Search for elements in class usages

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index be9fec3d8b7..1073f699f57 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -136,6 +136,11 @@ public function assertHasElement(string $id): static
             // Search for the element in the entire HTML.
             $xpath = new DOMXPath($this->ast);
             $element = $xpath->query("//*[@id='$id']")->item(0);
+
+            if ($element === null) {
+                // See if there is an element containing the ID as a class.
+                $element = $xpath->query("//*[contains(concat(' ', normalize-space(@class), ' '), ' $id ')]")->item(0);
+            }
         }
 
         $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');

From 55074a3c3a9fffbd2d6884ac94492ca7b6c11167 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:13:41 +0100
Subject: [PATCH 0982/2811] Assert has more elements

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1073f699f57..9eea5633e02 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -45,6 +45,9 @@ public function testMainNavigationMenu()
     {
         $this->menu()
             ->assertHasId('main-navigation')
+            ->assertHasElement('theme-toggle-button')
+            ->assertHasElement('navigation-toggle-button')
+            ->assertHasElement('main-navigation-links')
             ->finish();
     }
 

From 1420268f0b134da3f15621639fadf941a12c4b9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:18:03 +0100
Subject: [PATCH 0983/2811] Assert has no pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9eea5633e02..f7564cbb26c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,6 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -58,6 +59,7 @@ public function testDocumentationSidebarMenu()
             ->assertHasElement('sidebar-header')
             ->assertHasElement('sidebar-navigation')
             ->assertHasElement('sidebar-footer')
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -151,6 +153,13 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertHasNoPages(): static
+    {
+        $this->test->assertEmpty($this->getRenderedPages());
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -169,6 +178,13 @@ protected function parseHtml(): DOMDocument
 
         return $dom;
     }
+
+    protected function getRenderedPages(): array
+    {
+        // Todo
+
+        return [];
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From ea0cbe0aa150fc6cbe154955d30097c4a48c3946 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:18:43 +0100
Subject: [PATCH 0984/2811] Convert concatenation to string interpolation and
 clean up quotes

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f7564cbb26c..4eaea8a57fb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,7 +148,7 @@ public function assertHasElement(string $id): static
             }
         }
 
-        $this->test->assertNotNull($element, 'Element with ID "'.$id.'" not found in the HTML.');
+        $this->test->assertNotNull($element, "Element with ID '$id' not found in the HTML.");
 
         return $this;
     }

From 9af5c230241734f5b3e4fc2a9486d6405e24818c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:19:30 +0100
Subject: [PATCH 0985/2811] Remove possibly misguiding prefix

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4eaea8a57fb..a555676cfaa 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,7 +148,7 @@ public function assertHasElement(string $id): static
             }
         }
 
-        $this->test->assertNotNull($element, "Element with ID '$id' not found in the HTML.");
+        $this->test->assertNotNull($element, "Element with '$id' not found in the HTML.");
 
         return $this;
     }

From 7aa6c89828e9a8f4d7f6577a674defb755230bda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:22:22 +0100
Subject: [PATCH 0986/2811] Assert has more elements

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a555676cfaa..73b64e8f190 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -57,8 +57,11 @@ public function testDocumentationSidebarMenu()
         $this->sidebar()
             ->assertHasId('sidebar')
             ->assertHasElement('sidebar-header')
+            ->assertHasElement('sidebar-brand')
             ->assertHasElement('sidebar-navigation')
             ->assertHasElement('sidebar-footer')
+            ->assertHasElement('theme-toggle-button')
+            ->assertHasElement('sidebar-items')
             ->assertHasNoPages()
             ->finish();
     }

From 7ea52f4d89f6929499aa793cdfcb762472139ddb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:25:55 +0100
Subject: [PATCH 0987/2811] Get rendered pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 73b64e8f190..ad0b690814d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -182,11 +182,24 @@ protected function parseHtml(): DOMDocument
         return $dom;
     }
 
+    /** @return array<string, string> */
     protected function getRenderedPages(): array
     {
-        // Todo
+        $containerNodeId = static::TYPE === MainNavigationMenu::class ? 'main-navigation-links' : 'sidebar-items';
 
-        return [];
+        $this->assertHasElement($containerNodeId);
+
+        $containerNode = $this->ast->getElementById($containerNodeId);
+
+        $links = $containerNode->getElementsByTagName('a');
+
+        $pages = [];
+
+        foreach ($links as $link) {
+            $pages[$link->getAttribute('href')] = $link->textContent;
+        }
+
+        return $pages;
     }
 }
 

From 594dc2b5fd4c8ff92d475872fb22e4edd1f8e41a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:26:48 +0100
Subject: [PATCH 0988/2811] Assert has page

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ad0b690814d..1d3390dad8f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,7 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertHasNoPages()
+            ->assertHasPages(['index.html' => 'Home'])
             ->finish();
     }
 
@@ -156,6 +156,15 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertHasPages(array $pages): static
+    {
+        $renderedPages = $this->getRenderedPages();
+
+        $this->test->assertEquals($pages, $renderedPages);
+
+        return $this;
+    }
+
     public function assertHasNoPages(): static
     {
         $this->test->assertEmpty($this->getRenderedPages());

From 55b58d39a1c5c9abd9e83be7fe0dbfb2abcc29e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:28:55 +0100
Subject: [PATCH 0989/2811] Assert same

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1d3390dad8f..cd344cc36b0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -160,7 +160,7 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertEquals($pages, $renderedPages);
+        $this->test->assertSame($pages, $renderedPages);
 
         return $this;
     }

From 99dc501769d3d16d652a36210169204a87cdc3ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:31:30 +0100
Subject: [PATCH 0990/2811] Use no pages unless set in test

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cd344cc36b0..86f1e08f074 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -48,7 +48,7 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertHasPages(['index.html' => 'Home'])
+            ->assertHasNoPages()
             ->finish();
     }
 
@@ -73,11 +73,9 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function menu(?array $withPages = null): RenderedMainNavigationMenu
+    protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
-        if ($withPages) {
-            $this->withPages($withPages);
-        }
+        $this->withPages($withPages);
 
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         app()->instance('navigation.main', $menu);
@@ -85,11 +83,9 @@ protected function menu(?array $withPages = null): RenderedMainNavigationMenu
         return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
 
-    protected function sidebar(?array $withPages = null): RenderedDocumentationSidebarMenu
+    protected function sidebar(array $withPages = []): RenderedDocumentationSidebarMenu
     {
-        if ($withPages) {
-            $this->withPages($withPages);
-        }
+        $this->withPages($withPages);
 
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
         app()->instance('navigation.sidebar', $menu);

From f7f4c991c6d67e95cb46c174f69f6ab236467dc3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 19:36:32 +0100
Subject: [PATCH 0991/2811] Test navigation menu with pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 86f1e08f074..7463fefdec5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -9,8 +9,12 @@
 use DOMXPath;
 use Hyde\Hyde;
 use DOMDocument;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\HydeKernel;
 use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
@@ -66,6 +70,27 @@ public function testDocumentationSidebarMenu()
             ->finish();
     }
 
+    public function testNavigationMenuWithPages()
+    {
+        $pages = [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+
+        $this->menu($pages)
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'first.html' => 'First',
+                'about.html' => 'About',
+                'custom.html' => 'Label',
+            ])
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From a11d6b9a71e25eed90c586c1b1e6232f3e6ac8ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:00:24 +0100
Subject: [PATCH 0992/2811] Improve failure diff

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7463fefdec5..72b584d6d7e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -181,7 +181,10 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertSame($pages, $renderedPages);
+        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
+            'expected' => $pages,
+            'rendered' => $renderedPages,
+        ], JSON_PRETTY_PRINT)));
 
         return $this;
     }

From 2436f93245bbbebbbc6d7d707c4d4c882f3df410 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:04:19 +0100
Subject: [PATCH 0993/2811] Add from page wrapper

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 72b584d6d7e..a5f91da954e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -98,6 +98,13 @@ protected function withPages(array $pages): static
         return $this;
     }
 
+    protected function fromPage(string $mockedRoute): static
+    {
+        $this->mockCurrentPage($mockedRoute);
+
+        return $this;
+    }
+
     protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
         $this->withPages($withPages);

From dd52777761bbc7c453d06acf4203f8a94bf1cf2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:04:28 +0100
Subject: [PATCH 0994/2811] Test navigation menu from nested route

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a5f91da954e..7531e57fd7c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -91,6 +91,28 @@ public function testNavigationMenuWithPages()
             ->finish();
     }
 
+    public function testNavigationMenuFromNestedRoute()
+    {
+        $pages = [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+
+        $this->fromPage('nested/page')
+            ->menu($pages)
+            ->assertHasPages([
+                '../index.html' => 'Home',
+                '../first.html' => 'First',
+                '../about.html' => 'About',
+                '../custom.html' => 'Label',
+            ])
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 209b742cf08862cb8e0a6c5d7d140fbba4f4bb58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:09:04 +0100
Subject: [PATCH 0995/2811] Extract helper for repeated array

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7531e57fd7c..540fbc60767 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -72,16 +72,7 @@ public function testDocumentationSidebarMenu()
 
     public function testNavigationMenuWithPages()
     {
-        $pages = [
-            new MarkdownPage('index'),
-            new MarkdownPage('404'),
-            new BladePage('about'),
-            new BladePage('hidden', ['navigation.hidden' => true]),
-            new InMemoryPage('custom', ['navigation.label' => 'Label']),
-            new HtmlPage('first', ['navigation.priority' => 1]),
-        ];
-
-        $this->menu($pages)
+        $this->menu($this->withExamplePages())
             ->assertHasPages([
                 'index.html' => 'Home',
                 'first.html' => 'First',
@@ -93,17 +84,8 @@ public function testNavigationMenuWithPages()
 
     public function testNavigationMenuFromNestedRoute()
     {
-        $pages = [
-            new MarkdownPage('index'),
-            new MarkdownPage('404'),
-            new BladePage('about'),
-            new BladePage('hidden', ['navigation.hidden' => true]),
-            new InMemoryPage('custom', ['navigation.label' => 'Label']),
-            new HtmlPage('first', ['navigation.priority' => 1]),
-        ];
-
         $this->fromPage('nested/page')
-            ->menu($pages)
+            ->menu($this->withExamplePages())
             ->assertHasPages([
                 '../index.html' => 'Home',
                 '../first.html' => 'First',
@@ -151,6 +133,18 @@ protected function render(string $view): string
     {
         return view($view)->render();
     }
+
+    protected function withExamplePages(): array
+    {
+        return [
+            new MarkdownPage('index'),
+            new MarkdownPage('404'),
+            new BladePage('about'),
+            new BladePage('hidden', ['navigation.hidden' => true]),
+            new InMemoryPage('custom', ['navigation.label' => 'Label']),
+            new HtmlPage('first', ['navigation.priority' => 1]),
+        ];
+    }
 }
 
 abstract class RenderedNavigationMenu

From 2c420ce88bf4e176d3bb7466b373834884a68774 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:03 +0100
Subject: [PATCH 0996/2811] Arrow function experiment

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 540fbc60767..c5562887d37 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -97,9 +97,7 @@ public function testNavigationMenuFromNestedRoute()
 
     protected function withPages(array $pages): static
     {
-        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
-
-        return $this;
+        return tap($this, fn () => $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute())));
     }
 
     protected function fromPage(string $mockedRoute): static

From 486ac395d8339ae6024496b44471a618afac6fb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:06 +0100
Subject: [PATCH 0997/2811] Revert "Arrow function experiment"

This reverts commit 2c420ce88bf4e176d3bb7466b373834884a68774.
---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c5562887d37..540fbc60767 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -97,7 +97,9 @@ public function testNavigationMenuFromNestedRoute()
 
     protected function withPages(array $pages): static
     {
-        return tap($this, fn () => $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute())));
+        $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));
+
+        return $this;
     }
 
     protected function fromPage(string $mockedRoute): static

From 9156dedc1e0e4d0073b4e5b9492244dc4e07f756 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:10:46 +0100
Subject: [PATCH 0998/2811] Inline variables

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 540fbc60767..25e648c85bd 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -113,8 +113,7 @@ protected function menu(array $withPages = []): RenderedMainNavigationMenu
     {
         $this->withPages($withPages);
 
-        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        app()->instance('navigation.main', $menu);
+        app()->instance('navigation.main', NavigationMenuGenerator::handle(MainNavigationMenu::class));
 
         return new RenderedMainNavigationMenu($this, $this->render('hyde::layouts.navigation'));
     }
@@ -123,8 +122,7 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
     {
         $this->withPages($withPages);
 
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        app()->instance('navigation.sidebar', $menu);
+        app()->instance('navigation.sidebar', NavigationMenuGenerator::handle(DocumentationSidebar::class));
 
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }

From d2a14cac3b2c03c1b17d91e03bde10f129aae017 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:17:35 +0100
Subject: [PATCH 0999/2811] Add testing helper to use subdirectories as
 dropdowns

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 25e648c85bd..1cc3319b45e 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -127,6 +127,13 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
+    protected function useSubdirectoriesAsDropdowns(): static
+    {
+        config(['hyde.navigation.subdirectories' => 'dropdown']);
+
+        return $this;
+    }
+
     protected function render(string $view): string
     {
         return view($view)->render();

From 37e39bae838ab231db0a83e7baece7b9ddf6af7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:19:50 +0100
Subject: [PATCH 1000/2811] Assert negative element state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1cc3319b45e..ba1cb62acb5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -52,6 +52,8 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
+            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertDoesNotHaveElement('dropdown')
             ->assertHasNoPages()
             ->finish();
     }
@@ -205,6 +207,26 @@ public function assertHasElement(string $id): static
         return $this;
     }
 
+    public function assertDoesNotHaveElement(string $id): static
+    {
+        $element = $this->ast->getElementById($id);
+
+        if ($element === null) {
+            // Search for the element in the entire HTML.
+            $xpath = new DOMXPath($this->ast);
+            $element = $xpath->query("//*[@id='$id']")->item(0);
+
+            if ($element === null) {
+                // See if there is an element containing the ID as a class.
+                $element = $xpath->query("//*[contains(concat(' ', normalize-space(@class), ' '), ' $id ')]")->item(0);
+            }
+        }
+
+        $this->test->assertNull($element, "Element with '$id' found in the HTML.");
+
+        return $this;
+    }
+
     public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();

From dc11ccc06221225a900282e5be1ea1eeee03df9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:22:16 +0100
Subject: [PATCH 1001/2811] Update assertions

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ba1cb62acb5..9611dc2bfe4 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -52,8 +52,9 @@ public function testMainNavigationMenu()
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('navigation-toggle-button')
             ->assertHasElement('main-navigation-links')
-            ->assertDoesNotHaveElement('dropdown-button')
             ->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button')
             ->assertHasNoPages()
             ->finish();
     }

From cfb5aa0de5592bcecef171ff98619072de795ae6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 11 Mar 2024 20:22:25 +0100
Subject: [PATCH 1002/2811] Test navigation menu with dropdown pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9611dc2bfe4..1ecc5467cac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -98,6 +98,25 @@ public function testNavigationMenuFromNestedRoute()
             ->finish();
     }
 
+    public function testNavigationMenuWithDropdownPages()
+    {
+        $this->useSubdirectoriesAsDropdowns()
+           ->menu([
+               new MarkdownPage('index'),
+               new MarkdownPage('foo/bar'),
+               new MarkdownPage('foo/baz'),
+           ])
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertHasElement('dropdown')
+            ->assertHasElement('dropdown-items')
+            ->assertHasElement('dropdown-button')
+            ->finish();
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 60bee64f49e2b464ff1c83111b9acec90b66e4dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:17:28 +0100
Subject: [PATCH 1003/2811] Add high level textual visual testing

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1ecc5467cac..8ea227431f0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -114,6 +114,14 @@ public function testNavigationMenuWithDropdownPages()
             ->assertHasElement('dropdown')
             ->assertHasElement('dropdown-items')
             ->assertHasElement('dropdown-button')
+            ->assertItemsLookLike(<<<'HTML'
+- Home
+- Foo
+    - Bar
+    - Baz
+HTML
+
+            )
             ->finish();
     }
 
@@ -266,6 +274,30 @@ public function assertHasNoPages(): static
         return $this;
     }
 
+    public function assertLooksLike(string $expected, bool $skipHeaderRow = false): static
+    {
+        $actual = $this->makeTextRepresentation();
+
+        if ($skipHeaderRow) {
+            $actual = trim(Str::after($actual, "\n"));
+        }
+        // If expected omitted dashes, remove them from actual
+        if (! str_contains($expected, '- ')) {
+            $actual = str_replace('- ', '', $actual);
+        }
+        // If expected uses 4 spaces, replace with 2 spaces
+        $expected = str_replace('    ', '  ', $expected);
+
+        $this->test->assertSame($expected, $actual, sprintf("Actual HTML does not match expected text:\nExpected:\n%s\nActual:\n%s", $expected, $actual));
+
+        return $this;
+    }
+
+    public function assertItemsLookLike(string $expected): static
+    {
+        return $this->assertLooksLike($expected, true);
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -304,6 +336,39 @@ protected function getRenderedPages(): array
 
         return $pages;
     }
+
+    protected function makeTextRepresentation(): string
+    {
+        $html = str_replace(['<title>Open Menu</title>', '<title>Close Menu</title>'], ['Toggle menu', ''], $this->html);
+        $html = str_replace(['<li', '</li>'], ['<li-keep', '</li-keep>'], $html);
+        $html = str_replace(['<ul', '</ul>'], ['<ul-keep', '</ul-keep>'], $html);
+        $html = strip_tags($html, '<li-keep><ul-keep>');
+        $html = str_replace(['<li-keep', '</li-keep>'], ['<li', '</li>'], $html);
+        $html = str_replace(['<ul-keep', '</ul-keep>'], ['<ul', '</ul>'], $html);
+        $html = preg_replace('/<li[^>]*>/', '<li>', $html);
+        $html = preg_replace('/<ul[^>]*>/', '<ul>', $html);
+        $html = str_replace(['</li>'], '<br>', $html);
+        $html = preg_replace('/\s+/', '', $html);
+        $html = str_replace('<br>', "\n", $html);
+        $html = str_replace('<li>', '- ', $html);
+        $html = Str::replaceFirst('<ul>', "\n", $html);
+
+        // Indent each line within remaining uls
+        $innerUlCount = substr_count($html, '<ul>');
+        foreach (range(1, $innerUlCount) as $i) {
+            $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
+            $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
+            $id = md5($innerUlContent.$i);
+            $html = Str::replaceFirst($innerUlContent, $id, $html);
+            $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
+
+            $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+        }
+
+        $html = Str::replaceLast('</ul>', '', $html);
+
+        return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From 0f9daf5763452b7803ea2565f89710cde863ef28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:20:41 +0100
Subject: [PATCH 1004/2811] Nicer formatting

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8ea227431f0..f4600466b89 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -115,14 +115,12 @@ public function testNavigationMenuWithDropdownPages()
             ->assertHasElement('dropdown-items')
             ->assertHasElement('dropdown-button')
             ->assertItemsLookLike(<<<'HTML'
-- Home
-- Foo
-    - Bar
-    - Baz
-HTML
-
-            )
-            ->finish();
+                - Home
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
     }
 
     protected function withPages(array $pages): static

From 18c322843489639c639de72f426b84b14d2b6c9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:23:00 +0100
Subject: [PATCH 1005/2811] Formatting

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f4600466b89..81398b9bec7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -24,6 +24,25 @@
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
+use function app;
+use function md5;
+use function view;
+use function trim;
+use function range;
+use function config;
+use function collect;
+use function sprintf;
+use function explode;
+use function implode;
+use function array_map;
+use function strip_tags;
+use function json_encode;
+use function str_replace;
+use function preg_replace;
+use function substr_count;
+use function class_basename;
+use function file_put_contents;
+
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
  *
@@ -101,11 +120,11 @@ public function testNavigationMenuFromNestedRoute()
     public function testNavigationMenuWithDropdownPages()
     {
         $this->useSubdirectoriesAsDropdowns()
-           ->menu([
-               new MarkdownPage('index'),
-               new MarkdownPage('foo/bar'),
-               new MarkdownPage('foo/baz'),
-           ])
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',

From 7bb7f15e51371c2bc62e91dfde91a26849f2aa88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:25:44 +0100
Subject: [PATCH 1006/2811] Add conditional

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 81398b9bec7..ea09120fd29 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -372,14 +372,16 @@ protected function makeTextRepresentation(): string
 
         // Indent each line within remaining uls
         $innerUlCount = substr_count($html, '<ul>');
-        foreach (range(1, $innerUlCount) as $i) {
-            $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
-            $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
-            $id = md5($innerUlContent.$i);
-            $html = Str::replaceFirst($innerUlContent, $id, $html);
-            $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
-
-            $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+        if ($innerUlCount >= 1) {
+            foreach (range(1, $innerUlCount) as $i) {
+                $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
+                $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
+                $id = md5($innerUlContent.$i);
+                $html = Str::replaceFirst($innerUlContent, $id, $html);
+                $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
+
+                $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+            }
         }
 
         $html = Str::replaceLast('</ul>', '', $html);

From 8424fc93ea67f60a7942283bf37c1d37de738bd3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:25:53 +0100
Subject: [PATCH 1007/2811] Add visual assertion

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ea09120fd29..27216ae29c7 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -114,7 +114,13 @@ public function testNavigationMenuFromNestedRoute()
                 '../about.html' => 'About',
                 '../custom.html' => 'Label',
             ])
-            ->finish();
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - First
+                - About
+                - Label
+                HTML
+            );
     }
 
     public function testNavigationMenuWithDropdownPages()

From 5e9bcc22d32c9115b3b18b445f6707c3bd795ecb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:29:23 +0100
Subject: [PATCH 1008/2811] Refactor helper to be more generic

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 27216ae29c7..8d283481221 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -125,7 +125,7 @@ public function testNavigationMenuFromNestedRoute()
 
     public function testNavigationMenuWithDropdownPages()
     {
-        $this->useSubdirectoriesAsDropdowns()
+        $this->useSubdirectoryConfig('dropdown')
             ->menu([
                 new MarkdownPage('index'),
                 new MarkdownPage('foo/bar'),
@@ -180,9 +180,9 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
         return new RenderedDocumentationSidebarMenu($this, $this->render('hyde::components.docs.sidebar'));
     }
 
-    protected function useSubdirectoriesAsDropdowns(): static
+    protected function useSubdirectoryConfig(string $option): static
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectories' => $option]);
 
         return $this;
     }

From 9e0d31836ba1fa9694684c2ed8fed6c01edec3c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:31:01 +0100
Subject: [PATCH 1009/2811] Test navigation menu with flat subdirectory pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8d283481221..5c95c16508d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -148,6 +148,30 @@ public function testNavigationMenuWithDropdownPages()
             );
     }
 
+    public function testNavigationMenuWithFlatSubdirectoryPages()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From 6ba350d04462bc56ad0485aca7b3512f18807f24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:33:27 +0100
Subject: [PATCH 1010/2811] Extract fluent assertion helpers

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 5c95c16508d..0b9b2a6ecd5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -136,9 +136,7 @@ public function testNavigationMenuWithDropdownPages()
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertHasElement('dropdown')
-            ->assertHasElement('dropdown-items')
-            ->assertHasElement('dropdown-button')
+            ->assertHasDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Foo
@@ -161,9 +159,7 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertDoesNotHaveElement('dropdown')
-            ->assertDoesNotHaveElement('dropdown-items')
-            ->assertDoesNotHaveElement('dropdown-button')
+            ->assertDoesNotHaveDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Bar
@@ -345,6 +341,20 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
+    public function assertHasDropdowns(): static
+    {
+        return $this->assertHasElement('dropdown')
+            ->assertHasElement('dropdown-items')
+            ->assertHasElement('dropdown-button');
+    }
+
+    public function assertDoesNotHaveDropdowns(): static
+    {
+        return $this->assertDoesNotHaveElement('dropdown')
+            ->assertDoesNotHaveElement('dropdown-items')
+            ->assertDoesNotHaveElement('dropdown-button');
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From 67cec4ae5b94b9ef3efd8ab98de30611abafbe0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:36:58 +0100
Subject: [PATCH 1011/2811] Move up assertions

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 0b9b2a6ecd5..6d7bf81477a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -131,12 +131,12 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
+            ->assertHasDropdowns()
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertHasDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Foo
@@ -154,12 +154,12 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
+            ->assertDoesNotHaveDropdowns()
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
                 'foo/baz.html' => 'Baz',
             ])
-            ->assertDoesNotHaveDropdowns()
             ->assertItemsLookLike(<<<'HTML'
                 - Home
                 - Bar

From 5c14544e83266352946628e0fff93c4cf3197fe5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:38:06 +0100
Subject: [PATCH 1012/2811] Break out method chains in helper

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 6d7bf81477a..86359ab01d9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -343,16 +343,20 @@ public function assertItemsLookLike(string $expected): static
 
     public function assertHasDropdowns(): static
     {
-        return $this->assertHasElement('dropdown')
-            ->assertHasElement('dropdown-items')
-            ->assertHasElement('dropdown-button');
+        $this->assertHasElement('dropdown');
+        $this->assertHasElement('dropdown-items');
+        $this->assertHasElement('dropdown-button');
+
+        return $this;
     }
 
     public function assertDoesNotHaveDropdowns(): static
     {
-        return $this->assertDoesNotHaveElement('dropdown')
-            ->assertDoesNotHaveElement('dropdown-items')
-            ->assertDoesNotHaveElement('dropdown-button');
+        $this->assertDoesNotHaveElement('dropdown');
+        $this->assertDoesNotHaveElement('dropdown-items');
+        $this->assertDoesNotHaveElement('dropdown-button');
+
+        return $this;
     }
 
     #[NoReturn]

From e1f37ee84fe84221908a8eaf7c51aae3e3cd4f25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 10:55:31 +0100
Subject: [PATCH 1013/2811] Add helper to assert the expected dropdown
 structure

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 86359ab01d9..6ae0bff989c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -131,7 +131,7 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
-            ->assertHasDropdowns()
+            ->assertHasDropdowns(['Foo'])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
@@ -341,12 +341,38 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(): static
+    public function assertHasDropdowns(?array $dropdownLabels = null): static
     {
         $this->assertHasElement('dropdown');
         $this->assertHasElement('dropdown-items');
         $this->assertHasElement('dropdown-button');
 
+        if ($dropdownLabels) {
+            // Assert contains only the same count of dropdown labels
+
+            // Get all ul.dropdown-items elements
+            $xpath = new DOMXPath($this->ast);
+            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
+
+            $foundLabels = [];
+
+            foreach ($dropdownItems as $dropdownItem) {
+                // Get the preceding sibling button element
+                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
+
+                // Get the text content of the button (label)
+                $label = $button->textContent;
+
+                // Trim and add the label to the array
+                $foundLabels[] = trim($label);
+            }
+
+            $this->test->assertSame($dropdownLabels, $foundLabels, sprintf('Rendered dropdown labels do not match expected labels: %s', json_encode([
+                'expected' => $dropdownLabels,
+                'rendered' => $foundLabels,
+            ], JSON_PRETTY_PRINT)));
+        }
+
         return $this;
     }
 

From 3c7ce81dc5f1131633ac573232518e2c6296c613 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:01:59 +0100
Subject: [PATCH 1014/2811] Refactor helper and allow expected values

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 6ae0bff989c..bd4a096fa28 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -36,10 +36,13 @@
 use function implode;
 use function array_map;
 use function strip_tags;
+use function array_keys;
 use function json_encode;
 use function str_replace;
 use function preg_replace;
 use function substr_count;
+use function array_filter;
+use function array_values;
 use function class_basename;
 use function file_put_contents;
 
@@ -131,7 +134,7 @@ public function testNavigationMenuWithDropdownPages()
                 new MarkdownPage('foo/bar'),
                 new MarkdownPage('foo/baz'),
             ])
-            ->assertHasDropdowns(['Foo'])
+            ->assertHasDropdowns(['Foo' => ['Bar', 'Baz']])
             ->assertHasPages([
                 'index.html' => 'Home',
                 'foo/bar.html' => 'Bar',
@@ -341,35 +344,44 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(?array $dropdownLabels = null): static
+    public function assertHasDropdowns(?array $expected = null): static
     {
         $this->assertHasElement('dropdown');
         $this->assertHasElement('dropdown-items');
         $this->assertHasElement('dropdown-button');
 
-        if ($dropdownLabels) {
+        if ($expected) {
             // Assert contains only the same count of dropdown labels
 
             // Get all ul.dropdown-items elements
             $xpath = new DOMXPath($this->ast);
             $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
 
-            $foundLabels = [];
+            /** @var array<string, array<string> $actual */
+            $actual = [];
 
             foreach ($dropdownItems as $dropdownItem) {
                 // Get the preceding sibling button element
                 $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
 
                 // Get the text content of the button (label)
-                $label = $button->textContent;
+                $label = trim($button->textContent);
+
+                $innerText = $dropdownItem->textContent;
+                $children = array_values(array_filter(array_map('trim', explode("\n", $innerText))));
 
                 // Trim and add the label to the array
-                $foundLabels[] = trim($label);
+                $actual[$label] = $children;
+            }
+
+            // If expected is a list array then remove values from actual
+            if (array_keys($expected) === range(0, count($expected) - 1)) {
+                $actual = array_keys($actual);
             }
 
-            $this->test->assertSame($dropdownLabels, $foundLabels, sprintf('Rendered dropdown labels do not match expected labels: %s', json_encode([
-                'expected' => $dropdownLabels,
-                'rendered' => $foundLabels,
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
+                'expected' => $expected,
+                'rendered' => $actual,
             ], JSON_PRETTY_PRINT)));
         }
 

From 3aaef2dbec6c8e14f40e664adf03bc0456d001f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:02:29 +0100
Subject: [PATCH 1015/2811] Use simpler array generics comparison

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index bd4a096fa28..1a0afdc7609 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -375,7 +375,7 @@ public function assertHasDropdowns(?array $expected = null): static
             }
 
             // If expected is a list array then remove values from actual
-            if (array_keys($expected) === range(0, count($expected) - 1)) {
+            if (array_values($expected) === $expected) {
                 $actual = array_keys($actual);
             }
 

From d72efe5908f4d572443f64318a94e812093feb88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 11:03:44 +0100
Subject: [PATCH 1016/2811] Clean up testing helper code

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1a0afdc7609..3c9236f4a7d 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -351,9 +351,6 @@ public function assertHasDropdowns(?array $expected = null): static
         $this->assertHasElement('dropdown-button');
 
         if ($expected) {
-            // Assert contains only the same count of dropdown labels
-
-            // Get all ul.dropdown-items elements
             $xpath = new DOMXPath($this->ast);
             $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
 
@@ -361,20 +358,16 @@ public function assertHasDropdowns(?array $expected = null): static
             $actual = [];
 
             foreach ($dropdownItems as $dropdownItem) {
-                // Get the preceding sibling button element
                 $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
 
-                // Get the text content of the button (label)
                 $label = trim($button->textContent);
 
-                $innerText = $dropdownItem->textContent;
-                $children = array_values(array_filter(array_map('trim', explode("\n", $innerText))));
+                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
 
-                // Trim and add the label to the array
                 $actual[$label] = $children;
             }
 
-            // If expected is a list array then remove values from actual
+            // If expected is a list array, then remove values from actual
             if (array_values($expected) === $expected) {
                 $actual = array_keys($actual);
             }

From b5e99c8b05030c4fef76f0212d1d7ef84833809c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:02:48 +0100
Subject: [PATCH 1017/2811] Clean up test code

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 3c9236f4a7d..f58692eadc0 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -445,17 +445,17 @@ protected function makeTextRepresentation(): string
         $html = str_replace('<li>', '- ', $html);
         $html = Str::replaceFirst('<ul>', "\n", $html);
 
-        // Indent each line within remaining uls
         $innerUlCount = substr_count($html, '<ul>');
         if ($innerUlCount >= 1) {
-            foreach (range(1, $innerUlCount) as $i) {
+            // Indent each line within the remaining UL elements
+            foreach (range(1, $innerUlCount) as $item) {
                 $html = Str::replaceFirst('</ul>', '</ul-first>', $html);
                 $innerUlContent = Str::between($html, '<ul>', '</ul-first>');
-                $id = md5($innerUlContent.$i);
+                $id = md5("$innerUlContent-$item");
                 $html = Str::replaceFirst($innerUlContent, $id, $html);
                 $innerUlContent = trim(str_replace("\n", "\n  ", $innerUlContent));
 
-                $html = str_replace('<ul>'.$id.'</ul-first>', "\n  ".$innerUlContent, $html);
+                $html = str_replace("<ul>$id</ul-first>", "\n  $innerUlContent", $html);
             }
         }
 

From a9370d605bd59a3c85a2faf328242d07fc258ef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:18:39 +0100
Subject: [PATCH 1018/2811] Test navigation menu with hidden subdirectory pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index f58692eadc0..39b8d4afbff 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -171,6 +171,24 @@ public function testNavigationMenuWithFlatSubdirectoryPages()
             );
     }
 
+    public function testNavigationMenuWithHiddenSubdirectoryPages()
+    {
+        $this->useSubdirectoryConfig('hidden')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                HTML
+            );
+    }
+
     protected function withPages(array $pages): static
     {
         $this->kernel->setRoutes(collect($pages)->map(fn (HydePage $page) => $page->getRoute()));

From bd7a583b42fc50eeb4f96487bfdb9eb6a9697875 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 12:19:00 +0100
Subject: [PATCH 1019/2811] Convert to string literal

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 39b8d4afbff..ee8bb704682 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -183,10 +183,7 @@ public function testNavigationMenuWithHiddenSubdirectoryPages()
             ->assertHasPages([
                 'index.html' => 'Home',
             ])
-            ->assertItemsLookLike(<<<'HTML'
-                - Home
-                HTML
-            );
+            ->assertItemsLookLike('- Home');
     }
 
     protected function withPages(array $pages): static

From 8dbd62277ae3cef7d2e966d513ce2e0096af9572 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:38:51 +0100
Subject: [PATCH 1020/2811] Add edge case tests

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 155 ++++++++++++++++++
 1 file changed, 155 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ee8bb704682..d309c22a84a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -193,6 +193,161 @@ protected function withPages(array $pages): static
         return $this;
     }
 
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryIndexPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithFlatSubdirectoryPagesAndMatchingSubdirectoryAndIndexPage()
+    {
+        $this->useSubdirectoryConfig('flat')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertDoesNotHaveDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo.html' => 'Foo',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryIndexPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
+    public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdirectoryAndIndexPage()
+    {
+        $this->useSubdirectoryConfig('dropdown')
+            ->menu([
+                new MarkdownPage('index'),
+                new MarkdownPage('foo'),
+                new MarkdownPage('foo/index'),
+                new MarkdownPage('foo/bar'),
+                new MarkdownPage('foo/baz'),
+            ])
+            ->assertHasDropdowns()
+            ->assertHasPages([
+                'index.html' => 'Home',
+                'foo/index.html' => 'Foo',
+                'foo/bar.html' => 'Bar',
+                'foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Home
+                - Foo
+                    - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From f646820b28bd91f4716f35410fdc87f734f1959d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:41:25 +0100
Subject: [PATCH 1021/2811] Clean up test endings

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d309c22a84a..ee6cf6ca667 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -77,8 +77,7 @@ public function testMainNavigationMenu()
             ->assertDoesNotHaveElement('dropdown')
             ->assertDoesNotHaveElement('dropdown-items')
             ->assertDoesNotHaveElement('dropdown-button')
-            ->assertHasNoPages()
-            ->finish();
+            ->assertHasNoPages();
     }
 
     public function testDocumentationSidebarMenu()
@@ -91,8 +90,7 @@ public function testDocumentationSidebarMenu()
             ->assertHasElement('sidebar-footer')
             ->assertHasElement('theme-toggle-button')
             ->assertHasElement('sidebar-items')
-            ->assertHasNoPages()
-            ->finish();
+            ->assertHasNoPages();
     }
 
     public function testNavigationMenuWithPages()
@@ -103,8 +101,7 @@ public function testNavigationMenuWithPages()
                 'first.html' => 'First',
                 'about.html' => 'About',
                 'custom.html' => 'Label',
-            ])
-            ->finish();
+            ]);
     }
 
     public function testNavigationMenuFromNestedRoute()

From 06d282abace8e58e8a4339e2f54d017ea933c20b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:46:13 +0100
Subject: [PATCH 1022/2811] Unescape slashes for testing dump

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index ee6cf6ca667..8f7e783754c 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -475,7 +475,7 @@ public function assertHasPages(array $pages): static
         $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
             'expected' => $pages,
             'rendered' => $renderedPages,
-        ], JSON_PRETTY_PRINT)));
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
 
         return $this;
     }
@@ -542,7 +542,7 @@ public function assertHasDropdowns(?array $expected = null): static
             $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
                 'expected' => $expected,
                 'rendered' => $actual,
-            ], JSON_PRETTY_PRINT)));
+            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
         }
 
         return $this;

From 5c74c657f4d97ff71e6f29709edf371a9aa802d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:47:54 +0100
Subject: [PATCH 1023/2811] Trim text content

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 8f7e783754c..71425de59d9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -590,7 +590,7 @@ protected function getRenderedPages(): array
         $pages = [];
 
         foreach ($links as $link) {
-            $pages[$link->getAttribute('href')] = $link->textContent;
+            $pages[$link->getAttribute('href')] = trim($link->textContent);
         }
 
         return $pages;

From 293d0ddc0226266a3cf1de31b7e7a0ce0f2c5c79 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:50:15 +0100
Subject: [PATCH 1024/2811] Extract helper to print serialized array

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 71425de59d9..1212fb151e5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -472,10 +472,10 @@ public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();
 
-        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', json_encode([
+        $this->test->assertSame($pages, $renderedPages, sprintf('Rendered pages do not match expected pages: %s', $this->printSerializedArray([
             'expected' => $pages,
             'rendered' => $renderedPages,
-        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
+        ])));
 
         return $this;
     }
@@ -539,10 +539,10 @@ public function assertHasDropdowns(?array $expected = null): static
                 $actual = array_keys($actual);
             }
 
-            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', json_encode([
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
                 'expected' => $expected,
                 'rendered' => $actual,
-            ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)));
+            ])));
         }
 
         return $this;
@@ -630,6 +630,11 @@ protected function makeTextRepresentation(): string
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
+
+    protected function printSerializedArray(array $data): string|false
+    {
+        return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
 }
 
 class RenderedMainNavigationMenu extends RenderedNavigationMenu

From 22bab9a6d622b90768245320c35bd173679113a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:57:13 +0100
Subject: [PATCH 1025/2811] Convert JSON to PHP array syntax

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1212fb151e5..3bdfece36fe 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -633,7 +633,19 @@ protected function makeTextRepresentation(): string
 
     protected function printSerializedArray(array $data): string|false
     {
-        return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+        $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+
+        // Convert JSON to PHP array syntax
+
+        $string = str_replace(['{', '}'], ['[', ']'], $string);
+        $string = str_replace('": "', "' => '", $string);
+        $string = str_replace('": [', "' => [", $string);
+        $string = str_replace('"', "'", $string);
+        $string = str_replace("'\n", "',\n", $string);
+        $string = str_replace(']', '],', $string);
+        $string = str_replace(',,', ',', $string);
+
+        return rtrim($string, ',');
     }
 }
 

From 2f6f1c43d378cae1e1c47fd7f2a99ce8ec66e8a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:30 +0100
Subject: [PATCH 1026/2811] Fix return type

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 3bdfece36fe..d9c30f34d7a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -631,7 +631,7 @@ protected function makeTextRepresentation(): string
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
 
-    protected function printSerializedArray(array $data): string|false
+    protected function printSerializedArray(array $data): string
     {
         $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 

From 62b119f2e2dda6a43919b427b7992a825b5c629f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:43 +0100
Subject: [PATCH 1027/2811] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d9c30f34d7a..1e462acbea8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -636,7 +636,6 @@ protected function printSerializedArray(array $data): string
         $string = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 
         // Convert JSON to PHP array syntax
-
         $string = str_replace(['{', '}'], ['[', ']'], $string);
         $string = str_replace('": "', "' => '", $string);
         $string = str_replace('": [', "' => [", $string);

From fbe47bb18258312e757402c152d6b8d34326913b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 13:59:51 +0100
Subject: [PATCH 1028/2811] Formatting

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1e462acbea8..49ed52cf589 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -29,6 +29,7 @@
 use function view;
 use function trim;
 use function range;
+use function rtrim;
 use function config;
 use function collect;
 use function sprintf;

From 7553c7cef1c5d6c2e1b413d18309b88fa119b6fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:07:53 +0100
Subject: [PATCH 1029/2811] Strip documentation footer with header row

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 49ed52cf589..75f9471fbbf 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -494,6 +494,9 @@ public function assertLooksLike(string $expected, bool $skipHeaderRow = false):
 
         if ($skipHeaderRow) {
             $actual = trim(Str::after($actual, "\n"));
+            if (str_contains($actual, 'Backtohomepage')) {
+                $actual = trim(str_replace('Backtohomepage', '', $actual));
+            }
         }
         // If expected omitted dashes, remove them from actual
         if (! str_contains($expected, '- ')) {

From 21de28ae57161f52c56f44cc7d7f8485324fbbce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:40:10 +0100
Subject: [PATCH 1030/2811] Update helper to better handle sidebars

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 75f9471fbbf..424f0c5d576 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -494,8 +494,8 @@ public function assertLooksLike(string $expected, bool $skipHeaderRow = false):
 
         if ($skipHeaderRow) {
             $actual = trim(Str::after($actual, "\n"));
-            if (str_contains($actual, 'Backtohomepage')) {
-                $actual = trim(str_replace('Backtohomepage', '', $actual));
+            if (str_contains($actual, 'Back to home page')) {
+                $actual = trim(str_replace('Back to home page', '', $actual));
             }
         }
         // If expected omitted dashes, remove them from actual
@@ -632,6 +632,8 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
+        $html = str_replace(['HydePHPDocs', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }
 

From dbe1eb99b42bafa6685cc846f381baf27f703ce9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 14:41:43 +0100
Subject: [PATCH 1031/2811] Add more sidebar tests

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 424f0c5d576..b114709b690 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -18,6 +18,7 @@
 use Hyde\Foundation\HydeKernel;
 use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
@@ -346,6 +347,49 @@ public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdir
             );
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ])
+        ->assertHasPages([
+            'docs/foo.html' => 'Foo',
+            'docs/bar.html' => 'Bar',
+            'docs/baz.html' => 'Baz',
+        ])
+        ->assertItemsLookLike(<<<'HTML'
+            Foo
+            Bar
+            Baz
+            HTML
+        );
+    }
+
+    public function testSidebarFromNestedRoute()
+    {
+        $this->fromPage('nested/page')
+            ->sidebar([
+                new DocumentationPage('index'),
+                new DocumentationPage('foo'),
+                new DocumentationPage('bar'),
+                new DocumentationPage('baz'),
+            ])
+            ->assertHasPages([
+                '../docs/foo.html' => 'Foo',
+                '../docs/bar.html' => 'Bar',
+                '../docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From 47d37f039b6ef9cdde86ec710204fdbcb9223d14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:00:17 +0100
Subject: [PATCH 1032/2811] Move specialized assertions to test child class

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b114709b690..cc629e468ac 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -559,52 +559,6 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
-    public function assertHasDropdowns(?array $expected = null): static
-    {
-        $this->assertHasElement('dropdown');
-        $this->assertHasElement('dropdown-items');
-        $this->assertHasElement('dropdown-button');
-
-        if ($expected) {
-            $xpath = new DOMXPath($this->ast);
-            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
-
-            /** @var array<string, array<string> $actual */
-            $actual = [];
-
-            foreach ($dropdownItems as $dropdownItem) {
-                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
-
-                $label = trim($button->textContent);
-
-                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
-
-                $actual[$label] = $children;
-            }
-
-            // If expected is a list array, then remove values from actual
-            if (array_values($expected) === $expected) {
-                $actual = array_keys($actual);
-            }
-
-            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
-                'expected' => $expected,
-                'rendered' => $actual,
-            ])));
-        }
-
-        return $this;
-    }
-
-    public function assertDoesNotHaveDropdowns(): static
-    {
-        $this->assertDoesNotHaveElement('dropdown');
-        $this->assertDoesNotHaveElement('dropdown-items');
-        $this->assertDoesNotHaveElement('dropdown-button');
-
-        return $this;
-    }
-
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {
@@ -701,6 +655,52 @@ protected function printSerializedArray(array $data): string
 class RenderedMainNavigationMenu extends RenderedNavigationMenu
 {
     protected const TYPE = MainNavigationMenu::class;
+
+    public function assertHasDropdowns(?array $expected = null): static
+    {
+        $this->assertHasElement('dropdown');
+        $this->assertHasElement('dropdown-items');
+        $this->assertHasElement('dropdown-button');
+
+        if ($expected) {
+            $xpath = new DOMXPath($this->ast);
+            $dropdownItems = $xpath->query('//ul[contains(concat(" ", normalize-space(@class), " "), " dropdown-items ")]');
+
+            /** @var array<string, array<string> $actual */
+            $actual = [];
+
+            foreach ($dropdownItems as $dropdownItem) {
+                $button = $xpath->query('../preceding-sibling::button', $dropdownItem)->item(0);
+
+                $label = trim($button->textContent);
+
+                $children = array_values(array_filter(array_map('trim', explode("\n", $dropdownItem->textContent))));
+
+                $actual[$label] = $children;
+            }
+
+            // If expected is a list array, then remove values from actual
+            if (array_values($expected) === $expected) {
+                $actual = array_keys($actual);
+            }
+
+            $this->test->assertSame($expected, $actual, sprintf('Rendered dropdown does not match expected format: %s', $this->printSerializedArray([
+                'expected' => $expected,
+                'rendered' => $actual,
+            ])));
+        }
+
+        return $this;
+    }
+
+    public function assertDoesNotHaveDropdowns(): static
+    {
+        $this->assertDoesNotHaveElement('dropdown');
+        $this->assertDoesNotHaveElement('dropdown-items');
+        $this->assertDoesNotHaveElement('dropdown-button');
+
+        return $this;
+    }
 }
 
 class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu

From 4427d63dc8ab199b862152b58cb607670ba79d55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:05:12 +0100
Subject: [PATCH 1033/2811] Test sidebar with grouped pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cc629e468ac..bf90b7980bd 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -390,6 +390,26 @@ public function testSidebarFromNestedRoute()
             );
     }
 
+    public function testSidebarWithGroupedPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz'),
+        ])
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                    - Bar
+                    - Baz
+                HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -706,6 +726,28 @@ public function assertDoesNotHaveDropdowns(): static
 class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
 {
     protected const TYPE = DocumentationSidebar::class;
+
+    public function assertHasGroups(): static
+    {
+        $this->assertHasElement('sidebar-group');
+        $this->assertHasElement('sidebar-group-items');
+        $this->assertHasElement('sidebar-group-heading');
+        $this->assertHasElement('sidebar-group-header');
+        $this->assertHasElement('sidebar-group-toggle');
+
+        return $this;
+    }
+
+    public function assertHasNoGroups(): static
+    {
+        $this->assertDoesNotHaveElement('sidebar-group');
+        $this->assertDoesNotHaveElement('sidebar-group-items');
+        $this->assertDoesNotHaveElement('sidebar-group-heading');
+        $this->assertDoesNotHaveElement('sidebar-group-header');
+        $this->assertDoesNotHaveElement('sidebar-group-toggle');
+
+        return $this;
+    }
 }
 
 class TestKernel extends HydeKernel

From fcb0e1481d0439ce4468adf5a0127ccce8abb648 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:06:34 +0100
Subject: [PATCH 1034/2811] Formatting

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index bf90b7980bd..d55ace4c6bb 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -397,17 +397,17 @@ public function testSidebarWithGroupedPages()
             new DocumentationPage('foo/bar'),
             new DocumentationPage('foo/baz'),
         ])
-            ->assertHasGroups()
-            ->assertHasPages([
-                'docs/bar.html' => 'Bar',
-                'docs/baz.html' => 'Baz',
-            ])
-            ->assertItemsLookLike(<<<'HTML'
-                - Foo
-                    - Bar
-                    - Baz
-                HTML
-            );
+        ->assertHasGroups()
+        ->assertHasPages([
+            'docs/bar.html' => 'Bar',
+            'docs/baz.html' => 'Baz',
+        ])
+        ->assertItemsLookLike(<<<'HTML'
+            - Foo
+                - Bar
+                - Baz
+            HTML
+        );
     }
 
     protected function fromPage(string $mockedRoute): static

From 69453a64a14695f3aed11fab681de8185364146f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:08:02 +0100
Subject: [PATCH 1035/2811] Test sidebar with grouped pages without flattened
 output paths

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index d55ace4c6bb..2eea236c674 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -410,6 +410,27 @@ public function testSidebarWithGroupedPages()
         );
     }
 
+    public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
+    {
+        $this->withoutFlattenedOutputPaths()
+            ->sidebar([
+                new DocumentationPage('index'),
+                new DocumentationPage('foo/bar'),
+                new DocumentationPage('foo/baz'),
+            ])
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/foo/bar.html' => 'Bar',
+                'docs/foo/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+            - Foo
+                - Bar
+                - Baz
+            HTML
+            );
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -442,6 +463,13 @@ protected function useSubdirectoryConfig(string $option): static
         return $this;
     }
 
+    protected function withoutFlattenedOutputPaths(): static
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        return $this;
+    }
+
     protected function render(string $view): string
     {
         return view($view)->render();

From 28786ecfab7348420b918079f91dcae6b107020d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 15:34:11 +0100
Subject: [PATCH 1036/2811] Remove extra space from code

---
 .../resources/views/components/docs/sidebar-brand.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
index e150f86e133..e56ce6b88b7 100644
--- a/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-brand.blade.php
@@ -2,7 +2,7 @@
     <strong class="px-2">
         @if(DocumentationPage::home())
             <a href="{{ DocumentationPage::home() }}">
-                {{  $sidebar->getHeader() }}
+                {{ $sidebar->getHeader() }}
             </a>
         @else
             {{ $sidebar->getHeader() }}

From 167b4d3def2c8619422b240fd58e22ce38c6d409 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:18:09 +0100
Subject: [PATCH 1037/2811] Add helper to assert element text state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 2eea236c674..04b1bc495d6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -8,6 +8,7 @@
 
 use DOMXPath;
 use Hyde\Hyde;
+use DOMElement;
 use DOMDocument;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
@@ -37,6 +38,7 @@
 use function explode;
 use function implode;
 use function array_map;
+use function is_string;
 use function strip_tags;
 use function array_keys;
 use function json_encode;
@@ -561,6 +563,19 @@ public function assertDoesNotHaveElement(string $id): static
         return $this;
     }
 
+    public function assertElementTextIs(DOMElement|string $element, string $expected): static
+    {
+        if (is_string($element)) {
+            $this->assertHasElement($element);
+
+            $element = $this->ast->getElementById($element);
+        }
+
+        $this->test->assertSame($expected, trim($element->textContent));
+
+        return $this;
+    }
+
     public function assertHasPages(array $pages): static
     {
         $renderedPages = $this->getRenderedPages();

From e539081e874903957136aaa270f5c7d19b66ecd6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:28:11 +0100
Subject: [PATCH 1038/2811] Add an element ID for the main navigation menu
 brand

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 600d310fbd6..b04ccc9df87 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -3,7 +3,7 @@
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation" class="flex flex-wrap items-center justify-between p-4 shadow-lg sm:shadow-xl md:shadow-none dark:bg-gray-800">
-    <div class="flex flex-grow items-center flex-shrink-0 text-gray-700 dark:text-gray-200">
+    <div id="main-navigation-brand" class="flex flex-grow items-center flex-shrink-0 text-gray-700 dark:text-gray-200">
         @include('hyde::components.navigation.navigation-brand')
 
         <div class="ml-auto">

From 7b3192d6905464a5f743b7a6d851d081b0b52a93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 19:31:40 +0100
Subject: [PATCH 1039/2811] Test header states

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 04b1bc495d6..a04b1ce80e6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -433,6 +433,16 @@ public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
             );
     }
 
+    public function testMenuHeader()
+    {
+        $this->menu()->assertHeaderIs('HydePHP');
+    }
+
+    public function testSidebarHeader()
+    {
+        $this->sidebar()->assertHeaderIs('HydePHP Docs');
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);
@@ -622,6 +632,27 @@ public function assertItemsLookLike(string $expected): static
         return $this->assertLooksLike($expected, true);
     }
 
+    public function assertHeaderIs(string $expected): static
+    {
+        if (static::TYPE === DocumentationSidebar::class) {
+            $elementId = 'sidebar-brand';
+            $nodeName = 'strong';
+        } else {
+            $elementId = 'main-navigation-brand';
+            $nodeName = 'a';
+        }
+
+        $this->assertHasElement($elementId);
+
+        $element = $this->ast->getElementById($elementId)->getElementsByTagName($nodeName)->item(0);
+
+        $this->test->assertNotNull($element, "No <$nodeName> element found in menu header");
+
+        $this->assertElementTextIs($element, $expected);
+
+        return $this;
+    }
+
     #[NoReturn]
     public function dd(bool $writeHtml = true): void
     {

From 60464546ef4b4f485c7a5d977f43f2e2ca418305 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:55:50 +0100
Subject: [PATCH 1040/2811] Test custom brands

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a04b1ce80e6..11fdfee12c2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -11,6 +11,7 @@
 use DOMElement;
 use DOMDocument;
 use Hyde\Pages\HtmlPage;
+use Hyde\Facades\Config;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Str;
@@ -443,6 +444,20 @@ public function testSidebarHeader()
         $this->sidebar()->assertHeaderIs('HydePHP Docs');
     }
 
+    public function testCustomMenuHeader()
+    {
+        Config::set('hyde.name', 'Example');
+
+        $this->menu()->assertHeaderIs('Example');
+    }
+
+    public function testCustomSidebarHeader()
+    {
+        Config::set('docs.sidebar.header', 'Documentation');
+
+        $this->sidebar()->assertHeaderIs('Documentation');
+    }
+
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From e07c0d4b03cffa37ea1d1e4d2ede39ec99ac8980 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:56:55 +0100
Subject: [PATCH 1041/2811] Extract helper method

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 11fdfee12c2..1e360956527 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -358,17 +358,17 @@ public function testSidebarWithPages()
             new DocumentationPage('bar'),
             new DocumentationPage('baz'),
         ])
-        ->assertHasPages([
-            'docs/foo.html' => 'Foo',
-            'docs/bar.html' => 'Bar',
-            'docs/baz.html' => 'Baz',
-        ])
-        ->assertItemsLookLike(<<<'HTML'
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
             Foo
             Bar
             Baz
             HTML
-        );
+            );
     }
 
     public function testSidebarFromNestedRoute()
@@ -395,32 +395,24 @@ public function testSidebarFromNestedRoute()
 
     public function testSidebarWithGroupedPages()
     {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo/bar'),
-            new DocumentationPage('foo/baz'),
-        ])
-        ->assertHasGroups()
-        ->assertHasPages([
-            'docs/bar.html' => 'Bar',
-            'docs/baz.html' => 'Baz',
-        ])
-        ->assertItemsLookLike(<<<'HTML'
+        $this->sidebar($this->withSidebarPages())
+            ->assertHasGroups()
+            ->assertHasPages([
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
             - Foo
                 - Bar
                 - Baz
             HTML
-        );
+            );
     }
 
     public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
     {
         $this->withoutFlattenedOutputPaths()
-            ->sidebar([
-                new DocumentationPage('index'),
-                new DocumentationPage('foo/bar'),
-                new DocumentationPage('foo/baz'),
-            ])
+            ->sidebar($this->withSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/foo/bar.html' => 'Bar',
@@ -513,6 +505,15 @@ protected function withExamplePages(): array
             new HtmlPage('first', ['navigation.priority' => 1]),
         ];
     }
+
+    protected function withSidebarPages(): array
+    {
+        return [
+            new DocumentationPage('index'),
+            new DocumentationPage('foo/bar'),
+            new DocumentationPage('foo/baz'),
+        ];
+    }
 }
 
 abstract class RenderedNavigationMenu

From 93ab7ee3a8f0cd016f9c074ed885487f5d87a0d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:58:14 +0100
Subject: [PATCH 1042/2811] Reorder tests to move up baseline assertions

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 1e360956527..e0bf64c9fd5 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -109,6 +109,51 @@ public function testNavigationMenuWithPages()
             ]);
     }
 
+    public function testSidebarWithPages()
+    {
+        $this->sidebar([
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ])
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+            Foo
+            Bar
+            Baz
+            HTML
+            );
+    }
+
+    public function testMenuHeader()
+    {
+        $this->menu()->assertHeaderIs('HydePHP');
+    }
+
+    public function testSidebarHeader()
+    {
+        $this->sidebar()->assertHeaderIs('HydePHP Docs');
+    }
+
+    public function testCustomMenuHeader()
+    {
+        Config::set('hyde.name', 'Example');
+
+        $this->menu()->assertHeaderIs('Example');
+    }
+
+    public function testCustomSidebarHeader()
+    {
+        Config::set('docs.sidebar.header', 'Documentation');
+
+        $this->sidebar()->assertHeaderIs('Documentation');
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -350,27 +395,6 @@ public function testNavigationMenuWithDropdownSubdirectoryPagesAndMatchingSubdir
             );
     }
 
-    public function testSidebarWithPages()
-    {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo'),
-            new DocumentationPage('bar'),
-            new DocumentationPage('baz'),
-        ])
-            ->assertHasPages([
-                'docs/foo.html' => 'Foo',
-                'docs/bar.html' => 'Bar',
-                'docs/baz.html' => 'Baz',
-            ])
-            ->assertItemsLookLike(<<<'HTML'
-            Foo
-            Bar
-            Baz
-            HTML
-            );
-    }
-
     public function testSidebarFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -426,30 +450,6 @@ public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
             );
     }
 
-    public function testMenuHeader()
-    {
-        $this->menu()->assertHeaderIs('HydePHP');
-    }
-
-    public function testSidebarHeader()
-    {
-        $this->sidebar()->assertHeaderIs('HydePHP Docs');
-    }
-
-    public function testCustomMenuHeader()
-    {
-        Config::set('hyde.name', 'Example');
-
-        $this->menu()->assertHeaderIs('Example');
-    }
-
-    public function testCustomSidebarHeader()
-    {
-        Config::set('docs.sidebar.header', 'Documentation');
-
-        $this->sidebar()->assertHeaderIs('Documentation');
-    }
-
     protected function fromPage(string $mockedRoute): static
     {
         $this->mockCurrentPage($mockedRoute);

From f3df5375b1ec1c63392a1c7961a47d0f4c434fd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:59:07 +0100
Subject: [PATCH 1043/2811] Rename testing helper to match usage

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index e0bf64c9fd5..7f514191f0a 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -419,7 +419,7 @@ public function testSidebarFromNestedRoute()
 
     public function testSidebarWithGroupedPages()
     {
-        $this->sidebar($this->withSidebarPages())
+        $this->sidebar($this->withGroupedSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/bar.html' => 'Bar',
@@ -436,7 +436,7 @@ public function testSidebarWithGroupedPages()
     public function testSidebarWithGroupedPagesWithoutFlattenedOutputPaths()
     {
         $this->withoutFlattenedOutputPaths()
-            ->sidebar($this->withSidebarPages())
+            ->sidebar($this->withGroupedSidebarPages())
             ->assertHasGroups()
             ->assertHasPages([
                 'docs/foo/bar.html' => 'Bar',
@@ -506,7 +506,7 @@ protected function withExamplePages(): array
         ];
     }
 
-    protected function withSidebarPages(): array
+    protected function withGroupedSidebarPages(): array
     {
         return [
             new DocumentationPage('index'),

From 2f0e1ad4a6ff464a60f04444e91dfc768315a6b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 20:59:48 +0100
Subject: [PATCH 1044/2811] Extract new testing helper

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 7f514191f0a..9d241a3cd3b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -111,12 +111,7 @@ public function testNavigationMenuWithPages()
 
     public function testSidebarWithPages()
     {
-        $this->sidebar([
-            new DocumentationPage('index'),
-            new DocumentationPage('foo'),
-            new DocumentationPage('bar'),
-            new DocumentationPage('baz'),
-        ])
+        $this->sidebar($this->withSidebarPages())
             ->assertHasPages([
                 'docs/foo.html' => 'Foo',
                 'docs/bar.html' => 'Bar',
@@ -506,6 +501,16 @@ protected function withExamplePages(): array
         ];
     }
 
+    protected function withSidebarPages(): array
+    {
+        return [
+            new DocumentationPage('index'),
+            new DocumentationPage('foo'),
+            new DocumentationPage('bar'),
+            new DocumentationPage('baz'),
+        ];
+    }
+
     protected function withGroupedSidebarPages(): array
     {
         return [

From 7170be2fdaeeb4647fb22788e31d05fa65fb739e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:00:16 +0100
Subject: [PATCH 1045/2811] Format string syntax

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 9d241a3cd3b..c69bb6cfe48 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -118,10 +118,10 @@ public function testSidebarWithPages()
                 'docs/baz.html' => 'Baz',
             ])
             ->assertItemsLookLike(<<<'HTML'
-            Foo
-            Bar
-            Baz
-            HTML
+                Foo
+                Bar
+                Baz
+                HTML
             );
     }
 

From c6c7351de930e2599af48f56cf4d73c98372ef72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:07:49 +0100
Subject: [PATCH 1046/2811] Add replacement for another test quirk

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c69bb6cfe48..da08e313b53 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -745,7 +745,7 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
-        $html = str_replace(['HydePHPDocs', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+        $html = str_replace(['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }

From d2956930e4ce1dbeca1160537b0a13725de2fb61 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:01 +0100
Subject: [PATCH 1047/2811] Assert on full menu state

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index da08e313b53..c23eaa8474f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -117,10 +117,12 @@ public function testSidebarWithPages()
                 'docs/bar.html' => 'Bar',
                 'docs/baz.html' => 'Baz',
             ])
-            ->assertItemsLookLike(<<<'HTML'
+            ->assertLooksLike(<<<'HTML'
+                HydePHP Docs Toggle theme
                 Foo
                 Bar
                 Baz
+                Back to home page
                 HTML
             );
     }

From a991d8b26beb27fe2067153370b1070c4df5d141 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:07 +0100
Subject: [PATCH 1048/2811] Add menu state assertion

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index c23eaa8474f..34315d4aca8 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -106,7 +106,15 @@ public function testNavigationMenuWithPages()
                 'first.html' => 'First',
                 'about.html' => 'About',
                 'custom.html' => 'Label',
-            ]);
+            ])
+            ->assertLooksLike(<<<'HTML'
+                HydePHP Toggle theme Toggle menu
+                - Home
+                - First
+                - About
+                - Label
+                HTML
+            );
     }
 
     public function testSidebarWithPages()

From a8d8c46f424736c99fb82fdcb30d48306d37b7b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:08:37 +0100
Subject: [PATCH 1049/2811] Split comma-separated values into multiple lines

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 34315d4aca8..0628d7fa79b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -755,7 +755,11 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
-        $html = str_replace(['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'], ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'], $html);
+        $html = str_replace(
+            ['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'],
+            ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'],
+            $html
+        );
 
         return trim(implode("\n", array_map('rtrim', explode("\n", $html))));
     }

From 68077c260a19babe09daf84df210f17aef5f5da9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:10:51 +0100
Subject: [PATCH 1050/2811] Supress spell check inspection for statement

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 0628d7fa79b..fe5edf60dd9 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -755,6 +755,7 @@ protected function makeTextRepresentation(): string
 
         $html = Str::replaceLast('</ul>', '', $html);
 
+        /** @noinspection SpellCheckingInspection */
         $html = str_replace(
             ['HydePHPDocs', 'themeToggle', 'Toggledarktheme', 'Togglemenu', 'Backtohomepage'],
             ['HydePHP Docs', 'theme Toggle', ' Toggle theme', 'Toggle menu', 'Back to home page'],

From 3b53a49bd23d9e9426d68ae0263abdf124746c48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 12 Mar 2024 21:12:34 +0100
Subject: [PATCH 1051/2811] Update test class abstract documentation

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index fe5edf60dd9..4025cdf5efa 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -54,6 +54,9 @@
 /**
  * Very high level tests for navigation menu and sidebar view layouts.
  *
+ * These tests provide a sort of structural visual testing that can signal smoke
+ * before end-to-end testing kicks in, as they take a long time to set up and run.
+ *
  * @see \Hyde\Framework\Testing\Feature\AutomaticNavigationConfigurationsTest
  */
 class NavigationHtmlLayoutsTest extends TestCase

From e6049b8a5fedc627ea68756248f33836ab83d0cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 08:54:01 +0100
Subject: [PATCH 1052/2811] Add sidebar header scope hook

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 4025cdf5efa..b3e56c08e3b 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -840,6 +840,8 @@ class RenderedDocumentationSidebarMenu extends RenderedNavigationMenu
 {
     protected const TYPE = DocumentationSidebar::class;
 
+    protected bool $scopeToHeader = false;
+
     public function assertHasGroups(): static
     {
         $this->assertHasElement('sidebar-group');
@@ -861,6 +863,13 @@ public function assertHasNoGroups(): static
 
         return $this;
     }
+    
+    public function header(): static
+    {
+        $this->scopeToHeader = true;
+
+        return $this;
+    }
 }
 
 class TestKernel extends HydeKernel

From 24d8fd26717aa3ef73261212cc02e041016dc2dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 08:56:37 +0100
Subject: [PATCH 1053/2811] Add helper to get asserted element

---
 .../tests/Unit/Views/NavigationHtmlLayoutsTest.php        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b3e56c08e3b..cadca7379f3 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -697,6 +697,14 @@ public function dd(bool $writeHtml = true): void
         exit(trim($this->html)."\n\n");
     }
 
+    /** Get an element node and assert it is not null */
+    protected function getAssertedElement(string $id): DOMElement
+    {
+        $this->assertHasElement($id);
+
+        return $this->ast->getElementById($id);
+    }
+
     protected function parseHtml(): DOMDocument
     {
         $dom = new DOMDocument();

From e76774b615f766d3192ee6c45be3507fff1ea015 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:00:54 +0100
Subject: [PATCH 1054/2811] Add helper to assert theme toggle button state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index cadca7379f3..a3486ee4ce6 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -871,7 +871,24 @@ public function assertHasNoGroups(): static
 
         return $this;
     }
-    
+
+    public function assertHasThemeToggleButton(): static
+    {
+        if (! $this->scopeToHeader) {
+            $this->assertHasElement('theme-toggle-button');
+        } else {
+            $header = $this->getAssertedElement('sidebar-header');
+
+            $xpath = new DOMXPath($this->ast);
+            $header = $xpath->query('.//button[contains(concat(" ", normalize-space(@class), " "), " theme-toggle-button ")]', $header)->item(0);
+
+            $this->test->assertNotNull($header, 'No theme toggle button found in sidebar header');
+            $this->test->assertSame('Toggle dark theme', trim($header->textContent));
+        }
+
+        return $this;
+    }
+
     public function header(): static
     {
         $this->scopeToHeader = true;

From e06d6feb19f8654ae17649aa77d2e3cd4361b0c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:01:01 +0100
Subject: [PATCH 1055/2811] Test sidebar header has theme toggle button

---
 .../framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index a3486ee4ce6..915b255619f 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -162,6 +162,11 @@ public function testCustomSidebarHeader()
         $this->sidebar()->assertHeaderIs('Documentation');
     }
 
+    public function testSidebarHeaderHasThemeToggleButton()
+    {
+        $this->sidebar()->header()->assertHasThemeToggleButton();
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')

From 3e7d268391196865fa00f4c353fa44ffd67d79b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 09:03:35 +0100
Subject: [PATCH 1056/2811] Test inverse toggle button state

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 915b255619f..52ccaa3e8b1 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -14,6 +14,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
+use Hyde\Facades\Features;
 use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\InMemoryPage;
@@ -167,6 +168,13 @@ public function testSidebarHeaderHasThemeToggleButton()
         $this->sidebar()->header()->assertHasThemeToggleButton();
     }
 
+    public function testSidebarHeaderDoesNotHaveThemeToggleButtonWhenDarkmodeIsDisabled()
+    {
+        Features::mock('darkmode', false);
+
+        $this->sidebar()->header()->assertDoesNotHaveThemeToggleButton();
+    }
+
     public function testNavigationMenuFromNestedRoute()
     {
         $this->fromPage('nested/page')
@@ -894,6 +902,22 @@ public function assertHasThemeToggleButton(): static
         return $this;
     }
 
+    public function assertDoesNotHaveThemeToggleButton(): static
+    {
+        if (! $this->scopeToHeader) {
+            $this->assertDoesNotHaveElement('theme-toggle-button');
+        } else {
+            $header = $this->getAssertedElement('sidebar-header');
+
+            $xpath = new DOMXPath($this->ast);
+            $header = $xpath->query('.//button[contains(concat(" ", normalize-space(@class), " "), " theme-toggle-button ")]', $header)->item(0);
+
+            $this->test->assertNull($header, 'Theme toggle button found in sidebar header');
+        }
+
+        return $this;
+    }
+
     public function header(): static
     {
         $this->scopeToHeader = true;

From 2145e5b8cceeb8654aa8d9b5ba2e6c89b9bcc403 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:17:03 +0100
Subject: [PATCH 1057/2811] Test sidebar without grouped pages

---
 .../Unit/Views/NavigationHtmlLayoutsTest.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index 52ccaa3e8b1..b34f0d78af2 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -438,6 +438,23 @@ public function testSidebarFromNestedRoute()
             );
     }
 
+    public function testSidebarWithoutGroupedPages()
+    {
+        $this->sidebar($this->withSidebarPages())
+            ->assertHasNoGroups()
+            ->assertHasPages([
+                'docs/foo.html' => 'Foo',
+                'docs/bar.html' => 'Bar',
+                'docs/baz.html' => 'Baz',
+            ])
+            ->assertItemsLookLike(<<<'HTML'
+                - Foo
+                - Bar
+                - Baz
+                HTML
+            );
+    }
+
     public function testSidebarWithGroupedPages()
     {
         $this->sidebar($this->withGroupedSidebarPages())

From 894a865fa461fcc71ee2ead257ee710cff2e9bea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:25:10 +0100
Subject: [PATCH 1058/2811] Include navigation link as Blade component instead
 of include

Looks more consistent with the dropdown include just above, and we can use attributes
---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index b04ccc9df87..663bb8a4567 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -38,7 +38,7 @@
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
-                        @include('hyde::components.navigation.navigation-link')
+                        <x-hyde::navigation.link :item="$item"/>
                     @endif
                 </li>
             @endforeach

From 52f2d0c39b717205207b37a89ac5b381dbf2ca25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:27:35 +0100
Subject: [PATCH 1059/2811] Fix component name

---
 packages/framework/resources/views/layouts/navigation.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 663bb8a4567..a55e64b5ea1 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -38,7 +38,7 @@
                     @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
-                        <x-hyde::navigation.link :item="$item"/>
+                        <x-hyde::navigation.navigation-link :item="$item"/>
                     @endif
                 </li>
             @endforeach

From 6ba9eaf7006362ddb7b2e3566479725329a212f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 17:43:16 +0100
Subject: [PATCH 1060/2811] Add CSS class hooks for the navigation link states

Adds a styling hook, and makes it more readable and testable
---
 .../navigation/navigation-link.blade.php          |  4 ++--
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 048faaa6cba..207172ff4ea 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,4 @@
 <a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
-    'block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
-    'border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
+    'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
+    'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 1018d2ae3c0..53b3a14b553 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -48,4 +48,19 @@ public function testComponentHasAriaCurrentWhenCurrentRouteMatches()
         $this->mockRoute(Routes::get('index'));
         $this->assertStringContainsString('aria-current="page"', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
     }
+
+    public function testComponentDoesNotHaveActiveClassWhenNotActive()
+    {
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringContainsString('navigation-link ', $render);
+        $this->assertStringNotContainsString('navigation-link-active', $render);
+    }
+
+    public function testComponentHasActiveClassWhenActive()
+    {
+        $this->mockRoute(Routes::get('index'));
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringContainsString('navigation-link ', $render);
+        $this->assertStringContainsString('navigation-link-active', $render);
+    }
 }

From c61eef919422b886f75b78aef654da42da7c397f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:20:35 +0100
Subject: [PATCH 1061/2811] Include dropdown navigation item as Blade component

Normalizes with https://github.com/hydephp/develop/commit/894a865fa461fcc71ee2ead257ee710cff2e9bea
---
 .../resources/views/components/navigation/dropdown.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/navigation/dropdown.blade.php b/packages/framework/resources/views/components/navigation/dropdown.blade.php
index 52d03fcc9c0..b0c8de89a0d 100644
--- a/packages/framework/resources/views/components/navigation/dropdown.blade.php
+++ b/packages/framework/resources/views/components/navigation/dropdown.blade.php
@@ -9,7 +9,7 @@
             @isset($items)
                 @foreach ($items as $item)
                     <li class="whitespace-nowrap">
-                        @include('hyde::components.navigation.navigation-link')
+                        <x-hyde::navigation.navigation-link :item="$item"/>
                     </li>
                 @endforeach
             @else

From 759c63a9354b6ff3955fb73fea0ad9e700441286 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:23:44 +0100
Subject: [PATCH 1062/2811] Refactor component to use attribute merging

Create attribute bag in test setup
Update test to expect cleaner HTML output
---
 .../views/components/navigation/navigation-link.blade.php   | 6 ++++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 ++
 .../framework/tests/Unit/Views/NavigationMenuViewTest.php   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 207172ff4ea..0460e6fb38f 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,4 +1,6 @@
-<a href="{{ $item }}" {!! $item->isActive() ? 'aria-current="page"' : '' !!} @class([
+<a href="{{ $item }}" {{ ($attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])>{{ $item->getLabel() }}</a>
\ No newline at end of file
+])->merge([
+    'aria-current' => ($item->isActive() ? 'page' : false),
+])) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 53b3a14b553..14aa79c074a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Foundation\Facades\Routes;
+use Illuminate\View\ComponentAttributeBag;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 
@@ -24,6 +25,7 @@ protected function render(?NavItem $item = null): string
     {
         return view('hyde::components.navigation.navigation-link', [
             'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+            'attributes' => new ComponentAttributeBag(),
         ])->render();
     }
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index a40d6782b33..18d9bfd7cbf 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -73,7 +73,7 @@ public function testNavigationMenuWithRootPages()
         $contents = $foo->compile();
 
         $this->assertStringContainsString('<a href="foo.html" aria-current="page" class="', $contents);
-        $this->assertStringContainsString('<a href="bar.html"  class="', $contents);
+        $this->assertStringContainsString('<a href="bar.html" class="', $contents);
     }
 
     public function testNavigationMenuWithDropdownPages()

From 5710b1ad98e01b96db0b7029e8cbbb9dc1e225d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:30:28 +0100
Subject: [PATCH 1063/2811] Test inverse attribute state

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 14aa79c074a..e33adbdb413 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -39,6 +39,13 @@ public function testComponentUsesTitle()
         $this->assertStringContainsString('Foo', $this->render());
     }
 
+    public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNotMatch()
+    {
+        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
+        $this->assertStringNotContainsString('current', $render);
+        $this->assertStringNotContainsString('aria-current="page"', $render);
+    }
+
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
         $this->mockRoute(Routes::get('index'));

From 5ffeac4a96f31528c2b4b82a471367eb23a42fd3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 21:31:45 +0100
Subject: [PATCH 1064/2811] Remove unnecessary parentheses

---
 .../views/components/navigation/navigation-link.blade.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 0460e6fb38f..60ce617081d 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
-<a href="{{ $item }}" {{ ($attributes->except('item')->class([
+<a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])->merge([
-    'aria-current' => ($item->isActive() ? 'page' : false),
-])) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+    'aria-current' => $item->isActive() ? 'page' : false,
+]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file

From b62cd6bf9fefb5e846c6cb0360ac709b12affa64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:42:46 +0100
Subject: [PATCH 1065/2811] Add testing helper to assert HTML attribute state

---
 packages/testing/src/Support/TestView.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 8bb446c3ebc..d3581efb59f 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -34,6 +34,18 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the HTML attribute value is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertAttributeIs(string $attributeName, string $expectedValue): static
+    {
+        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered);
+
+        return $this;
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From f26f910e66a105733cf260256d23d81d05b8829f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:44:23 +0100
Subject: [PATCH 1066/2811] Add testing helper to assert HTML content literals

---
 packages/testing/src/Support/TestView.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index d3581efb59f..4e04a247a7d 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -46,6 +46,18 @@ public function assertAttributeIs(string $attributeName, string $expectedValue):
         return $this;
     }
 
+    /**
+     * Assert that the given text is equals the view's text content.
+     *
+     * @return $this
+     */
+    public function assertTextIs(string $value): static
+    {
+        PHPUnit::assertSame($value, strip_tags($this->rendered));
+
+        return $this;
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From 90419b2808591ec60f56523ad9c141f79de14dbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 13 Mar 2024 22:45:47 +0100
Subject: [PATCH 1067/2811] Begin refactoring test to use more fluent assertion
 helpers

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 1018d2ae3c0..6c0a25a6113 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Testing\TestsBladeViews;
+use Hyde\Testing\Support\TestView;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
@@ -13,6 +15,8 @@
  */
 class NavigationLinkViewTest extends TestCase
 {
+    use TestsBladeViews;
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -27,14 +31,21 @@ protected function render(?NavItem $item = null): string
         ])->render();
     }
 
+    protected function testView(?NavItem $item = null): TestView
+    {
+        return $this->test(view('hyde::components.navigation.navigation-link', [
+            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+        ]));
+    }
+
     public function testComponentLinksToRouteDestination()
     {
-        $this->assertStringContainsString('href="foo.html"', $this->render());
+        $this->testView()->assertAttributeIs('href', 'foo.html');
     }
 
     public function testComponentUsesTitle()
     {
-        $this->assertStringContainsString('Foo', $this->render());
+        $this->testView()->assertTextIs('Foo');
     }
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()

From 6a474091b1afd4211cddf97b15138df1e9749a00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:39:39 +0100
Subject: [PATCH 1068/2811] Add testing helper to make NavItem for page

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 93146650502..3d050d2e75a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Pages\InMemoryPage;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
 use Hyde\Foundation\Facades\Routes;
@@ -41,6 +43,11 @@ protected function testView(?NavItem $item = null): TestView
         ]));
     }
 
+    protected function makeNavItemForPage(): NavItem
+    {
+        return NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo');
+    }
+
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href', 'foo.html');

From 2cd3da2085c5e34cfb64c176457ddbf833629f5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:39:54 +0100
Subject: [PATCH 1069/2811] Add improved assertion output

---
 packages/testing/src/Support/TestView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 4e04a247a7d..d75cea1a980 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -41,7 +41,7 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      */
     public function assertAttributeIs(string $attributeName, string $expectedValue): static
     {
-        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered);
+        PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");
 
         return $this;
     }

From d5f33f643e321277d0e883998d2602948f96fc8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 11:40:03 +0100
Subject: [PATCH 1070/2811] Test component resolves relative links for routes

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 3d050d2e75a..6a1bbb0e490 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -53,6 +53,12 @@ public function testComponentLinksToRouteDestination()
         $this->testView()->assertAttributeIs('href', 'foo.html');
     }
 
+    public function testComponentResolvesRelativeLinksForRoutes()
+    {
+        $this->mockCurrentPage('foo/bar');
+        $this->testView($this->makeNavItemForPage())->assertAttributeIs('href', '../foo.html');
+    }
+
     public function testComponentUsesTitle()
     {
         $this->testView()->assertTextIs('Foo');

From a4c0f9ec0e86134259c2869bf926e09b069167f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 17:19:44 +0100
Subject: [PATCH 1071/2811] Simplify test data handling

---
 .../tests/Unit/Views/NavigationLinkViewTest.php          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 6a1bbb0e490..0117567081a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -38,16 +38,11 @@ protected function render(?NavItem $item = null): string
     protected function testView(?NavItem $item = null): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
+            'item' => $item ?? NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }
 
-    protected function makeNavItemForPage(): NavItem
-    {
-        return NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo');
-    }
-
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href', 'foo.html');
@@ -56,7 +51,7 @@ public function testComponentLinksToRouteDestination()
     public function testComponentResolvesRelativeLinksForRoutes()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->testView($this->makeNavItemForPage())->assertAttributeIs('href', '../foo.html');
+        $this->testView()->assertAttributeIs('href', '../foo.html');
     }
 
     public function testComponentUsesTitle()

From c042cf7edcf395930182ba9b85db436f576df2ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:06:27 +0100
Subject: [PATCH 1072/2811] Add more attribute assertion helpers

---
 packages/testing/src/Support/TestView.php | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index d75cea1a980..c0ac4979328 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -41,11 +41,37 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      */
     public function assertAttributeIs(string $attributeName, string $expectedValue): static
     {
+        static::assertHasAttribute($attributeName);
+
         PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");
 
         return $this;
     }
 
+    /**
+     * Assert that the HTML attribute is present within the view.
+     *
+     * @return $this
+     */
+    public function assertHasAttribute(string $attributeName): static
+    {
+        PHPUnit::assertStringContainsString($attributeName.'="', $this->rendered, "The attribute '$attributeName' was not found.");
+
+        return $this;
+    }
+
+    /**
+     * Assert that the HTML attribute is not present within the view.
+     *
+     * @return $this
+     */
+    public function assertDoesNotHaveAttribute(string $attributeName): static
+    {
+        PHPUnit::assertStringNotContainsString($attributeName.'="', $this->rendered, "The attribute '$attributeName' was found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given text is equals the view's text content.
      *

From b7fb433c58b0c86ddda81d1613dc6437fa6daeef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:08:38 +0100
Subject: [PATCH 1073/2811] Refactor test to use fluent assertions

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 0117567081a..64914a8934a 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -61,9 +61,9 @@ public function testComponentUsesTitle()
 
     public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNotMatch()
     {
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringNotContainsString('current', $render);
-        $this->assertStringNotContainsString('aria-current="page"', $render);
+        $this->testView()
+            ->assertDontSee('current')
+            ->assertDoesNotHaveAttribute('aria-current');
     }
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()

From 7b1868e30c7b2f44f40f00eb0421228061c5c799 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:15:04 +0100
Subject: [PATCH 1074/2811] Add testing helper to dump and die with HTML state

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index c0ac4979328..428f85cc0b5 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Testing\Support;
 
+use Hyde\Hyde;
+use Illuminate\Support\Str;
+use JetBrains\PhpStorm\NoReturn;
 use Illuminate\Testing\Assert as PHPUnit;
 
 class TestView extends \Illuminate\Testing\TestView
@@ -84,6 +87,17 @@ public function assertTextIs(string $value): static
         return $this;
     }
 
+    #[NoReturn]
+    public function dd(bool $writeHtml = true): void
+    {
+        if ($writeHtml) {
+            $viewName = Str::after(Str::after(basename(class_basename($this->view->getName())), '.'), '.');
+            file_put_contents(Hyde::path(Str::kebab($viewName.'.html')), $this->rendered);
+        }
+
+        exit(trim($this->rendered)."\n\n");
+    }
+
     protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);

From 282d1feb4aa648ff3ca58fc5929ca76fdf653268 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:37:32 +0100
Subject: [PATCH 1075/2811] Refactor test to use fluent assertions

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 64914a8934a..378075c49e7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -68,8 +68,10 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockRoute(Routes::get('index'));
-        $this->assertStringContainsString('current', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
+        $this->mockCurrentPage('foo');
+        $this->testView()
+            ->assertSee('current')
+            ->assertAttributeIs('aria-current', 'page');
     }
 
     public function testComponentHasAriaCurrentWhenCurrentRouteMatches()

From add2390407fbbd41e24f9f680c4b88873fc289d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 14 Mar 2024 21:40:24 +0100
Subject: [PATCH 1076/2811] Use helper method fluently

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 378075c49e7..d70e5f78ebd 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -68,8 +68,8 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockCurrentPage('foo');
-        $this->testView()
+        $this->mockCurrentPage('foo')
+            ->testView()
             ->assertSee('current')
             ->assertAttributeIs('aria-current', 'page');
     }

From 68d46fffab7738e034605773e5ec72ec477523de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:38:06 +0100
Subject: [PATCH 1077/2811] Update testing helper to automatically parse
 attributes

Adds an option to use this with just the full attribute string
---
 packages/testing/src/Support/TestView.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 428f85cc0b5..924db972f3c 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -42,8 +42,15 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
      *
      * @return $this
      */
-    public function assertAttributeIs(string $attributeName, string $expectedValue): static
+    public function assertAttributeIs(string $attribute, ?string $expectedValue = null): static
     {
+        if ($expectedValue === null) {
+            [$attributeName, $expectedValue] = explode('=', $attribute);
+            $expectedValue = trim($expectedValue, '"');
+        } else {
+            $attributeName = $attribute;
+        }
+
         static::assertHasAttribute($attributeName);
 
         PHPUnit::assertStringContainsString($attributeName.'="'.$expectedValue.'"', $this->rendered, "The attribute '$attributeName' with value '$expectedValue' was not found.");

From cd1e567f9208592e21807fce5a3539b6504ec815 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:38:19 +0100
Subject: [PATCH 1078/2811] Use shorthand attribute testing syntax

---
 packages/framework/tests/Unit/Views/NavigationLinkViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index d70e5f78ebd..b55552c25f3 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -71,7 +71,7 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
         $this->mockCurrentPage('foo')
             ->testView()
             ->assertSee('current')
-            ->assertAttributeIs('aria-current', 'page');
+            ->assertAttributeIs('aria-current="page"');
     }
 
     public function testComponentHasAriaCurrentWhenCurrentRouteMatches()

From 2a1c9cc270123f4d605b787a801df2c69aa9bef5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:45:43 +0100
Subject: [PATCH 1079/2811] Add assertion

---
 packages/framework/tests/Unit/Views/NavigationLinkViewTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index b55552c25f3..e7c7a534fe8 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -71,6 +71,7 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
         $this->mockCurrentPage('foo')
             ->testView()
             ->assertSee('current')
+            ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="page"');
     }
 

From 322862bb07d10ed18e48b67161204e2909c1bd7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:45:55 +0100
Subject: [PATCH 1080/2811] Remove duplicated test case

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index e7c7a534fe8..ebe46e90c88 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -75,12 +75,6 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
             ->assertAttributeIs('aria-current="page"');
     }
 
-    public function testComponentHasAriaCurrentWhenCurrentRouteMatches()
-    {
-        $this->mockRoute(Routes::get('index'));
-        $this->assertStringContainsString('aria-current="page"', $this->render(NavItem::forRoute(Routes::get('index'), 'Home')));
-    }
-
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
         $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));

From cc071eb781b698fde89769078353939a25a9ca97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:49:47 +0100
Subject: [PATCH 1081/2811] Refactor tests to use fluent assertions

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index ebe46e90c88..e0f7be81ba6 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -8,7 +8,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\View\ComponentAttributeBag;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Testing\TestCase;
@@ -77,16 +76,16 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
 
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringContainsString('navigation-link ', $render);
-        $this->assertStringNotContainsString('navigation-link-active', $render);
+        $this->testView()
+            ->assertSee('navigation-link ')
+            ->assertDontSee('navigation-link-active');
     }
 
     public function testComponentHasActiveClassWhenActive()
     {
-        $this->mockRoute(Routes::get('index'));
-        $render = $this->render(NavItem::forRoute(Routes::get('index'), 'Home'));
-        $this->assertStringContainsString('navigation-link ', $render);
-        $this->assertStringContainsString('navigation-link-active', $render);
+        $this->mockCurrentPage('foo')
+            ->testView()
+            ->assertSee('navigation-link ')
+            ->assertSee('navigation-link-active');
     }
 }

From c66c5c89695f6fa8f27d9be470b92dcc0437f39a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:51:11 +0100
Subject: [PATCH 1082/2811] Remove unused testing helper

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index e0f7be81ba6..db942123aa7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -26,14 +26,6 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    protected function render(?NavItem $item = null): string
-    {
-        return view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forLink('foo.html', 'Foo'),
-            'attributes' => new ComponentAttributeBag(),
-        ])->render();
-    }
-
     protected function testView(?NavItem $item = null): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [

From b451eff6d5e20c188fea772241c1247574e6c4d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:51:58 +0100
Subject: [PATCH 1083/2811] Remove unused parameter from testing helper method

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index db942123aa7..d17ec5bd926 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -26,10 +26,10 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    protected function testView(?NavItem $item = null): TestView
+    protected function testView(): TestView
     {
         return $this->test(view('hyde::components.navigation.navigation-link', [
-            'item' => $item ?? NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From fbb5bfdbda3d202b734dd7af885553976a29ea5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 13:57:13 +0100
Subject: [PATCH 1084/2811] Add testing helpers to assert CSS class states

---
 packages/testing/src/Support/TestView.php | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 924db972f3c..92aa98c331c 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -82,6 +82,30 @@ public function assertDoesNotHaveAttribute(string $attributeName): static
         return $this;
     }
 
+    /**
+     * Assert that the given CSS class is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasClass(string $class): static
+    {
+        PHPUnit::assertContains($class, $this->findClasses(), "The class '$class' was not found.");
+
+        return $this;
+    }
+
+    /**
+     * Assert that the given CSS class is not contained within the view.
+     *
+     * @return $this
+     */
+    public function assertDoesNotHaveClass(string $class): static
+    {
+        PHPUnit::assertNotContains($class, $this->findClasses(), "The class '$class' was found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given text is equals the view's text content.
      *
@@ -109,4 +133,12 @@ protected function trimNewlinesAndIndentation(string $value): string
     {
         return str_replace(['    ', "\t", "\n", "\r"], '', $value);
     }
+
+    /** @return array<string> */
+    protected function findClasses(): array
+    {
+        preg_match_all('/class="([^"]+)"/', $this->rendered, $matches);
+
+        return explode(' ', $matches[1][0]);
+    }
 }

From d5411eb91af90a5bd05f678301e225db96abfe10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:00:46 +0100
Subject: [PATCH 1085/2811] Use new class state helpers

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index d17ec5bd926..b2a2b01c0e5 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -69,15 +69,15 @@ public function testComponentIsCurrentWhenCurrentRouteMatches()
     public function testComponentDoesNotHaveActiveClassWhenNotActive()
     {
         $this->testView()
-            ->assertSee('navigation-link ')
-            ->assertDontSee('navigation-link-active');
+            ->assertHasClass('navigation-link')
+            ->assertDoesNotHaveClass('navigation-link-active');
     }
 
     public function testComponentHasActiveClassWhenActive()
     {
         $this->mockCurrentPage('foo')
             ->testView()
-            ->assertSee('navigation-link ')
-            ->assertSee('navigation-link-active');
+            ->assertHasClass('navigation-link')
+            ->assertHasClass('navigation-link-active');
     }
 }

From fd1c68a5eb5c5a57f829e637542c1aa82fb803a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:03:05 +0100
Subject: [PATCH 1086/2811] Clean up and normalize test semantics

---
 .../tests/Unit/Views/NavigationLinkViewTest.php   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index b2a2b01c0e5..10febbd13cf 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -36,13 +36,14 @@ protected function testView(): TestView
 
     public function testComponentLinksToRouteDestination()
     {
-        $this->testView()->assertAttributeIs('href', 'foo.html');
+        $this->testView()->assertAttributeIs('href="foo.html"');
     }
 
     public function testComponentResolvesRelativeLinksForRoutes()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->testView()->assertAttributeIs('href', '../foo.html');
+
+        $this->testView()->assertAttributeIs('href="../foo.html"');
     }
 
     public function testComponentUsesTitle()
@@ -59,8 +60,9 @@ public function testComponentDoesNotHaveCurrentAttributesWhenCurrentRouteDoesNot
 
     public function testComponentIsCurrentWhenCurrentRouteMatches()
     {
-        $this->mockCurrentPage('foo')
-            ->testView()
+        $this->mockCurrentPage('foo');
+
+        $this->testView()
             ->assertSee('current')
             ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="page"');
@@ -75,8 +77,9 @@ public function testComponentDoesNotHaveActiveClassWhenNotActive()
 
     public function testComponentHasActiveClassWhenActive()
     {
-        $this->mockCurrentPage('foo')
-            ->testView()
+        $this->mockCurrentPage('foo');
+
+        $this->testView()
             ->assertHasClass('navigation-link')
             ->assertHasClass('navigation-link-active');
     }

From b0d4331f7698228d62a439571fcb5ebcf71402b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:09:53 +0100
Subject: [PATCH 1087/2811] Add testing helper to assert element state

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 92aa98c331c..1867c2f0b64 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -37,6 +37,20 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the given HTML element is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasElement(string $element): static
+    {
+        $element = trim($element, '</>');
+
+        PHPUnit::assertStringContainsString("<$element", $this->rendered, "The element '$element' was not found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the HTML attribute value is contained within the view.
      *

From 8449237f8ef57bf279e6ff517b5cb34fe9d2e59f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 14:10:01 +0100
Subject: [PATCH 1088/2811] Test component renders

---
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 10febbd13cf..8609cdb82c7 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -34,6 +34,11 @@ protected function testView(): TestView
         ]));
     }
 
+    public function testComponentRenders()
+    {
+        $this->testView()->assertHasElement('<a>');
+    }
+
     public function testComponentLinksToRouteDestination()
     {
         $this->testView()->assertAttributeIs('href="foo.html"');

From 2439b721776d550c340ca7e2c65aa216330d3dfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:44:28 +0100
Subject: [PATCH 1089/2811] Create SidebarItemsViewTest.php

---
 .../tests/Unit/Views/SidebarItemsViewTest.php  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
new file mode 100644
index 00000000000..c2deb985986
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+use Hyde\Testing\TestCase;
+use Hyde\Testing\TestsBladeViews;
+
+/**
+ * @see resources/views/components/docs/sidebar-items.blade.php
+ */
+class SidebarItemsViewTest extends TestCase
+{
+    use TestsBladeViews;
+
+    //
+}

From 4f7dd3b5ebe2e58a6f9944ee8c1c9de28b051c7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:49:40 +0100
Subject: [PATCH 1090/2811] Add testing helper to assert if an HTML ID is
 present

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 1867c2f0b64..ed697e6b1fc 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -96,6 +96,20 @@ public function assertDoesNotHaveAttribute(string $attributeName): static
         return $this;
     }
 
+    /**
+     * Assert that the given HTML ID is contained within the view.
+     *
+     * @return $this
+     */
+    public function assertHasId(string $id): static
+    {
+        $id = trim($id, '#');
+
+        PHPUnit::assertStringContainsString("id=\"$id\"", $this->rendered, "The id '$id' was not found.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given CSS class is contained within the view.
      *

From 1d5e1f77a43d8c682366a229362d2492c95ebe13 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:50:06 +0100
Subject: [PATCH 1091/2811] Update testing helper to fluently direct assertions

---
 packages/testing/src/Support/TestView.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index ed697e6b1fc..22f0e4dac2e 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -46,6 +46,10 @@ public function assertHasElement(string $element): static
     {
         $element = trim($element, '</>');
 
+        if (str_starts_with($element, '#')) {
+            return $this->assertHasId($element);
+        }
+
         PHPUnit::assertStringContainsString("<$element", $this->rendered, "The element '$element' was not found.");
 
         return $this;

From 4fa8deab206ee06022acf5b9a842ebb6a15858ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:52:29 +0100
Subject: [PATCH 1092/2811] Set up testing helper

---
 .../tests/Unit/Views/SidebarItemsViewTest.php          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index c2deb985986..cbbbff820cc 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -6,6 +6,9 @@
 
 use Hyde\Testing\TestCase;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Testing\Support\TestView;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @see resources/views/components/docs/sidebar-items.blade.php
@@ -14,5 +17,10 @@ class SidebarItemsViewTest extends TestCase
 {
     use TestsBladeViews;
 
-    //
+    protected function testView(): TestView
+    {
+        return $this->test(view('hyde::components.docs.sidebar-items', [
+            'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
+        ]));
+    }
 }

From 2d9ae2aff3f0deb5b4477b4b2a5197fbe9d470cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:54:07 +0100
Subject: [PATCH 1093/2811] Test component renders

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index cbbbff820cc..f95afd79b97 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -23,4 +23,9 @@ protected function testView(): TestView
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));
     }
+
+    public function testComponentRenders()
+    {
+        $this->testView()->assertHasElement('#sidebar-items');
+    }
 }

From 3ebd20f8260d63f5c10511f6ed61cf583895a4d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:59:00 +0100
Subject: [PATCH 1094/2811] Mock route

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index f95afd79b97..e06fc42cff1 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -19,6 +19,8 @@ class SidebarItemsViewTest extends TestCase
 
     protected function testView(): TestView
     {
+        $this->mockRoute();
+
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));

From 2eeed5f01a279c382920d37792d14ba0126412ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 21:59:39 +0100
Subject: [PATCH 1095/2811] Add a route to populate testing sidebar

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index e06fc42cff1..43978cc5d11 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestsBladeViews;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\Support\TestView;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -21,6 +24,8 @@ protected function testView(): TestView
     {
         $this->mockRoute();
 
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
+
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),
         ]));

From a0c0726c63abfa204a6527a0c3d31fe02befcb94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:01:39 +0100
Subject: [PATCH 1096/2811] Add type annotation to view

---
 .../resources/views/components/docs/sidebar-items.blade.php  | 1 +
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index e06a90e94c5..f0d4cb553f0 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,6 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
+        @php /** @var \Hyde\Framework\Features\Navigation\NavGroupItem $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 43978cc5d11..2039f889c2d 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -35,4 +35,9 @@ public function testComponentRenders()
     {
         $this->testView()->assertHasElement('#sidebar-items');
     }
+
+    public function testTypeAnnotationIsNotPresentInHtml()
+    {
+        $this->testView()->assertDontSee('@var')->assertDontSee('$group');
+    }
 }

From 12dfbc4db36d2d5a89d1c583b783f8cc7601c45b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:09:40 +0100
Subject: [PATCH 1097/2811] Add more mock pages to test

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 2039f889c2d..08bec5bfdfc 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -25,6 +25,8 @@ protected function testView(): TestView
         $this->mockRoute();
 
         Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('bar')));
+        Hyde::routes()->addRoute(new Route(new DocumentationPage('baz')));
 
         return $this->test(view('hyde::components.docs.sidebar-items', [
             'sidebar' => NavigationMenuGenerator::handle(DocumentationSidebar::class),

From 361325f93418c1917ffd4875b37f1c2391f51791 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 15 Mar 2024 22:21:21 +0100
Subject: [PATCH 1098/2811] Move mock route call to setup

---
 .../framework/tests/Unit/Views/SidebarItemsViewTest.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 08bec5bfdfc..f684d4fea52 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -20,10 +20,15 @@ class SidebarItemsViewTest extends TestCase
 {
     use TestsBladeViews;
 
-    protected function testView(): TestView
+    protected function setUp(): void
     {
+        parent::setUp();
+
         $this->mockRoute();
+    }
 
+    protected function testView(): TestView
+    {
         Hyde::routes()->addRoute(new Route(new DocumentationPage('foo')));
         Hyde::routes()->addRoute(new Route(new DocumentationPage('bar')));
         Hyde::routes()->addRoute(new Route(new DocumentationPage('baz')));

From 5d459401ea151ed23310803f368dc781afe54bfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:53:17 +0100
Subject: [PATCH 1099/2811] Test high level active states

Granular logic belongs in child tests
---
 .../tests/Unit/Views/SidebarItemsViewTest.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index f684d4fea52..fe0e3846fa2 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -43,6 +43,26 @@ public function testComponentRenders()
         $this->testView()->assertHasElement('#sidebar-items');
     }
 
+    public function testViewDoesNotContainActiveStateWhenNoPageIsActive()
+    {
+        $this->testView()
+            ->assertDontSee('active')
+            ->assertDontSee('Table of contents')
+            ->assertDoesNotHaveAttribute('aria-current');
+    }
+
+    public function testViewContainsActiveStateWhenPageIsActive()
+    {
+        $this->mockCurrentPage('docs/foo');
+        $this->mockPage(new DocumentationPage('foo'));
+
+        $this->testView()
+            ->assertSee('active')
+            ->assertSee('Table of contents')
+            ->assertHasAttribute('aria-current')
+            ->assertAttributeIs('aria-current="true"');
+    }
+
     public function testTypeAnnotationIsNotPresentInHtml()
     {
         $this->testView()->assertDontSee('@var')->assertDontSee('$group');

From 627a3f261f8b591a848f17e6cc1a87025482ef75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:54:13 +0100
Subject: [PATCH 1100/2811] Assert see list item class

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index fe0e3846fa2..7594b96b5e3 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items');
+        $this->testView()->assertHasElement('#sidebar-items')->assertSee('sidebar-item');
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From 668961af4a27d28ca322677fc8de9c20713c885c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:56:29 +0100
Subject: [PATCH 1101/2811] Add testing helper to assert string occurrence
 count

---
 packages/testing/src/Support/TestView.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 22f0e4dac2e..30085b3c1b4 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -37,6 +37,20 @@ public function assertSeeHtmlIgnoringFormatting(string $value): static
         return $this;
     }
 
+    /**
+     * Assert that the given string is contained exactly `$times` within the view.
+     *
+     * @return $this
+     */
+    public function assertSeeTimes(string $value, int $times = 1): static
+    {
+        $count = substr_count($this->rendered, $value);
+
+        PHPUnit::assertSame($times, $count, "The string '$value' was found $count times, expected $times.");
+
+        return $this;
+    }
+
     /**
      * Assert that the given HTML element is contained within the view.
      *

From f04a46f69fe965d601b971f911e990ee8f10f48d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:56:41 +0100
Subject: [PATCH 1102/2811] Assert see times

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 7594b96b5e3..8ed2a1a57aa 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items')->assertSee('sidebar-item');
+        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('sidebar-item ', 3);
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From ce51a65dd7b129a5deec8c57430de42e50d4ba51 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 09:58:43 +0100
Subject: [PATCH 1103/2811] Use clearer assertion string

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 8ed2a1a57aa..8b29db4ce08 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -40,7 +40,7 @@ protected function testView(): TestView
 
     public function testComponentRenders()
     {
-        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('sidebar-item ', 3);
+        $this->testView()->assertHasElement('#sidebar-items')->assertSeeTimes('listitem', 3);
     }
 
     public function testViewDoesNotContainActiveStateWhenNoPageIsActive()

From 7a3ca45277d338b2bb7a4a6636cb3fc700209242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:01:10 +0100
Subject: [PATCH 1104/2811] Add fluent assertion shorthand method

---
 packages/testing/src/Support/TestView.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 30085b3c1b4..2a582a45fc5 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -51,6 +51,16 @@ public function assertSeeTimes(string $value, int $times = 1): static
         return $this;
     }
 
+    /**
+     * Assert that the given string is contained exactly once within the view.
+     *
+     * @return $this
+     */
+    public function assertSeeOnce(string $value): static
+    {
+        return $this->assertSeeTimes($value, 1);
+    }
+
     /**
      * Assert that the given HTML element is contained within the view.
      *

From be2bc014c5754df51da1fce334b946ba297b4d86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:01:20 +0100
Subject: [PATCH 1105/2811] Remove redundant argument

---
 packages/testing/src/Support/TestView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/testing/src/Support/TestView.php b/packages/testing/src/Support/TestView.php
index 2a582a45fc5..9ee68e7dac1 100644
--- a/packages/testing/src/Support/TestView.php
+++ b/packages/testing/src/Support/TestView.php
@@ -58,7 +58,7 @@ public function assertSeeTimes(string $value, int $times = 1): static
      */
     public function assertSeeOnce(string $value): static
     {
-        return $this->assertSeeTimes($value, 1);
+        return $this->assertSeeTimes($value);
     }
 
     /**

From 9c27a98007095a77bd845d996c54981be04fe7a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 16 Mar 2024 10:02:16 +0100
Subject: [PATCH 1106/2811] Assert see once

---
 packages/framework/tests/Unit/Views/SidebarItemsViewTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
index 8b29db4ce08..3545491e9ac 100644
--- a/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
+++ b/packages/framework/tests/Unit/Views/SidebarItemsViewTest.php
@@ -57,8 +57,8 @@ public function testViewContainsActiveStateWhenPageIsActive()
         $this->mockPage(new DocumentationPage('foo'));
 
         $this->testView()
-            ->assertSee('active')
-            ->assertSee('Table of contents')
+            ->assertSeeOnce('active')
+            ->assertSeeOnce('Table of contents')
             ->assertHasAttribute('aria-current')
             ->assertAttributeIs('aria-current="true"');
     }

From 147618a9902bc4ec255da7e552cc092079fd6ea1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:51:51 +0100
Subject: [PATCH 1107/2811] Breaking: Rename HTML ID `#searchMenu` to
 `#search-menu`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index b44d81327c0..8badf9517fc 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -26,7 +26,7 @@ class="block md:hidden fixed bottom-4 right-4 z-10 rounded-full p-2 opacity-75 h
 
 <div id="search-window-container" x-show="searchWindowOpen" x-cloak role="dialog"
      class="z-30 fixed top-0 left-0 w-screen h-screen flex flex-col items-center px-8 py-24 md:py-16">
-    <aside x-on:click.away="searchWindowOpen = false" id="searchMenu"
+    <aside x-on:click.away="searchWindowOpen = false" id="search-menu"
            class="prose dark:prose-invert bg-white dark:bg-gray-800  z-50 p-4 rounded-lg overflow-y-hidden min-h-[300px] max-h-[75vh] w-[70ch] max-w-full cursor-auto ">
         <header class="flex justify-between pb-3 mb-3 border-b dark:border-gray-700 md:hidden">
             <strong>Search the documentation site</strong>

From 5a71241232502a1035eb57aa555dcfb6c67ba794 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:55:01 +0100
Subject: [PATCH 1108/2811] Breaking: Rename HTML ID `#searchMenuButton` to
 `#search-menu-button`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 .../resources/views/pages/documentation-search.blade.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index 8badf9517fc..6a258d07479 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -1,4 +1,4 @@
-<button id="searchMenuButton" x-on:click="searchWindowOpen = ! searchWindowOpen"
+<button id="search-menu-button" x-on:click="searchWindowOpen = ! searchWindowOpen"
         :title="searchWindowOpen ? 'Close search window' : 'Open search window'; $nextTick(() => { setTimeout(() => { document.getElementById('search-input').focus(); }); });"
         class="absolute right-4 top-4 mr-4 z-10 opacity-75 hover:opacity-100 hidden md:block"
         aria-label="Toggle search window">
diff --git a/packages/framework/resources/views/pages/documentation-search.blade.php b/packages/framework/resources/views/pages/documentation-search.blade.php
index d30b4b7da16..c50683276d6 100644
--- a/packages/framework/resources/views/pages/documentation-search.blade.php
+++ b/packages/framework/resources/views/pages/documentation-search.blade.php
@@ -1,7 +1,7 @@
 @extends('hyde::layouts.docs')
 @section('content')
     <h1>Search the documentation site</h1>
-    <style>#searchMenuButton, .edit-page-link {
+    <style>#search-menu-button, .edit-page-link {
             display: none !important;
         }
 

From be0f780dbee28aa51a22a3f32808e0254c35630f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:55:53 +0100
Subject: [PATCH 1109/2811] Breaking: Rename HTML ID `#searchMenuButtonMobile`
 to `#search-menu-button-mobile`

---
 .../resources/views/components/docs/search-widget.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/search-widget.blade.php b/packages/framework/resources/views/components/docs/search-widget.blade.php
index 6a258d07479..43f3ee46928 100644
--- a/packages/framework/resources/views/components/docs/search-widget.blade.php
+++ b/packages/framework/resources/views/components/docs/search-widget.blade.php
@@ -14,7 +14,7 @@ class="absolute right-4 top-4 mr-4 z-10 opacity-75 hover:opacity-100 hidden md:b
         </svg>
     </span>
 </button>
-<button id="searchMenuButtonMobile" x-on:click="searchWindowOpen = ! searchWindowOpen"
+<button id="search-menu-button-mobile" x-on:click="searchWindowOpen = ! searchWindowOpen"
         :title="searchWindowOpen ? 'Close search window' : 'Open search window'; $nextTick(() => { setTimeout(() => { document.getElementById('search-input').focus(); }); });"
         class="block md:hidden fixed bottom-4 right-4 z-10 rounded-full p-2 opacity-75 hover:opacity-100 fill-black bg-gray-200 dark:fill-gray-200 dark:bg-gray-700"
         aria-label="Toggle search menu">

From 111fa9cfddf9cfb2b2dfd9cd6a7e8742733f4a43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:57:56 +0100
Subject: [PATCH 1110/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c892160609f..336aaf694bf 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -69,6 +69,17 @@ If you have previously used this method directly and expected a string to be ret
 
 If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
 
+### HTML ID changes
+
+Some HTML IDs have been renamed to follow a more consistent naming convention.
+
+If you have used any of the following selectors in custom code you wrote yourself, you will need to update to use the new changed IDs.
+
+- Rename HTML ID `#searchMenu` to `#search-menu`
+- Rename HTML ID `#searchMenuButton` to `#search-menu-button`
+- Rename HTML ID `#searchMenuButtonMobile` to `#search-menu-button-mobile`
+
+
 ### New documentation search implementation
 
 As the new documentation search implementation brings changes to their code API you may need to adapt your code

From c6855f06542da6df9c00960a3d2b040c4ce5d378 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 18 Mar 2024 19:59:29 +0100
Subject: [PATCH 1111/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 336aaf694bf..01955fff841 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -75,6 +75,7 @@ Some HTML IDs have been renamed to follow a more consistent naming convention.
 
 If you have used any of the following selectors in custom code you wrote yourself, you will need to update to use the new changed IDs.
 
+#### https://github.com/hydephp/develop/pull/1622
 - Rename HTML ID `#searchMenu` to `#search-menu`
 - Rename HTML ID `#searchMenuButton` to `#search-menu-button`
 - Rename HTML ID `#searchMenuButtonMobile` to `#search-menu-button-mobile`

From 686d1b9a40ce680a5deef97f004099ff4f7d4505 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Mar 2024 12:12:47 +0100
Subject: [PATCH 1112/2811] Remove low priority todo

This would not reduce complexity, just move it to the view where it is harder to test
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 64ed8edd555..8d1d2567c29 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -88,8 +88,6 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active.
 
-        // Todo: It may make more sense to handle this logic in the view, as it's a UI concern and this is a data model.
-
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
         $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);

From 965ea5ccefe0b9babad0dda5c2a95ae9fb761c37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 19 Mar 2024 12:13:44 +0100
Subject: [PATCH 1113/2811] Clarify code documentation

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8d1d2567c29..ba3926e83db 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -86,7 +86,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 

From 5a36521ce397b0cd4b7085f38b4fa73789c606c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 16:43:49 +0100
Subject: [PATCH 1114/2811] Remove deprecated backwards compatibility

I'd rather ship another breaking change than introduce a deprecation in a new major version
---
 .../Navigation/DocumentationSidebar.php       |  5 ----
 .../Views/SidebarFooterTextViewTest.php       |  9 ------
 .../Unit/DocumentationSidebarUnitTest.php     | 28 -------------------
 3 files changed, 42 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ba3926e83db..0698d8c9790 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -41,11 +41,6 @@ public function getFooter(): ?string
             return $option;
         }
 
-        if ($option === true) {
-            /** @deprecated Backwards compatibility */
-            return '[Back to home page](../)';
-        }
-
         return null;
     }
 
diff --git a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
index 717997f5442..a2347c3ad66 100644
--- a/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
+++ b/packages/framework/tests/Feature/Views/SidebarFooterTextViewTest.php
@@ -20,15 +20,6 @@ public function testSidebarFooterTextViewWithDefaultConfig()
         $view->assertSeeHtml('<a href="../">Back to home page</a>');
     }
 
-    public function testSidebarFooterTextViewWhenConfigOptionIsTrue()
-    {
-        Config::set('docs.sidebar.footer', true);
-
-        $view = $this->view(view('hyde::components.docs.sidebar-footer-text', $this->withSidebar()));
-
-        $view->assertSeeHtml('<a href="../">Back to home page</a>');
-    }
-
     public function testSidebarFooterTextViewWhenConfigOptionIsMarkdownString()
     {
         Config::set('docs.sidebar.footer', 'Your Markdown String Here');
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 8e1a5d3457e..968515677bd 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,20 +150,6 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
-    public function testGetFooterReturnsBackLinkWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertSame('[Back to home page](../)', (new DocumentationSidebar())->getFooter());
-    }
-
-    public function testGetFooterReturnsNullWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertNull((new DocumentationSidebar())->getFooter());
-    }
-
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();
@@ -199,20 +185,6 @@ public function testHasFooterReturnsTrueWhenConfigIsString()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
-    public function testHasFooterReturnsTrueWhenConfigIsTrue()
-    {
-        self::mockConfig(['docs.sidebar.footer' => true]);
-
-        $this->assertTrue((new DocumentationSidebar())->hasFooter());
-    }
-
-    public function testHasFooterReturnsFalseWhenConfigIsFalse()
-    {
-        self::mockConfig(['docs.sidebar.footer' => false]);
-
-        $this->assertFalse((new DocumentationSidebar())->hasFooter());
-    }
-
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From 51ccdf9b776a741840dce4b8e80c955b9115bc7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 16:55:12 +0100
Subject: [PATCH 1115/2811] Simplify method return

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0698d8c9790..bec3d72f6d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,13 +35,7 @@ public function getHeader(): string
 
     public function getFooter(): ?string
     {
-        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
-
-        if (is_string($option)) {
-            return $option;
-        }
-
-        return null;
+        return Config::getNullableString('docs.sidebar.footer', '[Back to home page](../)');
     }
 
     public function hasFooter(): bool

From ea180812679bb94ae2543d52851709de268438a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 17:02:53 +0100
Subject: [PATCH 1116/2811] Support setting sidebar footer to false to disable
 it

Revert "Simplify method return"

This reverts commit 51ccdf9b776a741840dce4b8e80c955b9115bc7d.

Apply fixes from StyleCI
---
 .../Features/Navigation/DocumentationSidebar.php   |  8 +++++++-
 .../tests/Unit/DocumentationSidebarUnitTest.php    | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bec3d72f6d5..0698d8c9790 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -35,7 +35,13 @@ public function getHeader(): string
 
     public function getFooter(): ?string
     {
-        return Config::getNullableString('docs.sidebar.footer', '[Back to home page](../)');
+        $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
+
+        if (is_string($option)) {
+            return $option;
+        }
+
+        return null;
     }
 
     public function hasFooter(): bool
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 968515677bd..c74453e4ba5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -150,6 +150,13 @@ public function testGetFooterReturnsStringWhenConfigIsString()
         $this->assertSame('Some footer content', (new DocumentationSidebar())->getFooter());
     }
 
+    public function testGetFooterReturnsNullWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertNull((new DocumentationSidebar())->getFooter());
+    }
+
     public function testIsCollapsibleReturnsTrueByDefault()
     {
         self::mockConfig();
@@ -185,6 +192,13 @@ public function testHasFooterReturnsTrueWhenConfigIsString()
         $this->assertTrue((new DocumentationSidebar())->hasFooter());
     }
 
+    public function testHasFooterReturnsFalseWhenConfigIsFalse()
+    {
+        self::mockConfig(['docs.sidebar.footer' => false]);
+
+        $this->assertFalse((new DocumentationSidebar())->hasFooter());
+    }
+
     public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
     {
         $this->assertFalse((new DocumentationSidebar())->hasGroups());

From dc6090f1570ce617aace88530deca9aff8f7a2a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:53:29 +0100
Subject: [PATCH 1117/2811] Set default group value to null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index a9cd1a6ca48..b0a04173ca6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -26,7 +26,7 @@ class NavItem implements Stringable
     protected ?Route $route;
     protected string $label;
     protected int $priority;
-    protected ?string $group;
+    protected ?string $group = null;
 
     /** @deprecated Use NavGroupItem::$items instead */
     protected array $items = [];

From 8bb37e61ce9c47cf6274fa1a07758de7dbace23c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:50:17 +0100
Subject: [PATCH 1118/2811] Only construct group if it is not null

---
 .../framework/src/Framework/Features/Navigation/NavItem.php  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index b0a04173ca6..69f26975cf0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -48,7 +48,10 @@ public function __construct(Route|string|null $destination, string $label, int $
         $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
-        $this->group = static::normalizeGroupKey($group);
+
+        if ($group !== null) {
+            $this->group = static::normalizeGroupKey($group);
+        }
     }
 
     /**

From fdf5b0e498d928f152510f8b4dcaefe71da05c57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:50:48 +0100
Subject: [PATCH 1119/2811] Remove null handling from normalization helper

---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 69f26975cf0..884dde190b9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -155,8 +155,8 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    protected static function normalizeGroupKey(?string $group): ?string
+    protected static function normalizeGroupKey(string $group): string
     {
-        return $group ? Str::slug($group) : null;
+        return Str::slug($group);
     }
 }

From 40a1e1f5609e0ee1b98f06869de7ea294f4f9bb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:55:43 +0100
Subject: [PATCH 1120/2811] Remove deprecated items array

---
 .../framework/src/Framework/Features/Navigation/NavItem.php    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 884dde190b9..eecd7b6d380 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -28,9 +28,6 @@ class NavItem implements Stringable
     protected int $priority;
     protected ?string $group = null;
 
-    /** @deprecated Use NavGroupItem::$items instead */
-    protected array $items = [];
-
     /**
      * Create a new navigation menu item.
      *

From 4d96b3cbe37e5256a3a83485ad033b7813d50705 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 19:59:58 +0100
Subject: [PATCH 1121/2811] Make normalization helper public

---
 .../src/Framework/Features/Navigation/NavItem.php        | 2 +-
 packages/framework/tests/Unit/NavItemTest.php            | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index eecd7b6d380..665df77770c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,7 +152,7 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    protected static function normalizeGroupKey(string $group): string
+    public static function normalizeGroupKey(string $group): string
     {
         return Str::slug($group);
     }
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 98093b7628e..413e4d8c265 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -275,4 +275,13 @@ public function testGroupKeysAreNormalized()
         $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
+
+    public function testNormalizeGroupKeyCreatesSlugs()
+    {
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
+    }
 }

From bc566258efedda25152ea093532ac10e5e9e9f26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:00:31 +0100
Subject: [PATCH 1122/2811] Use publicized normalization helper

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0698d8c9790..28bb987b15c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Str;
 
 use function app;
 use function is_string;
@@ -68,7 +67,7 @@ public function hasGroups(): bool
      */
     public function isGroupActive(string $group): bool
     {
-        $groupMatchesCurrentPageGroup = Str::slug(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
         $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
         return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;

From e81c079936ba5c5187d947af8a06d5b5b0226add Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:02:27 +0100
Subject: [PATCH 1123/2811] Revert "Remove null handling from normalization
 helper"

This reverts commit fdf5b0e498d928f152510f8b4dcaefe71da05c57.
---
 .../framework/src/Framework/Features/Navigation/NavItem.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 665df77770c..7354e76d588 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,8 +152,8 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
-    public static function normalizeGroupKey(string $group): string
+    public static function normalizeGroupKey(?string $group): ?string
     {
-        return Str::slug($group);
+        return $group ? Str::slug($group) : null;
     }
 }

From c6256c1bfa244404b0ea3f9d3202bcd84e76183c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:02:52 +0100
Subject: [PATCH 1124/2811] Test normalize group key returns null for null

---
 packages/framework/tests/Unit/NavItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 413e4d8c265..d38214d425e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -284,4 +284,9 @@ public function testNormalizeGroupKeyCreatesSlugs()
         $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
         $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
     }
+
+    public function testNormalizeGroupKeyReturnsNullForNull()
+    {
+        $this->assertNull(NavItem::normalizeGroupKey(null));
+    }
 }

From bccdb4a9aca1f80682bd92096fca1f3b0fb249fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:04:20 +0100
Subject: [PATCH 1125/2811] Document conditional return type

---
 packages/framework/src/Framework/Features/Navigation/NavItem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 7354e76d588..b6e4eec5ffa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -152,6 +152,7 @@ public function isActive(): bool
         return Hyde::currentRoute()->getLink() === $this->route->getLink();
     }
 
+    /** @return ($group is null ? null : string) */
     public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;

From c0de62e6b8cbb17ca26c55890165771c11eb7007 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:09:26 +0100
Subject: [PATCH 1126/2811] Refactor complex boolean returns to inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 28bb987b15c..28e9f273d85 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -68,9 +68,12 @@ public function hasGroups(): bool
     public function isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
-        $currentPageIsIndexPageAndShouldBeActive = $this->isCurrentPageIndexPage() && $this->shouldIndexPageBeActive($group);
 
-        return $groupMatchesCurrentPageGroup || $currentPageIsIndexPageAndShouldBeActive;
+        if ($this->isCurrentPageIndexPage()) {
+            return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
+        }
+
+        return $groupMatchesCurrentPageGroup;
     }
 
     private function isCurrentPageIndexPage(): bool

From a08e0a09634d3c4359393599c724b2787f037358 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:13:07 +0100
Subject: [PATCH 1127/2811] Remove unnecessary filtering logic

We know that this is only called for sidebars with groups, and we also know all root items are then groups, so we just need the first one
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 28e9f273d85..174626238c4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->firstWhere(fn (NavItem $item): bool => $item instanceof NavGroupItem);
+        $firstGroupInSidebar = $this->getItems()->first();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
 

From b17ffc964ab91cb1d7cbdb8893a4fd83d3944bef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:20:02 +0100
Subject: [PATCH 1128/2811] Remove null safe operator for evaluated state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 174626238c4..8a8f58f704f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -89,7 +89,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->first();
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar?->getGroupKey();
+        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 
         return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
     }

From 6c1201122d72ac0e0472a806613d45a7db98d15b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:20:36 +0100
Subject: [PATCH 1129/2811] Use first or fail to conform state

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8a8f58f704f..9625bb9ee71 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
 
-        $firstGroupInSidebar = $this->getItems()->first();
+        $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 

From b8adcf9bd6d4042b53d1c1f5e303646cac8a70ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:24:09 +0100
Subject: [PATCH 1130/2811] Replace return expression with conditional early
 return

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9625bb9ee71..1ad0ad2c6fc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -85,12 +85,14 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
 
-        $indexPageHasNoSetGroup = Render::getPage()->navigationMenuGroup() === null;
+        if (Render::getPage()->navigationMenuGroup() !== null) {
+            return false;
+        }
 
         $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
         $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
 
-        return $indexPageHasNoSetGroup && $groupIsTheFirstOneInSidebar;
+        return $groupIsTheFirstOneInSidebar;
     }
 }

From 2bcbb5ac3a2dfc653b4a0e3aadda9268d6895e20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:24:47 +0100
Subject: [PATCH 1131/2811] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1ad0ad2c6fc..85ea0f434dc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -91,8 +91,6 @@ private function shouldIndexPageBeActive(string $group): bool
 
         $firstGroupInSidebar = $this->getItems()->firstOrFail();
 
-        $groupIsTheFirstOneInSidebar = $group === $firstGroupInSidebar->getGroupKey();
-
-        return $groupIsTheFirstOneInSidebar;
+        return $group === $firstGroupInSidebar->getGroupKey();
     }
 }

From f92df80179ff39525f2f00f056fc922d729dfd78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:44:24 +0100
Subject: [PATCH 1132/2811] Clarify code comment language

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 85ea0f434dc..578346c6190 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -83,7 +83,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active when on the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
 
         if (Render::getPage()->navigationMenuGroup() !== null) {
             return false;

From eaa9ff9a2e817f864e5e642f96a31b3f8194b345 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:44:51 +0100
Subject: [PATCH 1133/2811] Use more fluent boolean logic

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 578346c6190..85c502e5006 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -10,6 +10,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
+use function filled;
 use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
@@ -85,7 +86,7 @@ private function shouldIndexPageBeActive(string $group): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
 
-        if (Render::getPage()->navigationMenuGroup() !== null) {
+        if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;
         }
 

From 598ff30d2fcfb8f78ff258efd84aff18902ecf80 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:10 +0100
Subject: [PATCH 1134/2811] Fix grammar

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 85c502e5006..a788f745e91 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -84,7 +84,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active visiting the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be active when visiting the index page.
 
         if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;

From 9c0954e3052f70eeb62b9e54fcb390c930a6c893 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:18 +0100
Subject: [PATCH 1135/2811] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a788f745e91..1795a691f5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -90,8 +90,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        $firstGroupInSidebar = $this->getItems()->firstOrFail();
-
-        return $group === $firstGroupInSidebar->getGroupKey();
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 }

From 564be4fffe18c4a440f0bc0a9b0b3265edb372f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:50:33 +0100
Subject: [PATCH 1136/2811] Clearer language

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1795a691f5c..0da7e4a4ed6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -84,7 +84,7 @@ private function isCurrentPageIndexPage(): bool
 
     private function shouldIndexPageBeActive(string $group): bool
     {
-        // Unless the index page has a specific group set, the first group in the sidebar should be active when visiting the index page.
+        // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
         if (filled(Render::getPage()->navigationMenuGroup())) {
             return false;

From 4aca10cd210fb4fa2184c0d8f09e7dd69fc8fc01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 20:55:48 +0100
Subject: [PATCH 1137/2811] Mark method as internal

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0da7e4a4ed6..c8bc17c9340 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,6 +62,8 @@ public function hasGroups(): bool
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
+     * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
+     *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      *
      * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.

From b3cf0108dab7b73ea8127ea5717cc69c6bb01115 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 20 Mar 2024 21:06:06 +0100
Subject: [PATCH 1138/2811] Breaking: Rename class NavItem to NavigationItem

---
 RELEASE_NOTES.md                              |  10 +-
 config/hyde.php                               |   2 +-
 docs/digging-deeper/navigation.md             |  18 +--
 packages/framework/config/hyde.php            |   2 +-
 .../views/layouts/navigation.blade.php        |   6 +-
 .../Navigation/DocumentationSidebar.php       |   6 +-
 .../Features/Navigation/NavGroupItem.php      |  14 +--
 .../{NavItem.php => NavigationItem.php}       |  10 +-
 .../Features/Navigation/NavigationMenu.php    |   8 +-
 .../Navigation/NavigationMenuGenerator.php    |  14 +--
 .../AutomaticNavigationConfigurationsTest.php |  16 +--
 .../tests/Feature/NavigationMenuTest.php      |  84 ++++++-------
 .../Services/DocumentationSidebarTest.php     |  42 +++----
 .../Unit/DocumentationSidebarUnitTest.php     |   6 +-
 .../framework/tests/Unit/NavGroupItemTest.php |  46 +++----
 ...p => NavigationItemIsActiveHelperTest.php} |  76 ++++++------
 ...NavItemTest.php => NavigationItemTest.php} | 112 +++++++++---------
 .../tests/Unit/NavigationMenuUnitTest.php     |   6 +-
 .../Unit/Views/NavigationLinkViewTest.php     |   4 +-
 19 files changed, 242 insertions(+), 240 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavItem.php => NavigationItem.php} (93%)
 rename packages/framework/tests/Unit/{NavItemIsActiveHelperTest.php => NavigationItemIsActiveHelperTest.php} (65%)
 rename packages/framework/tests/Unit/{NavItemTest.php => NavigationItemTest.php} (54%)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 01955fff841..1c7e3aa81e5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -12,15 +12,15 @@ This serves two purposes:
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 - Added a new `ExternalRoute` class to represent external routes.
-- Added a new `NavItem::getLink()` method contain the previous `NavItem::getDestination()` logic, to return the link URL.
+- Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
-- Breaking: The `NavItem` class now always stores the destination as a `Route` instance.
-- Breaking: The `NavItem::getDestination()` method now returns its `Route` instance.
+- Breaking: The `NavigationItem` class now always stores the destination as a `Route` instance.
+- Breaking: The `NavigationItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -63,11 +63,11 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ### Navigation item changes
 
-The `NavItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+The `NavigationItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
 
 If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
 
-If you want to retain the previous state where a string is always returned, you can use the new `NavItem::getLink()` method instead, which will resolve the route immediately.
+If you want to retain the previous state where a string is always returned, you can use the new `NavigationItem::getLink()` method instead, which will resolve the route immediately.
 
 ### HTML ID changes
 
diff --git a/config/hyde.php b/config/hyde.php
index 9cbbe1cceb3..65fa6d4394f 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index f36a2f9a761..761506488f2 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -230,18 +230,18 @@ To remove items from being automatically added, simply add the page's route key
 
 ### Adding Custom Navigation Menu Links
 
-You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavItem` model to the `navigation.custom` array.
+You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavigationItem` model to the `navigation.custom` array.
 
-When linking to an external site, you should use the `NavItem::forLink()` method facade. The first two arguments are the
+When linking to an external site, you should use the `NavigationItem::forLink()` method facade. The first two arguments are the
 destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
 
 ```php
 // filepath config/hyde.php
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
 'navigation' => [
     'custom' => [
-        NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+        NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
     ]
 ]
 ```
@@ -314,14 +314,14 @@ use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
 Within the `BaseNavigationMenu` class, you will find the main logic for how the menus are generated,
 while the child implementations contain the extra logic tailored for their specific use cases.
 
-All the navigation menus store the menu items in their `$items` array containing instances of the `NavItem` class.
+All the navigation menus store the menu items in their `$items` array containing instances of the `NavigationItem` class.
 
-The `NavItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
-Dropdowns are represented by `DropdownNavItem` instances, which extend the `NavItem` class and contain an array of additional `NavItem` instances.
+The `NavigationItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
+Dropdowns are represented by `DropdownNavigationItem` instances, which extend the `NavigationItem` class and contain an array of additional `NavigationItem` instances.
 
 ```php
-use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Framework\Features\Navigation\DropdownNavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
 ```
 
 ## The Navigation API
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 9cbbe1cceb3..65fa6d4394f 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index a55e64b5ea1..65b50f43bf0 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -17,13 +17,15 @@
             <svg x-show="! navigationOpen" title="Open Navigation Menu" class="dark:fill-gray-200"
                  style="display: block;"
                  id="open-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
-                 width="24"><title>Open Menu</title>
+                 width="24">
+                <title>Open Menu</title>
                 <path d="M0 0h24v24H0z" fill="none"/>
                 <path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
             </svg>
             <svg x-show="navigationOpen" title="Close Navigation Menu" class="dark:fill-gray-200" style="display: none;"
                  id="close-main-navigation-menu-icon" xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24"
-                 width="24"><title>Close Menu</title>
+                 width="24">
+                <title>Close Menu</title>
                 <path d="M0 0h24v24H0z" fill="none"></path>
                 <path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"></path>
             </svg>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c8bc17c9340..73a1300e338 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavItem $item): bool => $item instanceof NavGroupItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavGroupItem);
     }
 
     /**
@@ -66,11 +66,11 @@ public function hasGroups(): bool
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
      *
-     * We have this logic here because not all NavItem instances belong to sidebars, and we need data from both.
+     * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
     {
-        $groupMatchesCurrentPageGroup = NavItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 
         if ($this->isCurrentPageIndexPage()) {
             return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
index 72bd92a3ac8..78f41e30440 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
@@ -15,9 +15,9 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavGroupItem extends NavItem
+class NavGroupItem extends NavigationItem
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
@@ -32,7 +32,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
      *
      * For the main navigation menu, this stores any dropdown items.
      *
-     * @return array<\Hyde\Framework\Features\Navigation\NavItem>
+     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
      */
     public function getItems(): array
     {
@@ -42,7 +42,7 @@ public function getItems(): array
     /**
      * Add a navigation item to the grouped navigation item.
      */
-    public function addItem(NavItem $item): static
+    public function addItem(NavigationItem $item): static
     {
         $item->group ??= $this->group;
 
@@ -54,7 +54,7 @@ public function addItem(NavItem $item): static
     /**
      * Add multiple navigation items to the grouped navigation item.
      *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavItem>  $items
+     * @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items
      */
     public function addItems(array $items): static
     {
@@ -73,7 +73,7 @@ public function addItems(array $items): static
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
         }
 
         return parent::getPriority();
@@ -85,7 +85,7 @@ protected function containsOnlyDocumentationPages(): bool
             return false;
         }
 
-        return collect($this->getItems())->every(function (NavItem $child): bool {
+        return collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
similarity index 93%
rename from packages/framework/src/Framework/Features/Navigation/NavItem.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b6e4eec5ffa..c5c38c09227 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -18,10 +18,10 @@
  *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
- *   2. You can use NavItem::fromRoute() to use data from the route
- *   3. You can use NavItem::forLink() for an external or un-routed link
+ *   2. You can use NavigationItem::fromRoute() to use data from the route
+ *   3. You can use NavigationItem::forLink() for an external or un-routed link
  */
-class NavItem implements Stringable
+class NavigationItem implements Stringable
 {
     protected ?Route $route;
     protected string $label;
@@ -83,7 +83,7 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * Create a new dropdown navigation menu item.
      *
      * @param  string  $label  The label of the dropdown item.
-     * @param  array<NavItem>  $items  The items to be included in the dropdown.
+     * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
@@ -145,7 +145,7 @@ public function getGroupKey(): ?string
     }
 
     /**
-     * Check if the NavItem instance is the current page being rendered.
+     * Check if the NavigationItem instance is the current page being rendered.
      */
     public function isActive(): bool
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 979b952b95c..6876e1c003f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,7 +20,7 @@ abstract class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -41,7 +41,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem>
      */
     public function getItems(): Collection
     {
@@ -49,13 +49,13 @@ public function getItems(): Collection
         // so any sorting we do in generator actions will only be partial. This way, we can ensure
         // that the items are always freshly sorted by their priorities when they are retrieved.
 
-        return $this->items->sortBy(fn (NavItem $item) => $item->getPriority())->values();
+        return $this->items->sortBy(fn (NavigationItem $item) => $item->getPriority())->values();
     }
 
     /**
      * Add a navigation item to the navigation menu.
      */
-    public function add(NavItem $item): void
+    public function add(NavigationItem $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 5aacd70441e..fa15161c649 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -24,7 +24,7 @@
  */
 class NavigationMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
 
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavItem::forRoute($route));
+                    $this->items->put($route->getRouteKey(), NavigationItem::forRoute($route));
                 }
             }
         });
@@ -79,10 +79,10 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavItem::forRoute(DocumentationPage::home()));
+                $this->items->push(NavigationItem::forRoute(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavItem $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
             });
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavItem::forRoute($route);
+        $item = NavigationItem::forRoute($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
@@ -153,7 +153,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
 
         if ($group instanceof NavGroupItem) {
             return $group;
-        } elseif ($group instanceof NavItem) {
+        } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
@@ -177,7 +177,7 @@ protected function createGroupItem(string $groupKey, string $groupName): NavGrou
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
+        return NavigationItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index fa018501b9e..844c05ad9f2 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -17,7 +17,7 @@
 use Hyde\Support\Models\Redirect;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -33,7 +33,7 @@
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  */
 class AutomaticNavigationConfigurationsTest extends TestCase
 {
@@ -1281,7 +1281,7 @@ protected function sidebar(?array $withPages = null): AssertableNavigationMenu
     }
 }
 
-class TestNavItem
+class TestNavigationItem
 {
     public readonly string $label;
     public readonly ?string $group;
@@ -1293,7 +1293,7 @@ public function __construct(string $label, ?string $group, int $priority, array
         $this->label = $label;
         $this->group = $group;
         $this->priority = $priority;
-        $this->children = collect($children)->map(fn (NavItem $child) => $child->getLabel())->toArray();
+        $this->children = collect($children)->map(fn (NavigationItem $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
@@ -1319,12 +1319,12 @@ public function __construct(TestCase $test, $sidebar = false)
     /** A simplified serialized format for comparisons */
     public function state(): array
     {
-        return $this->items->map(function (NavItem $item): TestNavItem {
-            return new TestNavItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+        return $this->items->map(function (NavigationItem $item): TestNavigationItem {
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
         })->toArray();
     }
 
-    public function getState(int $index): ?TestNavItem
+    public function getState(int $index): ?TestNavigationItem
     {
         return $this->state()[$index] ?? null;
     }
@@ -1345,7 +1345,7 @@ public function assertEquals(array $expected, bool $strict = false): static
                 $item = ['label' => $item];
             }
 
-            foreach (TestNavItem::properties() as $property) {
+            foreach (TestNavigationItem::properties() as $property) {
                 if ($this->getState($index) !== null) {
                     if (isset($item[$property])) {
                         $a = $item[$property];
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2bd704cc40e..bfe6d4a7435 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
@@ -29,16 +29,16 @@ public function testConstructor()
         $this->assertInstanceOf(MainNavigationMenu::class, $this->createNavigationMenu());
     }
 
-    public function testGenerateMethodCreatesCollectionOfNavItems()
+    public function testGenerateMethodCreatesCollectionOfNavigationItems()
     {
         $this->assertInstanceOf(Collection::class, $this->createNavigationMenu()->getItems());
-        $this->assertContainsOnlyInstancesOf(NavItem::class, $this->createNavigationMenu()->getItems());
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $this->createNavigationMenu()->getItems());
     }
 
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo')),
-            NavItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -93,13 +93,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testExternalLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavItem::forLink('https://example.com', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('https://example.com', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('https://example.com', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('https://example.com', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -108,13 +108,13 @@ public function testExternalLinkCanBeAddedInConfig()
 
     public function testPathLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavItem::forLink('foo', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('foo', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -124,16 +124,16 @@ public function testPathLinkCanBeAddedInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('foo', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -143,16 +143,16 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('bar', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('foo', 'foo'),
-            NavItem::forLink('bar', 'foo'),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::forLink('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -163,14 +163,14 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
     {
         $this->file('_pages/foo.md');
 
-        config(['hyde.navigation.custom' => [NavItem::forLink('bar', 'Foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::forLink('bar', 'Foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forLink('bar', 'Foo'),
-            NavItem::forRoute(Routes::get('foo')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forLink('bar', 'Foo'),
+            NavigationItem::forRoute(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavItem::forRoute(Routes::get('index'))]);
+        $expected = collect([NavigationItem::forRoute(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forGroup('Foo', [
-                NavItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forGroup('Foo', [
+                NavigationItem::forRoute(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavItem::forRoute(Routes::get('index')),
-            NavItem::forRoute((new MarkdownPage('foo'))->getRoute()),
-            NavItem::forGroup('Bar', [
-                NavItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
+            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::forRoute((new MarkdownPage('foo'))->getRoute()),
+            NavigationItem::forGroup('Bar', [
+                NavigationItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
@@ -267,7 +267,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         Hyde::boot();
 
         $navigation = app('navigation.main');
-        $navigation->add(new NavItem(new ExternalRoute('/foo'), 'Foo'));
+        $navigation->add(new NavigationItem(new ExternalRoute('/foo'), 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 01aa15b3430..f5bbafa28ef 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -8,7 +8,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
@@ -23,7 +23,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
  * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
  */
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/a'), priority: 999),
-                NavItem::forRoute(Routes::get('docs/b'), priority: 999),
-                NavItem::forRoute(Routes::get('docs/c'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/a'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/b'), priority: 999),
+                NavigationItem::forRoute(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavigationItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
+                NavigationItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
+                NavigationItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavigationItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
+                NavigationItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
+                NavigationItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -267,11 +267,11 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavItem::forGroup('Bar', [
-                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                NavigationItem::forGroup('Bar', [
+                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavItem::forGroup('Foo', [
-                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                NavigationItem::forGroup('Foo', [
+                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -288,9 +288,9 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavItem::forGroup('Foo', [
-                    NavItem::forRoute(Routes::get('docs/bar'), priority: 999),
-                    NavItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                NavigationItem::forGroup('Foo', [
+                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/index'))]),
+            collect([NavigationItem::forRoute(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavItem::forRoute(Routes::get('docs/test-0'))]),
+            collect([NavigationItem::forRoute(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index c74453e4ba5..b4c88dbb64b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
@@ -225,8 +225,8 @@ protected function getItems(): array
         ];
     }
 
-    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/NavGroupItemTest.php
index c76f37aa346..2f98bb102f9 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/NavGroupItemTest.php
@@ -10,7 +10,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\HydeCoreExtension;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavGroupItem;
 
 /**
@@ -46,7 +46,7 @@ public function testDestinationIsAlwaysNull()
 
     public function testCanConstructWithChildren()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
@@ -55,7 +55,7 @@ public function testCanConstructWithChildren()
 
     public function testCanConstructWithChildrenWithoutRoute()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
@@ -64,7 +64,7 @@ public function testCanConstructWithChildrenWithoutRoute()
 
     public function testGetItems()
     {
-        $children = $this->createNavItems();
+        $children = $this->createNavigationItems();
         $item = new NavGroupItem('Foo', $children);
 
         $this->assertSame($children, $item->getItems());
@@ -78,7 +78,7 @@ public function testGetItemsWithNoItems()
     public function testCanAddItemToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addItem($child)->getItems());
     }
@@ -86,7 +86,7 @@ public function testCanAddItemToDropdown()
     public function testAddChildMethodReturnsSelf()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($group, $group->addItem($child));
     }
@@ -94,7 +94,7 @@ public function testAddChildMethodReturnsSelf()
     public function testCanAddMultipleItemsToDropdown()
     {
         $group = new NavGroupItem('Foo');
-        $items = $this->createNavItems();
+        $items = $this->createNavigationItems();
 
         $this->assertSame($items, $group->addItems($items)->getItems());
     }
@@ -109,7 +109,7 @@ public function testAddChildrenMethodReturnsSelf()
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $group->addItem($child);
 
@@ -120,7 +120,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
         $group = new NavGroupItem('Foo');
-        $child = new NavItem(new Route(new MarkdownPage()), 'Bar');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
 
@@ -140,7 +140,7 @@ public function testGetPriorityWithNoChildrenUsesGroupPriority()
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo', [new NavItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+        $group = new NavGroupItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
@@ -148,9 +148,9 @@ public function testGetPriorityWithChildrenUsesGroupPriority()
     public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
     {
         $items = [
-            new NavItem(new Route(new DocumentationPage()), 'Foo', 100),
-            new NavItem(new Route(new DocumentationPage()), 'Bar', 200),
-            new NavItem(new Route(new DocumentationPage()), 'Baz', 300),
+            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
         $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
@@ -162,7 +162,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
         $group = new NavGroupItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavItem(new Route(new $type()), 'Bar', 100);
+            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
             $group->addItem($child);
         }
 
@@ -171,37 +171,37 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('foo', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavItem('https://example.com', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     public function testForRoute()
     {
         $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
 
-        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(NavGroupItem::class, $item);
-        $this->assertSame(NavItem::class, $item::class);
+        $this->assertSame(NavigationItem::class, $item::class);
     }
 
     public function testForLink()
     {
         $item = NavGroupItem::forLink('foo', 'bar');
 
-        $this->assertInstanceOf(NavItem::class, $item);
+        $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(NavGroupItem::class, $item);
-        $this->assertSame(NavItem::class, $item::class);
+        $this->assertSame(NavigationItem::class, $item::class);
     }
 
-    protected function createNavItems(): array
+    protected function createNavigationItems(): array
     {
         return [
-            new NavItem(new Route(new InMemoryPage('foo')), 'Foo'),
-            new NavItem(new Route(new InMemoryPage('bar')), 'Bar'),
+            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
         ];
     }
 }
diff --git a/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
similarity index 65%
rename from packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
rename to packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index bbd6d82b4d2..9e861f587a9 100644
--- a/packages/framework/tests/Unit/NavItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Support\Models\RenderData;
@@ -14,11 +14,11 @@
 use Mockery;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationItemTest
  */
-class NavItemIsActiveHelperTest extends UnitTestCase
+class NavigationItemIsActiveHelperTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -34,205 +34,205 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavItem::forLink('index.html', 'Home')->isActive());
+        $this->assertTrue(NavigationItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('index.html', 'Home')->isActive());
+        $this->assertFalse(NavigationItem::forLink('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('foo/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo/baz/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavItem::forLink('/foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavItem::forLink('/foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavItem::forLink('/foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::forLink('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
similarity index 54%
rename from packages/framework/tests/Unit/NavItemTest.php
rename to packages/framework/tests/Unit/NavigationItemTest.php
index d38214d425e..a76b0c0bbb5 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -7,7 +7,7 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Facades\Render;
@@ -17,14 +17,14 @@
 use Mockery;
 
 /**
- * This unit test covers the basics of the NavItem class.
+ * This unit test covers the basics of the NavigationItem class.
  * For the full feature test, see the MainNavigationMenuTest class.
  *
- * @covers \Hyde\Framework\Features\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
- * @see \Hyde\Framework\Testing\Unit\NavItemIsActiveHelperTest
+ * @see \Hyde\Framework\Testing\Unit\NavigationItemIsActiveHelperTest
  */
-class NavItemTest extends UnitTestCase
+class NavigationItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -42,7 +42,7 @@ protected function setUp(): void
     public function testConstruct()
     {
         $route = new Route(new MarkdownPage());
-        $item = new NavItem($route, 'Test', 500);
+        $item = new NavigationItem($route, 'Test', 500);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -50,19 +50,19 @@ public function testConstruct()
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavItem($route, 'Home'))->getRoute());
+        $this->assertSame($route, (new NavigationItem($route, 'Home'))->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
 
-        $this->assertSame($route, (new NavItem('index', 'Home'))->getRoute());
+        $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
     }
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
-        $item = new NavItem('https://example.com', 'Home');
+        $item = new NavigationItem('https://example.com', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
         $this->assertSame('https://example.com', (string) $item->getRoute());
@@ -70,7 +70,7 @@ public function testPassingUrlToConstructorUsesExternalRoute()
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
-        $item = new NavItem('foo', 'Home');
+        $item = new NavigationItem('foo', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('foo', (string) $item->getRoute());
@@ -79,39 +79,39 @@ public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     public function testGetDestination()
     {
         $route = new Route(new InMemoryPage('foo'));
-        $navItem = new NavItem($route, 'Page', 500);
+        $NavigationItem = new NavigationItem($route, 'Page', 500);
 
-        $this->assertSame($route, $navItem->getRoute());
+        $this->assertSame($route, $NavigationItem->getRoute());
     }
 
     public function testGetLink()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $navItem->getUrl());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame('foo.html', $NavigationItem->getUrl());
     }
 
     public function testGetLabel()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('Page', $navItem->getLabel());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame('Page', $NavigationItem->getLabel());
     }
 
     public function testGetPriority()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame(500, $navItem->getPriority());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertSame(500, $NavigationItem->getPriority());
     }
 
     public function testGetGroup()
     {
-        $navItem = new NavItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($navItem->getGroupKey());
+        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
+        $this->assertNull($NavigationItem->getGroupKey());
     }
 
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavItem::forRoute($route);
+        $item = NavigationItem::forRoute($route);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -120,12 +120,12 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavItem::forRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavigationItem::forRoute(Routes::get('index')));
     }
 
     public function testForLink()
     {
-        $item = NavItem::forLink('foo', 'bar');
+        $item = NavigationItem::forLink('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
@@ -134,13 +134,13 @@ public function testForLink()
 
     public function testForLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forLink('foo', 'bar', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
     public function testForRoute()
     {
         $route = Routes::get('404');
-        $item = NavItem::forRoute($route, 'foo');
+        $item = NavigationItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -150,7 +150,7 @@ public function testForRoute()
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavItem::forRoute($route, 'foo');
+        $item = NavigationItem::forRoute($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -160,52 +160,52 @@ public function testForIndexRoute()
     public function testForRouteWithRouteKey()
     {
         $this->assertEquals(
-            NavItem::forRoute(Routes::get('index'), 'foo'),
-            NavItem::forRoute('index', 'foo')
+            NavigationItem::forRoute(Routes::get('index'), 'foo'),
+            NavigationItem::forRoute('index', 'foo')
         );
     }
 
     public function testForRouteWithMissingRouteKey()
     {
         $this->expectException(RouteNotFoundException::class);
-        NavItem::forRoute('foo', 'foo');
+        NavigationItem::forRoute('foo', 'foo');
     }
 
     public function testForRouteWithCustomPriority()
     {
-        $this->assertSame(100, NavItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
-    public function testRouteBasedNavItemDestinationsAreResolvedRelatively()
+    public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
     {
-        $item = NavItem::forGroup('foo', []);
+        $item = NavigationItem::forGroup('foo', []);
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getItems());
@@ -215,17 +215,17 @@ public function testDropdownFacade()
     public function testDropdownFacadeWithChildren()
     {
         $children = [
-            new NavItem(new Route(new MarkdownPage()), 'bar'),
+            new NavigationItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavItem::forGroup('foo', $children);
+        $item = NavigationItem::forGroup('foo', $children);
         $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavItem::forGroup('foo', [], 500);
+        $item = NavigationItem::forGroup('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }
@@ -236,8 +236,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
-        $this->assertFalse(NavItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
+        $this->assertTrue(NavigationItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavigationItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -246,47 +246,47 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavItem::forLink('foo', 'bar')->isActive());
-        $this->assertFalse(NavItem::forLink('https://example.com', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::forLink('foo', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::forLink('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()
     {
-        $this->assertNull((new NavItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
+        $this->assertNull((new NavigationItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
     }
 
     public function testGetGroupWithGroup()
     {
-        $this->assertSame('foo', (new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
+        $this->assertSame('foo', (new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
     }
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
+        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
     public function testGetGroupForRouteWithGroup()
     {
-        $this->assertSame('foo', NavItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
+        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
     {
-        $item = new NavItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
+        $item = new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
         $this->assertSame('foo-bar', $item->getGroupKey());
     }
 
     public function testNormalizeGroupKeyCreatesSlugs()
     {
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('Foo Bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo_bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey('foo-bar'));
-        $this->assertSame('foo-bar', NavItem::normalizeGroupKey(' foo bar '));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey(' foo bar '));
     }
 
     public function testNormalizeGroupKeyReturnsNullForNull()
     {
-        $this->assertNull(NavItem::normalizeGroupKey(null));
+        $this->assertNull(NavigationItem::normalizeGroupKey(null));
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 648bb55a092..0330f4a0916 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
@@ -121,8 +121,8 @@ protected function getItems(): array
         ];
     }
 
-    protected function item(string $destination, string $label, int $priority = 500): NavItem
+    protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index da60ae2934d..5f6f27eb683 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -9,7 +9,7 @@
 use Hyde\Testing\TestsBladeViews;
 use Hyde\Testing\Support\TestView;
 use Illuminate\View\ComponentAttributeBag;
-use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Testing\TestCase;
 
 /**
@@ -29,7 +29,7 @@ protected function setUp(): void
     protected function testView(): TestView
     {
         return $this->view(view('hyde::components.navigation.navigation-link', [
-            'item' => NavItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavigationItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From e46e6c386f21e590b488b26d4d1ac65984f5196e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 10:16:02 +0100
Subject: [PATCH 1139/2811] Rename class NavGroupItem to GroupedNavigationItem

---
 .../components/docs/sidebar-items.blade.php   |  2 +-
 .../views/layouts/navigation.blade.php        |  2 +-
 .../Navigation/DocumentationSidebar.php       |  2 +-
 ...roupItem.php => GroupedNavigationItem.php} |  2 +-
 .../Features/Navigation/NavigationItem.php    |  4 +-
 .../Navigation/NavigationMenuGenerator.php    |  8 +--
 .../AutomaticNavigationConfigurationsTest.php |  4 +-
 .../Unit/DocumentationSidebarUnitTest.php     |  6 +-
 ...Test.php => GroupedNavigationItemTest.php} | 58 +++++++++----------
 9 files changed, 44 insertions(+), 44 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{NavGroupItem.php => GroupedNavigationItem.php} (98%)
 rename packages/framework/tests/Unit/{NavGroupItemTest.php => GroupedNavigationItemTest.php} (67%)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index f0d4cb553f0..2cd3f7d17ff 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php /** @var \Hyde\Framework\Features\Navigation\NavGroupItem $group */ @endphp
+        @php /** @var \Hyde\Framework\Features\Navigation\GroupedNavigationItem $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 65b50f43bf0..5b766e4a77d 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -37,7 +37,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavGroupItem)
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\GroupedNavigationItem)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         <x-hyde::navigation.navigation-link :item="$item"/>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 73a1300e338..971fe2abf09 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavGroupItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof GroupedNavigationItem);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
similarity index 98%
rename from packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
rename to packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 78f41e30440..0d12290e855 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavGroupItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -15,7 +15,7 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavGroupItem extends NavigationItem
+class GroupedNavigationItem extends NavigationItem
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c5c38c09227..e9b6ef3a9a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -86,9 +86,9 @@ public static function forLink(string $href, string $label, int $priority = Navi
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavGroupItem
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): GroupedNavigationItem
     {
-        return new NavGroupItem($label, $items, $priority);
+        return new GroupedNavigationItem($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index fa15161c649..10d88a5e596 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,12 +146,12 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): NavGroupItem
+    protected function getOrCreateGroupItem(string $groupName): GroupedNavigationItem
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        if ($group instanceof NavGroupItem) {
+        if ($group instanceof GroupedNavigationItem) {
             return $group;
         } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
@@ -161,7 +161,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
             // Todo: Add note in documentation about this behavior
             // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
 
-            $item = new NavGroupItem($group->getLabel(), [], $group->getPriority());
+            $item = new GroupedNavigationItem($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);
 
@@ -171,7 +171,7 @@ protected function getOrCreateGroupItem(string $groupName): NavGroupItem
         return $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): NavGroupItem
+    protected function createGroupItem(string $groupKey, string $groupName): GroupedNavigationItem
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 844c05ad9f2..0230e570374 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavGroupItem ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof GroupedNavigationItem ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index b4c88dbb64b..dd9af5b4c06 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -204,13 +204,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavGroupItemInstance()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsGroupedNavigationItemInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
         $menu = new DocumentationSidebar([
-            new NavGroupItem('foo', []),
+            new GroupedNavigationItem('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());
diff --git a/packages/framework/tests/Unit/NavGroupItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
similarity index 67%
rename from packages/framework/tests/Unit/NavGroupItemTest.php
rename to packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 2f98bb102f9..282c78b5bbe 100644
--- a/packages/framework/tests/Unit/NavGroupItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -11,12 +11,12 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavGroupItem;
+use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
 
 /**
- * @covers \Hyde\Framework\Features\Navigation\NavGroupItem
+ * @covers \Hyde\Framework\Features\Navigation\GroupedNavigationItem
  */
-class NavGroupItemTest extends UnitTestCase
+class GroupedNavigationItemTest extends UnitTestCase
 {
     public static function setUpBeforeClass(): void
     {
@@ -26,28 +26,28 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
-        $this->assertSame('Foo', (new NavGroupItem('Foo'))->getLabel());
+        $this->assertSame('Foo', (new GroupedNavigationItem('Foo'))->getLabel());
     }
 
     public function testCanConstructWithPriority()
     {
-        $this->assertSame(500, (new NavGroupItem('Foo', priority: 500))->getPriority());
+        $this->assertSame(500, (new GroupedNavigationItem('Foo', priority: 500))->getPriority());
     }
 
     public function testDefaultPriorityValueIsLast()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testDestinationIsAlwaysNull()
     {
-        $this->assertNull((new NavGroupItem('Foo'))->getRoute());
+        $this->assertNull((new GroupedNavigationItem('Foo'))->getRoute());
     }
 
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
         $this->assertSame($children, $item->getItems());
@@ -56,7 +56,7 @@ public function testCanConstructWithChildren()
     public function testCanConstructWithChildrenWithoutRoute()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertCount(2, $item->getItems());
         $this->assertSame($children, $item->getItems());
@@ -65,19 +65,19 @@ public function testCanConstructWithChildrenWithoutRoute()
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
-        $item = new NavGroupItem('Foo', $children);
+        $item = new GroupedNavigationItem('Foo', $children);
 
         $this->assertSame($children, $item->getItems());
     }
 
     public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavGroupItem('Foo'))->getItems());
+        $this->assertEmpty((new GroupedNavigationItem('Foo'))->getItems());
     }
 
     public function testCanAddItemToDropdown()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame([$child], $group->addItem($child)->getItems());
@@ -85,7 +85,7 @@ public function testCanAddItemToDropdown()
 
     public function testAddChildMethodReturnsSelf()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $this->assertSame($group, $group->addItem($child));
@@ -93,7 +93,7 @@ public function testAddChildMethodReturnsSelf()
 
     public function testCanAddMultipleItemsToDropdown()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $items = $this->createNavigationItems();
 
         $this->assertSame($items, $group->addItems($items)->getItems());
@@ -101,14 +101,14 @@ public function testCanAddMultipleItemsToDropdown()
 
     public function testAddChildrenMethodReturnsSelf()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
 
         $this->assertSame($group, $group->addItems([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
         $group->addItem($child);
@@ -119,7 +119,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
     public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
@@ -130,17 +130,17 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
     public function testGetPriorityUsesDefaultPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithNoChildrenUsesGroupPriority()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo'))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
     }
 
     public function testGetPriorityWithChildrenUsesGroupPriority()
     {
-        $group = new NavGroupItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+        $group = new GroupedNavigationItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
 
         $this->assertSame(999, $group->getPriority());
     }
@@ -153,13 +153,13 @@ public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
             new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
         ];
 
-        $this->assertSame(100, (new NavGroupItem('Foo', $items))->getPriority());
-        $this->assertSame(100, (new NavGroupItem('Foo', array_reverse($items)))->getPriority());
+        $this->assertSame(100, (new GroupedNavigationItem('Foo', $items))->getPriority());
+        $this->assertSame(100, (new GroupedNavigationItem('Foo', array_reverse($items)))->getPriority());
     }
 
     public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
     {
-        $group = new NavGroupItem('Foo');
+        $group = new GroupedNavigationItem('Foo');
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
@@ -171,29 +171,29 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
     public function testGetPriorityHandlesStringUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
     }
 
     public function testGetPriorityHandlesExternalUrlChildGracefully()
     {
-        $this->assertSame(999, (new NavGroupItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
+        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
     public function testForRoute()
     {
-        $item = NavGroupItem::forRoute(new Route(new InMemoryPage('foo')));
+        $item = GroupedNavigationItem::forRoute(new Route(new InMemoryPage('foo')));
 
         $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
         $this->assertSame(NavigationItem::class, $item::class);
     }
 
     public function testForLink()
     {
-        $item = NavGroupItem::forLink('foo', 'bar');
+        $item = GroupedNavigationItem::forLink('foo', 'bar');
 
         $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavGroupItem::class, $item);
+        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
         $this->assertSame(NavigationItem::class, $item::class);
     }
 

From d76e78a787c2f908a20ce1f6faf48e6056958e33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 10:55:41 +0100
Subject: [PATCH 1140/2811] Add todos for methods to refactor

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index e9b6ef3a9a8..fdc4918c7f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,6 +54,8 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item leading to a Route instance.
      *
+     * TODO: Merge into a create method
+     *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
@@ -73,6 +75,8 @@ public static function forRoute(Route|string $route, ?string $label = null, ?int
 
     /**
      * Create a new navigation menu item leading to an external URI.
+     *
+     * TODO: Merge into a create method
      */
     public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
@@ -82,6 +86,8 @@ public static function forLink(string $href, string $label, int $priority = Navi
     /**
      * Create a new dropdown navigation menu item.
      *
+     * TODO: Move to GroupedNavigationItem::create()
+     *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.

From b629a4aa760070d61ccb5a391e8e74ce9c2bcbce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:00:36 +0100
Subject: [PATCH 1141/2811] Clarify constructor docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index fdc4918c7f5..fc3de7bdcb4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -29,7 +29,7 @@ class NavigationItem implements Stringable
     protected ?string $group = null;
 
     /**
-     * Create a new navigation menu item.
+     * Create a new navigation menu item with your own properties.
      *
      * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
      * @param  string  $label  The label of the navigation item.

From 1a679f2ae2c94421c540e06add0364dbe39580c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:07:52 +0100
Subject: [PATCH 1142/2811] Sketch out new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index fc3de7bdcb4..588cb75bc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -51,6 +51,14 @@ public function __construct(Route|string|null $destination, string $label, int $
         }
     }
 
+    /**
+     * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     */
+    public static function create(): static
+    {
+        // TODO: Implement create() method.
+    }
+
     /**
      * Create a new navigation menu item leading to a Route instance.
      *

From 4ec587ce12eab0afc6b3c0bbebc393a52f8c42f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:10:52 +0100
Subject: [PATCH 1143/2811] Copy over helper method signature

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 588cb75bc27..bc88505f60f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -53,8 +53,13 @@ public function __construct(Route|string|null $destination, string $label, int $
 
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     *
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
+     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
+     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function create(): static
+    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         // TODO: Implement create() method.
     }

From 151f6238ffdd87f3a508630ce96e04399058e5cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:12:42 +0100
Subject: [PATCH 1144/2811] Move logic to new method

---
 .../Features/Navigation/NavigationItem.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bc88505f60f..d7036e51a3c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,14 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
-        // TODO: Implement create() method.
+        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+
+        return new self(
+            $route,
+            $label ?? $route->getPage()->navigationMenuLabel(),
+            $priority ?? $route->getPage()->navigationMenuPriority(),
+            $group ?? $route->getPage()->navigationMenuGroup(),
+        );
     }
 
     /**
@@ -76,14 +83,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
      */
     public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
-
-        return new self(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        return self::create($route, $label, $priority, $group);
     }
 
     /**

From 98f9ac939bb4cea2fb072d2e9582bdea8e07acdd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:17:32 +0100
Subject: [PATCH 1145/2811] Change static return type to self

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index d7036e51a3c..66219b60a3f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -59,7 +59,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
      */
-    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 

From d62e3d344b7a7c77ed64a6540d8ec079c6555a2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:44:49 +0100
Subject: [PATCH 1146/2811] Replace NavigationItem `forRoute` method with
 `create`

---
 .../Features/Navigation/NavigationItem.php    | 15 ------
 .../Navigation/NavigationMenuGenerator.php    |  6 +--
 .../tests/Feature/NavigationMenuTest.php      | 44 +++++++++---------
 .../Services/DocumentationSidebarTest.php     | 32 ++++++-------
 .../tests/Unit/GroupedNavigationItemTest.php  |  4 +-
 .../Unit/NavigationItemIsActiveHelperTest.php | 26 +++++------
 .../tests/Unit/NavigationItemTest.php         | 46 +++++++++----------
 .../Unit/Views/NavigationLinkViewTest.php     |  2 +-
 8 files changed, 80 insertions(+), 95 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 66219b60a3f..61b9ce38eba 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -71,21 +71,6 @@ public static function create(Route|string $route, ?string $label = null, ?int $
         );
     }
 
-    /**
-     * Create a new navigation menu item leading to a Route instance.
-     *
-     * TODO: Merge into a create method
-     *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
-     */
-    public static function forRoute(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
-    {
-        return self::create($route, $label, $priority, $group);
-    }
-
     /**
      * Create a new navigation menu item leading to an external URI.
      *
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 10d88a5e596..cc31f8d5cff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -71,7 +71,7 @@ protected function generate(): void
                 if ($this->canGroupRoute($route)) {
                     $this->addRouteToGroup($route);
                 } else {
-                    $this->items->put($route->getRouteKey(), NavigationItem::forRoute($route));
+                    $this->items->put($route->getRouteKey(), NavigationItem::create($route));
                 }
             }
         });
@@ -79,7 +79,7 @@ protected function generate(): void
         if ($this->generatesSidebar) {
             // If there are no pages other than the index page, we add it to the sidebar so that it's not empty
             if ($this->items->count() === 0 && DocumentationPage::home() !== null) {
-                $this->items->push(NavigationItem::forRoute(DocumentationPage::home()));
+                $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
@@ -133,7 +133,7 @@ protected function canGroupRoute(Route $route): bool
 
     protected function addRouteToGroup(Route $route): void
     {
-        $item = NavigationItem::forRoute($route);
+        $item = NavigationItem::create($route);
 
         $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index bfe6d4a7435..2aa73a6e0ac 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -38,7 +38,7 @@ public function testGenerateMethodCreatesCollectionOfNavigationItems()
     public function testGetItemsReturnsItems()
     {
         $this->assertEquals(collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
         ]), $this->createNavigationMenu()->getItems());
     }
 
@@ -67,9 +67,9 @@ public function testCreatedCollectionIsSortedByNavigationMenuPriority()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo')),
-            NavigationItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo')),
+            NavigationItem::create(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -83,8 +83,8 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -98,7 +98,7 @@ public function testExternalLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('https://example.com', 'foo'),
         ]);
 
@@ -113,7 +113,7 @@ public function testPathLinkCanBeAddedInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
         ]);
 
@@ -131,7 +131,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
             NavigationItem::forLink('foo', 'foo'),
         ]);
@@ -150,7 +150,7 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestina
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('foo', 'foo'),
             NavigationItem::forLink('bar', 'foo'),
         ]);
@@ -168,9 +168,9 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forLink('bar', 'Foo'),
-            NavigationItem::forRoute(Routes::get('foo')),
+            NavigationItem::create(Routes::get('foo')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -185,8 +185,8 @@ public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('docs/index')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('docs/index')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -199,7 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
-        $expected = collect([NavigationItem::forRoute(Routes::get('index'))]);
+        $expected = collect([NavigationItem::create(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
         $this->assertEquals($expected, $menu->getItems());
@@ -213,8 +213,8 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute(Routes::get('foo/bar')),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create(Routes::get('foo/bar')),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -229,9 +229,9 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
         $menu = $this->createNavigationMenu();
         $expected = collect([
-            NavigationItem::forRoute(Routes::get('index')),
+            NavigationItem::create(Routes::get('index')),
             NavigationItem::forGroup('Foo', [
-                NavigationItem::forRoute(Routes::get('foo/bar')),
+                NavigationItem::create(Routes::get('foo/bar')),
             ]),
         ]);
 
@@ -249,10 +249,10 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         $this->assertCount(3, $menu->getItems());
         $this->assertEquals([
-            NavigationItem::forRoute(Routes::get('index')),
-            NavigationItem::forRoute((new MarkdownPage('foo'))->getRoute()),
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create((new MarkdownPage('foo'))->getRoute()),
             NavigationItem::forGroup('Bar', [
-                NavigationItem::forRoute((new MarkdownPage('bar/baz'))->getRoute()),
+                NavigationItem::create((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
     }
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f5bbafa28ef..454cf6ecd05 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -86,9 +86,9 @@ public function testSidebarIsOrderedAlphabeticallyWhenNoOrderIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/a'), priority: 999),
-                NavigationItem::forRoute(Routes::get('docs/b'), priority: 999),
-                NavigationItem::forRoute(Routes::get('docs/c'), priority: 999),
+                NavigationItem::create(Routes::get('docs/a'), priority: 999),
+                NavigationItem::create(Routes::get('docs/b'), priority: 999),
+                NavigationItem::create(Routes::get('docs/c'), priority: 999),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -107,9 +107,9 @@ public function testSidebarIsOrderedByPriorityWhenPriorityIsSetInConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/c'), priority: 250 + 250),
-                NavigationItem::forRoute(Routes::get('docs/b'), priority: 250 + 251),
-                NavigationItem::forRoute(Routes::get('docs/a'), priority: 250 + 252),
+                NavigationItem::create(Routes::get('docs/c'), priority: 250 + 250),
+                NavigationItem::create(Routes::get('docs/b'), priority: 250 + 251),
+                NavigationItem::create(Routes::get('docs/a'), priority: 250 + 252),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -146,9 +146,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forRoute(Routes::get('docs/first'), priority: 250 + 250),
-                NavigationItem::forRoute(Routes::get('docs/second'), priority: 250 + 252),
-                NavigationItem::forRoute(Routes::get('docs/third'), priority: 250 + 300),
+                NavigationItem::create(Routes::get('docs/first'), priority: 250 + 250),
+                NavigationItem::create(Routes::get('docs/second'), priority: 250 + 252),
+                NavigationItem::create(Routes::get('docs/third'), priority: 250 + 300),
             ]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
@@ -195,7 +195,7 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         Filesystem::touch('_docs/index.md');
 
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999)]),
+            collect([NavigationItem::create(Routes::get('docs/foo'), priority: 999)]),
             NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()
         );
     }
@@ -268,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
         $this->assertEquals(
             collect([
                 NavigationItem::forGroup('Bar', [
-                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                 ]),
                 NavigationItem::forGroup('Foo', [
-                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -289,8 +289,8 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
         $this->assertEquals(
             collect([
                 NavigationItem::forGroup('Foo', [
-                    NavigationItem::forRoute(Routes::get('docs/bar'), priority: 999),
-                    NavigationItem::forRoute(Routes::get('docs/foo'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/bar'), priority: 999),
+                    NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
             $sidebar->getItems()
@@ -312,7 +312,7 @@ public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/index'))]),
+            collect([NavigationItem::create(Routes::get('docs/index'))]),
             $sidebar->getItems()
         );
     }
@@ -325,7 +325,7 @@ public function testIndexPageNotAddedToSidebarWhenOtherPagesExist()
 
         $this->assertCount(1, $sidebar->getItems());
         $this->assertEquals(
-            collect([NavigationItem::forRoute(Routes::get('docs/test-0'))]),
+            collect([NavigationItem::create(Routes::get('docs/test-0'))]),
             $sidebar->getItems()
         );
     }
diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 282c78b5bbe..fdc9f2b3f2b 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -179,9 +179,9 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    public function testForRoute()
+    public function testCreate()
     {
-        $item = GroupedNavigationItem::forRoute(new Route(new InMemoryPage('foo')));
+        $item = GroupedNavigationItem::create(new Route(new InMemoryPage('foo')));
 
         $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
diff --git a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index 9e861f587a9..b5a089ff0db 100644
--- a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -34,19 +34,19 @@ protected function tearDown(): void
     public function testIsCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavigationItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertTrue(NavigationItem::create(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLink()
@@ -58,13 +58,13 @@ public function testIsCurrentUsingCurrentLink()
     public function testIsCurrentWhenNotCurrent()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentRoute()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute(Routes::get('index'))->isActive());
+        $this->assertFalse(NavigationItem::create(Routes::get('index'))->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLink()
@@ -76,49 +76,49 @@ public function testIsCurrentUsingNotCurrentLink()
     public function testIsCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertTrue(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertTrue(NavigationItem::create($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNested()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/baz/bar'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/baz/bar'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNested()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo/bar/baz'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo/bar/baz'))->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forRoute($this->makeRoute('foo'))->isActive());
+        $this->assertFalse(NavigationItem::create($this->makeRoute('foo'))->isActive());
     }
 
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a76b0c0bbb5..fe3f5c35d10 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -111,7 +111,7 @@ public function testGetGroup()
     public function testFromRoute()
     {
         $route = new Route(new MarkdownPage());
-        $item = NavigationItem::forRoute($route);
+        $item = NavigationItem::create($route);
 
         $this->assertSame($route, $item->getRoute());
     }
@@ -120,7 +120,7 @@ public function testToString()
     {
         Render::shouldReceive('getRouteKey')->once()->andReturn('index');
 
-        $this->assertSame('index.html', (string) NavigationItem::forRoute(Routes::get('index')));
+        $this->assertSame('index.html', (string) NavigationItem::create(Routes::get('index')));
     }
 
     public function testForLink()
@@ -137,10 +137,10 @@ public function testForLinkWithCustomPriority()
         $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }
 
-    public function testForRoute()
+    public function testCreate()
     {
         $route = Routes::get('404');
-        $item = NavigationItem::forRoute($route, 'foo');
+        $item = NavigationItem::create($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
@@ -150,30 +150,30 @@ public function testForRoute()
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavigationItem::forRoute($route, 'foo');
+        $item = NavigationItem::create($route, 'foo');
 
         $this->assertSame($route, $item->getRoute());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
     }
 
-    public function testForRouteWithRouteKey()
+    public function testCreateWithRouteKey()
     {
         $this->assertEquals(
-            NavigationItem::forRoute(Routes::get('index'), 'foo'),
-            NavigationItem::forRoute('index', 'foo')
+            NavigationItem::create(Routes::get('index'), 'foo'),
+            NavigationItem::create('index', 'foo')
         );
     }
 
-    public function testForRouteWithMissingRouteKey()
+    public function testCreateWithMissingRouteKey()
     {
         $this->expectException(RouteNotFoundException::class);
-        NavigationItem::forRoute('foo', 'foo');
+        NavigationItem::create('foo', 'foo');
     }
 
-    public function testForRouteWithCustomPriority()
+    public function testCreateWithCustomPriority()
     {
-        $this->assertSame(100, NavigationItem::forRoute(Routes::get('index'), 'foo', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
     public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
@@ -183,24 +183,24 @@ public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
             'getRouteKey' => 'foo',
         ]));
 
-        $this->assertSame('foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar')),
             'getRouteKey' => 'foo/bar',
         ]));
 
-        $this->assertSame('../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
 
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo/bar/baz')),
             'getRouteKey' => 'foo/bar/baz',
         ]));
 
-        $this->assertSame('../../foo.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo'))));
-        $this->assertSame('../../foo/bar.html', (string) NavigationItem::forRoute(new Route(new InMemoryPage('foo/bar'))));
+        $this->assertSame('../../foo.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo'))));
+        $this->assertSame('../../foo/bar.html', (string) NavigationItem::create(new Route(new InMemoryPage('foo/bar'))));
     }
 
     public function testDropdownFacade()
@@ -236,8 +236,8 @@ public function testIsCurrent()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertTrue(NavigationItem::forRoute(new Route(new InMemoryPage('foo')))->isActive());
-        $this->assertFalse(NavigationItem::forRoute(new Route(new InMemoryPage('bar')))->isActive());
+        $this->assertTrue(NavigationItem::create(new Route(new InMemoryPage('foo')))->isActive());
+        $this->assertFalse(NavigationItem::create(new Route(new InMemoryPage('bar')))->isActive());
     }
 
     public function testIsCurrentWithExternalRoute()
@@ -262,12 +262,12 @@ public function testGetGroupWithGroup()
 
     public function testGetGroupFromRouteWithGroup()
     {
-        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
+        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
     }
 
-    public function testGetGroupForRouteWithGroup()
+    public function testGetGroupCreateWithGroup()
     {
-        $this->assertSame('foo', NavigationItem::forRoute(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
+        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
     }
 
     public function testGroupKeysAreNormalized()
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 5f6f27eb683..de571ed18df 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
     protected function testView(): TestView
     {
         return $this->view(view('hyde::components.navigation.navigation-link', [
-            'item' => NavigationItem::forRoute(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavigationItem::create(new Route(new InMemoryPage('foo')), 'Foo'),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }

From a3659dd3cde634bee8f56f2fe0c86bdd62367a91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 11:49:24 +0100
Subject: [PATCH 1147/2811] Resolve route data only for routes

---
 .../Features/Navigation/NavigationItem.php         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 61b9ce38eba..6449710a636 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -63,12 +63,14 @@ public static function create(Route|string $route, ?string $label = null, ?int $
     {
         $route = $route instanceof Route ? $route : Routes::getOrFail($route);
 
-        return new self(
-            $route,
-            $label ?? $route->getPage()->navigationMenuLabel(),
-            $priority ?? $route->getPage()->navigationMenuPriority(),
-            $group ?? $route->getPage()->navigationMenuGroup(),
-        );
+        if ($route instanceof Route) {
+            return new self(
+                $route,
+                $label ?? $route->getPage()->navigationMenuLabel(),
+                $priority ?? $route->getPage()->navigationMenuPriority(),
+                $group ?? $route->getPage()->navigationMenuGroup(),
+            );
+        }
     }
 
     /**

From 374fba7503be5974e85ac8f9acde6b0253fee30d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:04:30 +0100
Subject: [PATCH 1148/2811] Replace ternary assignment with if else block

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6449710a636..50b6f1734d8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,11 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        $route = $route instanceof Route ? $route : Routes::getOrFail($route);
+        if ($route instanceof Route) {
+            $route = $route;
+        } else {
+            $route = Routes::getOrFail($route);
+        }
 
         if ($route instanceof Route) {
             return new self(

From 13d7d4690f649bc4e2e8f73ec52b4a6d3e64b459 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:07:12 +0100
Subject: [PATCH 1149/2811] Simplify if else block

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 50b6f1734d8..bdb5c0c0d9b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,9 +61,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if ($route instanceof Route) {
-            $route = $route;
-        } else {
+        if (! $route instanceof Route) {
             $route = Routes::getOrFail($route);
         }
 

From 7369f827e154807f5f3672b65d7595f492580a3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:10:37 +0100
Subject: [PATCH 1150/2811] Use get instead of get or fail

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bdb5c0c0d9b..31aa5aef289 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -62,7 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         if (! $route instanceof Route) {
-            $route = Routes::getOrFail($route);
+            $route = Routes::get($route);
         }
 
         if ($route instanceof Route) {

From 6139fd79209a6dd319557841fac7876532e06876 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:03 +0100
Subject: [PATCH 1151/2811] Add auxiliary type check

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 31aa5aef289..3f65865e6d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -65,7 +65,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
             $route = Routes::get($route);
         }
 
-        if ($route instanceof Route) {
+        if ($route instanceof Route && ! $route instanceof ExternalRoute) {
             return new self(
                 $route,
                 $label ?? $route->getPage()->navigationMenuLabel(),

From 54b6c77f84fcf5c6896ea8823baf5c8a731e7483 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:21 +0100
Subject: [PATCH 1152/2811] Null coalesce to external route

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 3f65865e6d2..aa1e97af2c1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -62,7 +62,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
         if (! $route instanceof Route) {
-            $route = Routes::get($route);
+            $route = Routes::get($route) ?? new ExternalRoute($route);
         }
 
         if ($route instanceof Route && ! $route instanceof ExternalRoute) {

From bece9050181da55f13d3f9d81d565254335bdc1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:12:48 +0100
Subject: [PATCH 1153/2811] Add default branch to return new self

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index aa1e97af2c1..ae590057f25 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -73,6 +73,8 @@ public static function create(Route|string $route, ?string $label = null, ?int $
                 $group ?? $route->getPage()->navigationMenuGroup(),
             );
         }
+
+        return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 62a01c754159c2761af6e741b3a1e84a144ac812 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:13:51 +0100
Subject: [PATCH 1154/2811] Expect external route instead of exception

---
 packages/framework/tests/Unit/NavigationItemTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index fe3f5c35d10..1c48e6cf307 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
@@ -167,8 +166,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->expectException(RouteNotFoundException::class);
-        NavigationItem::create('foo', 'foo');
+        $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 
     public function testCreateWithCustomPriority()

From d521a1360ab0c716498bd69f43650d276de25f15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:37:20 +0100
Subject: [PATCH 1155/2811] Update helper to defer to new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ae590057f25..f4fa5a7eed9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -84,7 +84,7 @@ public static function create(Route|string $route, ?string $label = null, ?int $
      */
     public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
     {
-        return new self($href, $label, $priority);
+        return self::create($href, $label, $priority);
     }
 
     /**

From c9088b37f24bf855698eed91f73c76934363d54e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:44:30 +0100
Subject: [PATCH 1156/2811] Update test names

---
 packages/framework/tests/Unit/GroupedNavigationItemTest.php | 2 +-
 packages/framework/tests/Unit/NavigationItemTest.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index fdc9f2b3f2b..7647f536819 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -188,7 +188,7 @@ public function testCreate()
         $this->assertSame(NavigationItem::class, $item::class);
     }
 
-    public function testForLink()
+    public function testCreateWithLink()
     {
         $item = GroupedNavigationItem::forLink('foo', 'bar');
 
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 1c48e6cf307..9825faba539 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -122,7 +122,7 @@ public function testToString()
         $this->assertSame('index.html', (string) NavigationItem::create(Routes::get('index')));
     }
 
-    public function testForLink()
+    public function testCreateWithLink()
     {
         $item = NavigationItem::forLink('foo', 'bar');
 
@@ -131,7 +131,7 @@ public function testForLink()
         $this->assertSame(500, $item->getPriority());
     }
 
-    public function testForLinkWithCustomPriority()
+    public function testCreateWithLinkWithCustomPriority()
     {
         $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
     }

From 83c57f076a914ae1f878ea8cf62d33fe50100d7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:45:52 +0100
Subject: [PATCH 1157/2811] Replace NavigationItem `forLink` method with
 `create`

---
 config/hyde.php                               |  2 +-
 docs/digging-deeper/navigation.md             |  4 +-
 packages/framework/config/hyde.php            |  2 +-
 .../Features/Navigation/NavigationItem.php    | 12 +-----
 .../tests/Feature/NavigationMenuTest.php      | 28 ++++++-------
 .../tests/Unit/GroupedNavigationItemTest.php  |  2 +-
 .../Unit/NavigationItemIsActiveHelperTest.php | 42 +++++++++----------
 .../tests/Unit/NavigationItemTest.php         |  8 ++--
 8 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 65fa6d4394f..c91370adce7 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 761506488f2..b904b37bbbd 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -232,7 +232,7 @@ To remove items from being automatically added, simply add the page's route key
 
 You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavigationItem` model to the `navigation.custom` array.
 
-When linking to an external site, you should use the `NavigationItem::forLink()` method facade. The first two arguments are the
+When linking to an external site, you should use the `NavigationItem::create()` method facade. The first two arguments are the
 destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
 
 ```php
@@ -241,7 +241,7 @@ use Hyde\Framework\Features\Navigation\NavigationItem;
 
 'navigation' => [
     'custom' => [
-        NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+        NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
     ]
 ]
 ```
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 65fa6d4394f..c91370adce7 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -350,7 +350,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::forLink('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f4fa5a7eed9..1d4105be39d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -19,7 +19,7 @@
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route
- *   3. You can use NavigationItem::forLink() for an external or un-routed link
+ *   3. You can use NavigationItem::create() for an external or un-routed link
  */
 class NavigationItem implements Stringable
 {
@@ -77,16 +77,6 @@ public static function create(Route|string $route, ?string $label = null, ?int $
         return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
-    /**
-     * Create a new navigation menu item leading to an external URI.
-     *
-     * TODO: Merge into a create method
-     */
-    public static function forLink(string $href, string $label, int $priority = NavigationMenu::DEFAULT): self
-    {
-        return self::create($href, $label, $priority);
-    }
-
     /**
      * Create a new dropdown navigation menu item.
      *
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2aa73a6e0ac..2c81be2ea36 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -93,13 +93,13 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
 
     public function testExternalLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('https://example.com', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('https://example.com', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('https://example.com', 'foo'),
+            NavigationItem::create('https://example.com', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -108,13 +108,13 @@ public function testExternalLinkCanBeAddedInConfig()
 
     public function testPathLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('foo', 'foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('foo', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -124,16 +124,16 @@ public function testPathLinkCanBeAddedInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('foo', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -143,16 +143,16 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('bar', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('bar', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('foo', 'foo'),
-            NavigationItem::forLink('bar', 'foo'),
+            NavigationItem::create('foo', 'foo'),
+            NavigationItem::create('bar', 'foo'),
         ]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -163,13 +163,13 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
     {
         $this->file('_pages/foo.md');
 
-        config(['hyde.navigation.custom' => [NavigationItem::forLink('bar', 'Foo')]]);
+        config(['hyde.navigation.custom' => [NavigationItem::create('bar', 'Foo')]]);
 
         $menu = $this->createNavigationMenu();
 
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forLink('bar', 'Foo'),
+            NavigationItem::create('bar', 'Foo'),
             NavigationItem::create(Routes::get('foo')),
         ]);
 
diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
index 7647f536819..d08dfc1a740 100644
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
@@ -190,7 +190,7 @@ public function testCreate()
 
     public function testCreateWithLink()
     {
-        $item = GroupedNavigationItem::forLink('foo', 'bar');
+        $item = GroupedNavigationItem::create('foo', 'bar');
 
         $this->assertInstanceOf(NavigationItem::class, $item);
         $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
diff --git a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
index b5a089ff0db..e747d0b9f0f 100644
--- a/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
+++ b/packages/framework/tests/Unit/NavigationItemIsActiveHelperTest.php
@@ -52,7 +52,7 @@ public function testIsCurrentUsingCurrentRoute()
     public function testIsCurrentUsingCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('index'));
-        $this->assertTrue(NavigationItem::forLink('index.html', 'Home')->isActive());
+        $this->assertTrue(NavigationItem::create('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrent()
@@ -70,7 +70,7 @@ public function testIsCurrentUsingNotCurrentRoute()
     public function testIsCurrentUsingNotCurrentLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('index.html', 'Home')->isActive());
+        $this->assertFalse(NavigationItem::create('index.html', 'Home')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPage()
@@ -124,115 +124,115 @@ public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverse
     public function testIsCurrentUsingCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentUsingNotCurrentLinkWithNestedCurrentPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenNotCurrentWithNestedCurrentPageAndSubjectPage()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz/bar.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz/bar.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo.html', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo.html', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenVeryNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo/baz/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/baz/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo/bar/baz', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenVeryDifferingNestedInverseUsingPrettyLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithAbsoluteLink()
     {
         $this->mockRenderData($this->makeRoute('foo'));
-        $this->assertFalse(NavigationItem::forLink('/foo', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo', 'foo')->isActive());
     }
 
     public function testIsCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar'));
-        $this->assertFalse(NavigationItem::forLink('/foo/bar', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo/bar', 'foo')->isActive());
     }
 
     public function testIsCurrentWhenCurrentWithNestedCurrentPageWhenNestedUsingAbsoluteLinkItem()
     {
         $this->mockRenderData($this->makeRoute('foo/bar/baz'));
-        $this->assertFalse(NavigationItem::forLink('/foo/bar/baz', 'foo')->isActive());
+        $this->assertFalse(NavigationItem::create('/foo/bar/baz', 'foo')->isActive());
     }
 
     protected function mockRenderData(Route $route): void
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 9825faba539..4f6894c93c5 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -124,7 +124,7 @@ public function testToString()
 
     public function testCreateWithLink()
     {
-        $item = NavigationItem::forLink('foo', 'bar');
+        $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
         $this->assertSame('bar', $item->getLabel());
@@ -133,7 +133,7 @@ public function testCreateWithLink()
 
     public function testCreateWithLinkWithCustomPriority()
     {
-        $this->assertSame(100, NavigationItem::forLink('foo', 'bar', 100)->getPriority());
+        $this->assertSame(100, NavigationItem::create('foo', 'bar', 100)->getPriority());
     }
 
     public function testCreate()
@@ -244,8 +244,8 @@ public function testIsCurrentWithExternalRoute()
             'getRoute' => new Route(new InMemoryPage('foo')),
             'getRouteKey' => 'foo',
         ]));
-        $this->assertFalse(NavigationItem::forLink('foo', 'bar')->isActive());
-        $this->assertFalse(NavigationItem::forLink('https://example.com', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
+        $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
 
     public function testGetGroupWithNoGroup()

From 495ee7dc0438ee8eb4071547aaee37b85efe5859 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:49:33 +0100
Subject: [PATCH 1158/2811] Normalize comparison with constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1d4105be39d..62a4610117b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -61,7 +61,7 @@ public function __construct(Route|string|null $destination, string $label, int $
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (! $route instanceof Route) {
+        if (is_string($route)) {
             $route = Routes::get($route) ?? new ExternalRoute($route);
         }
 

From bd773c04635bae14d4c15cc5d9b7d9317d94b712 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:49:51 +0100
Subject: [PATCH 1159/2811] Update parameter docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 62a4610117b..840c528feb0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.

From fd65310f39764f33115f74178273ee171c196855 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:50:24 +0100
Subject: [PATCH 1160/2811] Update parameter docs

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 840c528feb0..00e72c03c76 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -55,9 +55,9 @@ public function __construct(Route|string|null $destination, string $label, int $
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page.
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
+     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
+     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {

From 41416cd1960fd40f573539cd6a202857a7edc423 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:51:25 +0100
Subject: [PATCH 1161/2811] Update named parameter to destination

---
 .../Features/Navigation/NavigationItem.php    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 00e72c03c76..f801dd75b80 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,27 +54,27 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $route  Route instance or route key, or external URI.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $route, ?string $label = null, ?int $priority = null, ?string $group = null): self
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (is_string($route)) {
-            $route = Routes::get($route) ?? new ExternalRoute($route);
+        if (is_string($destination)) {
+            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }
 
-        if ($route instanceof Route && ! $route instanceof ExternalRoute) {
+        if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {
             return new self(
-                $route,
-                $label ?? $route->getPage()->navigationMenuLabel(),
-                $priority ?? $route->getPage()->navigationMenuPriority(),
-                $group ?? $route->getPage()->navigationMenuGroup(),
+                $destination,
+                $label ?? $destination->getPage()->navigationMenuLabel(),
+                $priority ?? $destination->getPage()->navigationMenuPriority(),
+                $group ?? $destination->getPage()->navigationMenuGroup(),
             );
         }
 
-        return new self($route, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 76fc723d00a8a2b91526cb6622f9817d89a1db58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:51:40 +0100
Subject: [PATCH 1162/2811] Union annotate plain string type

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f801dd75b80..9a8b9cdf445 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -54,7 +54,7 @@ public function __construct(Route|string|null $destination, string $label, int $
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>  $destination  Route instance or route key, or external URI.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.

From c882f7936c00bc11caa9a1615491eb2ce399c07b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:53:33 +0100
Subject: [PATCH 1163/2811] Update todo

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9a8b9cdf445..7888d3441ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -80,7 +80,7 @@ public static function create(Route|string $destination, ?string $label = null,
     /**
      * Create a new dropdown navigation menu item.
      *
-     * TODO: Move to GroupedNavigationItem::create()
+     * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.

From 215240d50d26f07e1940a1818e8e7020465a69cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 19:54:22 +0100
Subject: [PATCH 1164/2811] Override parent method

---
 .../Framework/Features/Navigation/GroupedNavigationItem.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 0d12290e855..6f980312ad2 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -27,6 +28,11 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): NavigationItem
+    {
+        return parent::create($destination, $label, $priority, $group);
+    }
+
     /**
      * Get the items of the grouped navigation item.
      *

From 37ee6e355a84110862b3c486b362dfd4905c429c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:04:12 +0100
Subject: [PATCH 1165/2811] Deprecate GroupedNavigationItem

---
 .../src/Framework/Features/Navigation/GroupedNavigationItem.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 6f980312ad2..ec25d844126 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -15,6 +15,8 @@
  * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
  *
  * @todo Consider extracting trait for shared code with navigation menu class
+ *
+ * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
 {

From be3510d306ef70302b17feb0593b8093d996ca09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:04:57 +0100
Subject: [PATCH 1166/2811] Deprecate forGroup method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7888d3441ea..16a3b689d22 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -80,6 +80,8 @@ public static function create(Route|string $destination, ?string $label = null,
     /**
      * Create a new dropdown navigation menu item.
      *
+     * @deprecated Use NavigationGroup::create() instead.
+     *
      * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.

From 5c0ed74ced2ac1919a682aee98432f4196bd6ff4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:05:50 +0100
Subject: [PATCH 1167/2811] Create NavigationGroup.php

---
 .../Framework/Features/Navigation/NavigationGroup.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationGroup.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
new file mode 100644
index 00000000000..92ba7abe4d5
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationGroup
+{
+    //
+}

From d23f57473c73c05a48882ed6f23a9c28408f6f64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:14:09 +0100
Subject: [PATCH 1168/2811] Add todo

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 16a3b689d22..39bb0d3d724 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -16,6 +16,8 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
+ * @todo Consider adding a NavigationElement contract to this class and new NavigationGroup class for shared methods and to allow easier type hinting.
+ *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route

From a3fc9ddee4bab7c3cc308fcfb25ac6d86910755d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:17:25 +0100
Subject: [PATCH 1169/2811] Add items array

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 92ba7abe4d5..f78ae1a277a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -6,5 +6,6 @@
 
 class NavigationGroup
 {
-    //
+    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    protected array $items = [];
 }

From 77cf42839d0ad45addd76a8d23817366deaad2df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:18:09 +0100
Subject: [PATCH 1170/2811] Add label and priority properties

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index f78ae1a277a..8b062a7d19a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -8,4 +8,6 @@ class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
+    protected string $label;
+    protected int $priority;
 }

From 8e284b038f8312e03ea022bd89e5793737f5ff33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:18:34 +0100
Subject: [PATCH 1171/2811] Create base constructor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 8b062a7d19a..7ae32b8e49d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -10,4 +10,12 @@ class NavigationGroup
     protected array $items = [];
     protected string $label;
     protected int $priority;
+
+    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
+    {
+        $this->label = $label;
+        $this->priority = $priority;
+
+        $this->addItems($items);
+    }
 }

From 3598621c7e55237e32695cd08aae9b5f020be51c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:20:25 +0100
Subject: [PATCH 1172/2811] Add base create method

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7ae32b8e49d..0da083dcdca 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -18,4 +18,9 @@ public function __construct(string $label, array $items = [], int $priority = Na
 
         $this->addItems($items);
     }
+
+    public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
+    {
+        return new static($label, $items, $priority);
+    }
 }

From fd34e6afbc70c7a7d34501d14ce03bb58afc5c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:20:52 +0100
Subject: [PATCH 1173/2811] Add items getter

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0da083dcdca..c07d0198fa2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -23,4 +23,10 @@ public static function create(string $label, array $items = [], int $priority =
     {
         return new static($label, $items, $priority);
     }
+
+    /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    public function getItems(): array
+    {
+        return $this->items;
+    }
 }

From a2dc2f3b9ac41485b834ee791eae89904b36201b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:21:44 +0100
Subject: [PATCH 1174/2811] Copy over base items adder methods

---
 .../Features/Navigation/NavigationGroup.php   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c07d0198fa2..b1a8ecb4522 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -29,4 +29,23 @@ public function getItems(): array
     {
         return $this->items;
     }
+
+    public function addItem(NavigationItem $item): static
+    {
+        $item->group ??= $this->group;
+
+        $this->items[] = $item;
+
+        return $this;
+    }
+
+    /** @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
+    public function addItems(array $items): static
+    {
+        foreach ($items as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
 }

From 9f5c1ab3ff012b13c7ed59ee9936b02dde01d24f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:22:46 +0100
Subject: [PATCH 1175/2811] Deprecate operation

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b1a8ecb4522..0a3bd1b71c2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -32,6 +32,7 @@ public function getItems(): array
 
     public function addItem(NavigationItem $item): static
     {
+        /** @deprecated I don't think we necessarily need to care about this */
         $item->group ??= $this->group;
 
         $this->items[] = $item;

From c67fc320cfc0cb8eaca8982f415622fa52d612b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:23:46 +0100
Subject: [PATCH 1176/2811] Copy over priority accessor

---
 .../Features/Navigation/NavigationGroup.php   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0a3bd1b71c2..6baf501bc52 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -4,6 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\ExternalRoute;
+
+use function min;
+use function collect;
+
 class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
@@ -49,4 +55,29 @@ public function addItems(array $items): static
 
         return $this;
     }
+
+    /**
+     * Get the priority to determine the order of the grouped navigation item.
+     *
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
+     */
+    public function getPriority(): int
+    {
+        if ($this->containsOnlyDocumentationPages()) {
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+        }
+
+        return $this->priority;
+    }
+
+    protected function containsOnlyDocumentationPages(): bool
+    {
+        if (empty($this->getItems())) {
+            return false;
+        }
+
+        return collect($this->getItems())->every(function (NavigationItem $child): bool {
+            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
+        });
+    }
 }

From 0f3be7ff01eb8fcb3a1df8d596ccb6fb3474fb03 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:27:14 +0100
Subject: [PATCH 1177/2811] Create temporary deprecated helper to aid in
 refactor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 3 ++-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 6baf501bc52..f0e3cb58ba4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Str;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -39,7 +40,7 @@ public function getItems(): array
     public function addItem(NavigationItem $item): static
     {
         /** @deprecated I don't think we necessarily need to care about this */
-        $item->group ??= $this->group;
+        $item->setGroup($item->getGroupKey() ?? Str::slug($this->label));
 
         $this->items[] = $item;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 39bb0d3d724..032b4905823 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -161,4 +161,10 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    /** @deprecated Temporary to reduce issues during refactoring */
+    public function setGroup(string $group): void
+    {
+        $this->group = $group;
+    }
 }

From 24cc0885a694807b7b1942f72b2c4d28cb66a6c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:33:07 +0100
Subject: [PATCH 1178/2811] Revert "Override parent method"

This reverts commit 215240d50d26f07e1940a1818e8e7020465a69cb.
---
 .../Framework/Features/Navigation/GroupedNavigationItem.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index ec25d844126..0edf19b15e1 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -30,11 +29,6 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): NavigationItem
-    {
-        return parent::create($destination, $label, $priority, $group);
-    }
-
     /**
      * Get the items of the grouped navigation item.
      *

From 44eca8f11a85fbafc4afeb2561432a54a8e344a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:33:54 +0100
Subject: [PATCH 1179/2811] Shift class description to new class

---
 .../Framework/Features/Navigation/GroupedNavigationItem.php  | 4 ----
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index 0edf19b15e1..b5b02dfd8e5 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -11,10 +11,6 @@
 use function collect;
 
 /**
- * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
- *
- * @todo Consider extracting trait for shared code with navigation menu class
- *
  * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index f0e3cb58ba4..bfadeab01b0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -11,6 +11,11 @@
 use function min;
 use function collect;
 
+/**
+ * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ *
+ * @todo Consider extracting trait for shared code with navigation menu class
+ */
 class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */

From 8b29e17f7c3cd62ecc7eea4c2c335e58d9f62f1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:34:16 +0100
Subject: [PATCH 1180/2811] Remove non vital lines from class being removed

---
 .../Navigation/GroupedNavigationItem.php      | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
index b5b02dfd8e5..de98b73ed38 100644
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
@@ -7,15 +7,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
-use function min;
-use function collect;
-
 /**
  * @deprecated Use NavigationGroup instead
  */
 class GroupedNavigationItem extends NavigationItem
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
@@ -25,21 +21,11 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->addItems($items);
     }
 
-    /**
-     * Get the items of the grouped navigation item.
-     *
-     * For the main navigation menu, this stores any dropdown items.
-     *
-     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
-     */
     public function getItems(): array
     {
         return $this->items;
     }
 
-    /**
-     * Add a navigation item to the grouped navigation item.
-     */
     public function addItem(NavigationItem $item): static
     {
         $item->group ??= $this->group;
@@ -49,11 +35,6 @@ public function addItem(NavigationItem $item): static
         return $this;
     }
 
-    /**
-     * Add multiple navigation items to the grouped navigation item.
-     *
-     * @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items
-     */
     public function addItems(array $items): static
     {
         foreach ($items as $item) {
@@ -63,11 +44,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /**
-     * Get the priority to determine the order of the grouped navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown has a lower priority.
-     */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {

From ad24ae91a51b933a85a7420d4df5c41f26e2ea21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:37:24 +0100
Subject: [PATCH 1181/2811] Create NavigationGroupTest.php

---
 .../framework/tests/Unit/NavigationGroupTest.php  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavigationGroupTest.php

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
new file mode 100644
index 00000000000..5ef3fd18f8c
--- /dev/null
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
+ */
+class NavigationGroupTest extends UnitTestCase
+{
+    //
+}

From 7e90b392dee38fd5bbf253060c1e70513a03d4cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:37:52 +0100
Subject: [PATCH 1182/2811] Copy over tests from replaced class

---
 .../tests/Unit/NavigationGroupTest.php        | 198 +++++++++++++++++-
 1 file changed, 197 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 5ef3fd18f8c..7430eba44e1 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -4,12 +4,208 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Models\Route;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\HydeCoreExtension;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
  */
 class NavigationGroupTest extends UnitTestCase
 {
-    //
+    public static function setUpBeforeClass(): void
+    {
+        self::needsKernel();
+        self::mockConfig();
+    }
+
+    public function testCanConstruct()
+    {
+        $this->assertSame('Foo', (new NavigationGroup('Foo'))->getLabel());
+    }
+
+    public function testCanConstructWithPriority()
+    {
+        $this->assertSame(500, (new NavigationGroup('Foo', priority: 500))->getPriority());
+    }
+
+    public function testDefaultPriorityValueIsLast()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testDestinationIsAlwaysNull()
+    {
+        $this->assertNull((new NavigationGroup('Foo'))->getRoute());
+    }
+
+    public function testCanConstructWithChildren()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testCanConstructWithChildrenWithoutRoute()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertCount(2, $item->getItems());
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testGetItems()
+    {
+        $children = $this->createNavigationItems();
+        $item = new NavigationGroup('Foo', $children);
+
+        $this->assertSame($children, $item->getItems());
+    }
+
+    public function testGetItemsWithNoItems()
+    {
+        $this->assertEmpty((new NavigationGroup('Foo'))->getItems());
+    }
+
+    public function testCanAddItemToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame([$child], $group->addItem($child)->getItems());
+    }
+
+    public function testAddChildMethodReturnsSelf()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $this->assertSame($group, $group->addItem($child));
+    }
+
+    public function testCanAddMultipleItemsToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $items = $this->createNavigationItems();
+
+        $this->assertSame($items, $group->addItems($items)->getItems());
+    }
+
+    public function testAddChildrenMethodReturnsSelf()
+    {
+        $group = new NavigationGroup('Foo');
+
+        $this->assertSame($group, $group->addItems([]));
+    }
+
+    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
+
+        $group->addItem($child);
+
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('bar', $child->getGroupKey());
+    }
+
+    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
+
+        $group->addItem($child);
+
+        $this->assertSame('foo', $group->getGroupKey());
+        $this->assertSame('foo', $child->getGroupKey());
+    }
+
+    public function testGetPriorityUsesDefaultPriority()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testGetPriorityWithNoChildrenUsesGroupPriority()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
+    }
+
+    public function testGetPriorityWithChildrenUsesGroupPriority()
+    {
+        $group = new NavigationGroup('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
+    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
+    {
+        $items = [
+            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
+            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
+            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
+        ];
+
+        $this->assertSame(100, (new NavigationGroup('Foo', $items))->getPriority());
+        $this->assertSame(100, (new NavigationGroup('Foo', array_reverse($items)))->getPriority());
+    }
+
+    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
+    {
+        $group = new NavigationGroup('Foo');
+
+        foreach (HydeCoreExtension::getPageClasses() as $type) {
+            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
+            $group->addItem($child);
+        }
+
+        $this->assertSame(999, $group->getPriority());
+    }
+
+    public function testGetPriorityHandlesStringUrlChildGracefully()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
+    }
+
+    public function testGetPriorityHandlesExternalUrlChildGracefully()
+    {
+        $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
+    }
+
+    public function testCreate()
+    {
+        $this->markTestSkipped('TODO: Reimplement this test');
+
+        $item = NavigationGroup::create(new Route(new InMemoryPage('foo')));
+
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $this->assertNotInstanceOf(NavigationGroup::class, $item);
+        $this->assertSame(NavigationItem::class, $item::class);
+    }
+
+    public function testCreateWithLink()
+    {
+        $this->markTestSkipped('TODO: Reimplement this test');
+
+        $item = NavigationGroup::create('foo', 'bar');
+
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $this->assertNotInstanceOf(NavigationGroup::class, $item);
+        $this->assertSame(NavigationItem::class, $item::class);
+    }
+
+    protected function createNavigationItems(): array
+    {
+        return [
+            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
+            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
+        ];
+    }
 }

From 83f01f36a5547bfce14b6c1924e4cc9e98d6c291 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:39:06 +0100
Subject: [PATCH 1183/2811] Copy over shared accessors from navigation item
 class

---
 .../Features/Navigation/NavigationGroup.php   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index bfadeab01b0..9b944447715 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -36,6 +36,26 @@ public static function create(string $label, array $items = [], int $priority =
         return new static($label, $items, $priority);
     }
 
+    /**
+     * @todo Put into contract shared with NavigationItem class
+     *
+     * Get the label of the navigation item.
+     */
+    public function getLabel(): string
+    {
+        return $this->label;
+    }
+
+    /**
+     * @todo Put into contract shared with NavigationItem class
+     *
+     * Get the priority to determine the order of the navigation item.
+     */
+    public function getPriority(): int
+    {
+        return $this->priority;
+    }
+
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {

From 1c57d0e483d5576de6415a6e3950ee553d389d86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:39:38 +0100
Subject: [PATCH 1184/2811] Merge duplicated accessor

---
 .../Features/Navigation/NavigationGroup.php          | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 9b944447715..747321c0e57 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -46,16 +46,6 @@ public function getLabel(): string
         return $this->label;
     }
 
-    /**
-     * @todo Put into contract shared with NavigationItem class
-     *
-     * Get the priority to determine the order of the navigation item.
-     */
-    public function getPriority(): int
-    {
-        return $this->priority;
-    }
-
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
@@ -85,6 +75,8 @@ public function addItems(array $items): static
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
+     * @todo Put into contract shared with NavigationItem class
+     *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
      */
     public function getPriority(): int

From 9f78ce5e251135891c4f1ecdaae19353d18d96fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:40:11 +0100
Subject: [PATCH 1185/2811] Navigation groups do not need route accessor

---
 packages/framework/tests/Unit/NavigationGroupTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 7430eba44e1..654255df95e 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -39,11 +39,6 @@ public function testDefaultPriorityValueIsLast()
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
     }
 
-    public function testDestinationIsAlwaysNull()
-    {
-        $this->assertNull((new NavigationGroup('Foo'))->getRoute());
-    }
-
     public function testCanConstructWithChildren()
     {
         $children = $this->createNavigationItems();

From 31a0cff8fde912eabac476b68e9c2faa1011ddec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:40:39 +0100
Subject: [PATCH 1186/2811] Navigation groups do not need group key accessor

I don't see why this is needed on this class
---
 packages/framework/tests/Unit/NavigationGroupTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 654255df95e..03151e5feb6 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -108,7 +108,6 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('bar', $child->getGroupKey());
     }
 
@@ -119,7 +118,6 @@ public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $group->getGroupKey());
         $this->assertSame('foo', $child->getGroupKey());
     }
 

From d57b204e87f63d4bfe85e2bd63d9e9fde86450b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:42:19 +0100
Subject: [PATCH 1187/2811] Delete GroupedNavigationItemTest.php

Replaced by NavigationGroupTest.php
---
 .../tests/Unit/GroupedNavigationItemTest.php  | 207 ------------------
 1 file changed, 207 deletions(-)
 delete mode 100644 packages/framework/tests/Unit/GroupedNavigationItemTest.php

diff --git a/packages/framework/tests/Unit/GroupedNavigationItemTest.php b/packages/framework/tests/Unit/GroupedNavigationItemTest.php
deleted file mode 100644
index d08dfc1a740..00000000000
--- a/packages/framework/tests/Unit/GroupedNavigationItemTest.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\InMemoryPage;
-use Hyde\Testing\UnitTestCase;
-use Hyde\Support\Models\Route;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Foundation\HydeCoreExtension;
-use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\GroupedNavigationItem
- */
-class GroupedNavigationItemTest extends UnitTestCase
-{
-    public static function setUpBeforeClass(): void
-    {
-        self::needsKernel();
-        self::mockConfig();
-    }
-
-    public function testCanConstruct()
-    {
-        $this->assertSame('Foo', (new GroupedNavigationItem('Foo'))->getLabel());
-    }
-
-    public function testCanConstructWithPriority()
-    {
-        $this->assertSame(500, (new GroupedNavigationItem('Foo', priority: 500))->getPriority());
-    }
-
-    public function testDefaultPriorityValueIsLast()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testDestinationIsAlwaysNull()
-    {
-        $this->assertNull((new GroupedNavigationItem('Foo'))->getRoute());
-    }
-
-    public function testCanConstructWithChildren()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testCanConstructWithChildrenWithoutRoute()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testGetItems()
-    {
-        $children = $this->createNavigationItems();
-        $item = new GroupedNavigationItem('Foo', $children);
-
-        $this->assertSame($children, $item->getItems());
-    }
-
-    public function testGetItemsWithNoItems()
-    {
-        $this->assertEmpty((new GroupedNavigationItem('Foo'))->getItems());
-    }
-
-    public function testCanAddItemToDropdown()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame([$child], $group->addItem($child)->getItems());
-    }
-
-    public function testAddChildMethodReturnsSelf()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $this->assertSame($group, $group->addItem($child));
-    }
-
-    public function testCanAddMultipleItemsToDropdown()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $items = $this->createNavigationItems();
-
-        $this->assertSame($items, $group->addItems($items)->getItems());
-    }
-
-    public function testAddChildrenMethodReturnsSelf()
-    {
-        $group = new GroupedNavigationItem('Foo');
-
-        $this->assertSame($group, $group->addItems([]));
-    }
-
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
-
-        $group->addItem($child);
-
-        $this->assertSame('foo', $group->getGroupKey());
-        $this->assertSame('bar', $child->getGroupKey());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
-    {
-        $group = new GroupedNavigationItem('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $group->addItem($child);
-
-        $this->assertSame('foo', $group->getGroupKey());
-        $this->assertSame('foo', $child->getGroupKey());
-    }
-
-    public function testGetPriorityUsesDefaultPriority()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testGetPriorityWithNoChildrenUsesGroupPriority()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo'))->getPriority());
-    }
-
-    public function testGetPriorityWithChildrenUsesGroupPriority()
-    {
-        $group = new GroupedNavigationItem('Foo', [new NavigationItem(new Route(new MarkdownPage()), 'Bar', 100)]);
-
-        $this->assertSame(999, $group->getPriority());
-    }
-
-    public function testGetPriorityWithDocumentationPageChildrenUsesLowestPriority()
-    {
-        $items = [
-            new NavigationItem(new Route(new DocumentationPage()), 'Foo', 100),
-            new NavigationItem(new Route(new DocumentationPage()), 'Bar', 200),
-            new NavigationItem(new Route(new DocumentationPage()), 'Baz', 300),
-        ];
-
-        $this->assertSame(100, (new GroupedNavigationItem('Foo', $items))->getPriority());
-        $this->assertSame(100, (new GroupedNavigationItem('Foo', array_reverse($items)))->getPriority());
-    }
-
-    public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
-    {
-        $group = new GroupedNavigationItem('Foo');
-
-        foreach (HydeCoreExtension::getPageClasses() as $type) {
-            $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
-            $group->addItem($child);
-        }
-
-        $this->assertSame(999, $group->getPriority());
-    }
-
-    public function testGetPriorityHandlesStringUrlChildGracefully()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('foo', 'Bar', 100)]))->getPriority());
-    }
-
-    public function testGetPriorityHandlesExternalUrlChildGracefully()
-    {
-        $this->assertSame(999, (new GroupedNavigationItem('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
-    }
-
-    public function testCreate()
-    {
-        $item = GroupedNavigationItem::create(new Route(new InMemoryPage('foo')));
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    public function testCreateWithLink()
-    {
-        $item = GroupedNavigationItem::create('foo', 'bar');
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(GroupedNavigationItem::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    protected function createNavigationItems(): array
-    {
-        return [
-            new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo'),
-            new NavigationItem(new Route(new InMemoryPage('bar')), 'Bar'),
-        ];
-    }
-}

From e3ae2c73078b2c57d52fccc692ebb315d164e15a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:54:47 +0100
Subject: [PATCH 1188/2811] Add experimental method for compatibility during
 refactor

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 747321c0e57..2aed9477672 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -98,4 +98,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** @experimental This may not be needed. */
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
 }

From 6faed17a62f0d2abab4298a56daeb7ec20530d72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:49:20 +0100
Subject: [PATCH 1189/2811] Use new NavigationGroup class instead of the old
 one

---
 .../views/components/docs/sidebar-items.blade.php         | 2 +-
 .../resources/views/layouts/navigation.blade.php          | 2 +-
 .../Features/Navigation/DocumentationSidebar.php          | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php  | 6 +++---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++++----
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index 2cd3f7d17ff..aef909869ad 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -6,7 +6,7 @@
     </ul>
 @else
     <ul id="sidebar-items" role="list">
-        @php /** @var \Hyde\Framework\Features\Navigation\GroupedNavigationItem $group */ @endphp
+        @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
             <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 5b766e4a77d..452e53d62fb 100644
--- a/packages/framework/resources/views/layouts/navigation.blade.php
+++ b/packages/framework/resources/views/layouts/navigation.blade.php
@@ -37,7 +37,7 @@
         <ul aria-label="Navigation links" class="md:flex-grow md:flex justify-end">
             @foreach ($navigation->getItems() as $item)
                 <li class="md:mx-2">
-                    @if($item instanceof \Hyde\Framework\Features\Navigation\GroupedNavigationItem)
+                    @if($item instanceof \Hyde\Framework\Features\Navigation\NavigationGroup)
                         <x-hyde::navigation.dropdown :label="$item->getLabel()" :items="$item->getItems()"/>
                     @else
                         <x-hyde::navigation.navigation-link :item="$item"/>
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 971fe2abf09..31cf72ec1ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof GroupedNavigationItem);
+        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavigationGroup);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 032b4905823..b299a36b461 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -84,15 +84,15 @@ public static function create(Route|string $destination, ?string $label = null,
      *
      * @deprecated Use NavigationGroup::create() instead.
      *
-     * TODO: Move to GroupedNavigationItem::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
+     * TODO: Move to NavigationGroup::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
      *
      * @param  string  $label  The label of the dropdown item.
      * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
      * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
      */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): GroupedNavigationItem
+    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
     {
-        return new GroupedNavigationItem($label, $items, $priority);
+        return new NavigationGroup($label, $items, $priority);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index cc31f8d5cff..12c6e225a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -146,12 +146,12 @@ protected function addRouteToGroup(Route $route): void
         }
     }
 
-    protected function getOrCreateGroupItem(string $groupName): GroupedNavigationItem
+    protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
         $groupKey = Str::slug($groupName);
         $group = $this->items->get($groupKey);
 
-        if ($group instanceof GroupedNavigationItem) {
+        if ($group instanceof NavigationGroup) {
             return $group;
         } elseif ($group instanceof NavigationItem) {
             // We are trying to add children to an existing navigation menu item,
@@ -161,7 +161,7 @@ protected function getOrCreateGroupItem(string $groupName): GroupedNavigationIte
             // Todo: Add note in documentation about this behavior
             // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
 
-            $item = new GroupedNavigationItem($group->getLabel(), [], $group->getPriority());
+            $item = new NavigationGroup($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);
 
@@ -171,7 +171,7 @@ protected function getOrCreateGroupItem(string $groupName): GroupedNavigationIte
         return $this->createGroupItem($groupKey, $groupName);
     }
 
-    protected function createGroupItem(string $groupKey, string $groupName): GroupedNavigationItem
+    protected function createGroupItem(string $groupKey, string $groupName): NavigationGroup
     {
         $label = $this->searchForGroupLabelInConfig($groupKey) ?? $groupName;
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0230e570374..81501174b94 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -18,7 +18,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof GroupedNavigationItem ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index dd9af5b4c06..036350064ae 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Collection;
 use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\GroupedNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
@@ -204,13 +204,13 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
         $this->assertFalse((new DocumentationSidebar())->hasGroups());
     }
 
-    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsGroupedNavigationItemInstance()
+    public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavigationGroupInstance()
     {
         self::mockConfig();
         self::setupKernel();
 
         $menu = new DocumentationSidebar([
-            new GroupedNavigationItem('foo', []),
+            new NavigationGroup('foo', []),
         ]);
 
         $this->assertTrue($menu->hasGroups());

From eff193b2e8f469f29164399c96a59d99c044935d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 20:57:24 +0100
Subject: [PATCH 1190/2811] Union type navigation group class

---
 .../Features/Navigation/DocumentationSidebar.php          | 2 +-
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 ++++----
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 31cf72ec1ff..b50e38682c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -56,7 +56,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
     /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 6876e1c003f..0edef08d48a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,7 +20,7 @@ abstract class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])
@@ -41,7 +41,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem>
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
      */
     public function getItems(): Collection
     {
@@ -49,13 +49,13 @@ public function getItems(): Collection
         // so any sorting we do in generator actions will only be partial. This way, we can ensure
         // that the items are always freshly sorted by their priorities when they are retrieved.
 
-        return $this->items->sortBy(fn (NavigationItem $item) => $item->getPriority())->values();
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
     }
 
     /**
      * Add a navigation item to the navigation menu.
      */
-    public function add(NavigationItem $item): void
+    public function add(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 81501174b94..4277e67ef84 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1293,7 +1293,7 @@ public function __construct(string $label, ?string $group, int $priority, array
         $this->label = $label;
         $this->group = $group;
         $this->priority = $priority;
-        $this->children = collect($children)->map(fn (NavigationItem $child) => $child->getLabel())->toArray();
+        $this->children = collect($children)->map(fn (NavigationItem|NavigationGroup $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
@@ -1319,7 +1319,7 @@ public function __construct(TestCase $test, $sidebar = false)
     /** A simplified serialized format for comparisons */
     public function state(): array
     {
-        return $this->items->map(function (NavigationItem $item): TestNavigationItem {
+        return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
             return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }

From 6d8eb4630f144a222af7647b8076b6a9b122700c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:05:05 +0100
Subject: [PATCH 1191/2811] Delete GroupedNavigationItem.php

---
 .../Navigation/GroupedNavigationItem.php      | 66 -------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php

diff --git a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php b/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
deleted file mode 100644
index de98b73ed38..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/GroupedNavigationItem.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\ExternalRoute;
-
-/**
- * @deprecated Use NavigationGroup instead
- */
-class GroupedNavigationItem extends NavigationItem
-{
-    protected array $items = [];
-
-    public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
-    {
-        parent::__construct(null, $label, $priority, static::normalizeGroupKey($label));
-
-        $this->addItems($items);
-    }
-
-    public function getItems(): array
-    {
-        return $this->items;
-    }
-
-    public function addItem(NavigationItem $item): static
-    {
-        $item->group ??= $this->group;
-
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    public function addItems(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    public function getPriority(): int
-    {
-        if ($this->containsOnlyDocumentationPages()) {
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
-        }
-
-        return parent::getPriority();
-    }
-
-    protected function containsOnlyDocumentationPages(): bool
-    {
-        if (empty($this->getItems())) {
-            return false;
-        }
-
-        return collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
-        });
-    }
-}

From ebc687fb9f866123cce328b52e7fcbca89a1de44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:11:28 +0100
Subject: [PATCH 1192/2811] Remove redundant infix from method name

---
 .../resources/views/components/docs/sidebar-items.blade.php   | 2 +-
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index aef909869ad..ed05cf10961 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b50e38682c3..50f40bb15bd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,6 +92,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
+        return $group === $this->getItems()->firstOrFail()->getKey();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2aed9477672..91a3928e472 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,8 +99,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @experimental This may not be needed. */
-    public function getGroupKey(): string
+    /** Get the key that identifies the group */
+    public function getKey(): string
     {
         return Str::slug($this->label);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 12c6e225a16..4c684d01b95 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addItem($item);
 
-        if (! $this->items->has($groupItem->getGroupKey())) {
-            $this->items->put($groupItem->getGroupKey(), $groupItem);
+        if (! $this->items->has($groupItem->getKey())) {
+            $this->items->put($groupItem->getKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4277e67ef84..70216261795 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 

From 9c8ab4e79b9ccdac3f0caddb0e4d8ac67d854f10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:11:45 +0100
Subject: [PATCH 1193/2811] Move up method in class source

---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 91a3928e472..c38ee34ae7e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,6 +72,12 @@ public function addItems(array $items): static
         return $this;
     }
 
+    /** Get the key that identifies the group */
+    public function getKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -98,10 +104,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    /** Get the key that identifies the group */
-    public function getKey(): string
-    {
-        return Str::slug($this->label);
-    }
 }

From 45c217c65e0bdcc3305a242b0503e9a28979e6a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:15:46 +0100
Subject: [PATCH 1194/2811] Revert "Move up method in class source"

This reverts commit 9c8ab4e79b9ccdac3f0caddb0e4d8ac67d854f10.
---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c38ee34ae7e..91a3928e472 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,12 +72,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /** Get the key that identifies the group */
-    public function getKey(): string
-    {
-        return Str::slug($this->label);
-    }
-
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -104,4 +98,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** Get the key that identifies the group */
+    public function getKey(): string
+    {
+        return Str::slug($this->label);
+    }
 }

From 292ef099e04fdcdcb0579bf1f07386e108ca0dfd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:15:48 +0100
Subject: [PATCH 1195/2811] Revert "Remove redundant infix from method name"

This reverts commit ebc687fb9f866123cce328b52e7fcbca89a1de44.
---
 .../resources/views/components/docs/sidebar-items.blade.php   | 2 +-
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index ed05cf10961..aef909869ad 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 50f40bb15bd..b50e38682c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,6 +92,6 @@ private function shouldIndexPageBeActive(string $group): bool
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getKey();
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 91a3928e472..2aed9477672 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,8 +99,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** Get the key that identifies the group */
-    public function getKey(): string
+    /** @experimental This may not be needed. */
+    public function getGroupKey(): string
     {
         return Str::slug($this->label);
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4c684d01b95..12c6e225a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -141,8 +141,8 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem->addItem($item);
 
-        if (! $this->items->has($groupItem->getKey())) {
-            $this->items->put($groupItem->getKey(), $groupItem);
+        if (! $this->items->has($groupItem->getGroupKey())) {
+            $this->items->put($groupItem->getGroupKey(), $groupItem);
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 70216261795..4277e67ef84 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1320,7 +1320,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 

From 5cc73a8add6e77852599f4b5007ca5e5916b3f49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:16:36 +0100
Subject: [PATCH 1196/2811] Replace experimental marker with design note

Seems like this is needed to simplify the API between the navigation element classes
---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2aed9477672..e428b90cdf5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -99,7 +99,7 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @experimental This may not be needed. */
+    /** @todo Put into contract shared with NavigationItem class */
     public function getGroupKey(): string
     {
         return Str::slug($this->label);

From 34ab7fab56a0edc75d40e06055f6df2f7ff645b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 21 Mar 2024 21:17:02 +0100
Subject: [PATCH 1197/2811] Revert "Revert "Move up method in class source""

This reverts commit 45c217c65e0bdcc3305a242b0503e9a28979e6a7.
---
 .../Features/Navigation/NavigationGroup.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e428b90cdf5..d7b311a4d61 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,6 +72,12 @@ public function addItems(array $items): static
         return $this;
     }
 
+    /** @todo Put into contract shared with NavigationItem class */
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
@@ -98,10 +104,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    /** @todo Put into contract shared with NavigationItem class */
-    public function getGroupKey(): string
-    {
-        return Str::slug($this->label);
-    }
 }

From 255bd863c02d346024fbbc29c2e6b20c19fba331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 10:13:31 +0100
Subject: [PATCH 1198/2811] Remove group key assignment when adding item

Like this is cool, and it makes the state make more sense when dumped, but it doesn't actually matter. Duck typing works fine here, and I don't think it's worth exposing a public method just for this.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 3 ---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 ------
 packages/framework/tests/Unit/NavigationGroupTest.php       | 4 ++--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index d7b311a4d61..1ab5dfd6989 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -54,9 +54,6 @@ public function getItems(): array
 
     public function addItem(NavigationItem $item): static
     {
-        /** @deprecated I don't think we necessarily need to care about this */
-        $item->setGroup($item->getGroupKey() ?? Str::slug($this->label));
-
         $this->items[] = $item;
 
         return $this;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b299a36b461..b5b4566dab8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -161,10 +161,4 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    /** @deprecated Temporary to reduce issues during refactoring */
-    public function setGroup(string $group): void
-    {
-        $this->group = $group;
-    }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 03151e5feb6..dffa66d7033 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -111,14 +111,14 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $this->assertSame('bar', $child->getGroupKey());
     }
 
-    public function testAddingAnItemWithNoGroupKeyUsesGroupIdentifier()
+    public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
     {
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
         $group->addItem($child);
 
-        $this->assertSame('foo', $child->getGroupKey());
+        $this->assertNull($child->getGroupKey());
     }
 
     public function testGetPriorityUsesDefaultPriority()

From e6a026c996fa12801d92ce77f05e97512281142c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:06:56 +0100
Subject: [PATCH 1199/2811] Create NavigationElement.php

---
 .../Features/Navigation/NavigationElement.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationElement.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
new file mode 100644
index 00000000000..655031ed680
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+interface NavigationElement
+{
+    //
+}

From 4edadc626f1bb5cf89b79c65384ba61f33789e76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:14:51 +0100
Subject: [PATCH 1200/2811] Implement NavigationElement contract

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 2 +-
 packages/framework/tests/Unit/NavigationGroupTest.php       | 5 +++++
 packages/framework/tests/Unit/NavigationItemTest.php        | 6 ++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 1ab5dfd6989..a328593b81e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -16,7 +16,7 @@
  *
  * @todo Consider extracting trait for shared code with navigation menu class
  */
-class NavigationGroup
+class NavigationGroup implements NavigationElement
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b5b4566dab8..42405a2f387 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  *   2. You can use NavigationItem::fromRoute() to use data from the route
  *   3. You can use NavigationItem::create() for an external or un-routed link
  */
-class NavigationItem implements Stringable
+class NavigationItem implements NavigationElement, Stringable
 {
     protected ?Route $route;
     protected string $label;
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index dffa66d7033..c8541d3b374 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -57,6 +57,11 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame($children, $item->getItems());
     }
 
+    public function testIsInstanceOfNavigationElement()
+    {
+        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
+    }
+
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4f6894c93c5..51510b06de0 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,6 +14,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 use Mockery;
+use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
  * This unit test covers the basics of the NavigationItem class.
@@ -46,6 +47,11 @@ public function testConstruct()
         $this->assertSame($route, $item->getRoute());
     }
 
+    public function testIsInstanceOfNavigationElement()
+    {
+        $this->assertInstanceOf(NavigationElement::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
+    }
+
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());

From e2fcfaf0fa51fb38eb95032c567d669ada1808c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:21:01 +0100
Subject: [PATCH 1201/2811] Contract shared methods

---
 .../Features/Navigation/NavigationElement.php | 20 ++++++++++++++++++-
 .../Features/Navigation/NavigationGroup.php   |  8 --------
 .../Features/Navigation/NavigationItem.php    |  7 -------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 655031ed680..985517a7cf3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -6,5 +6,23 @@
 
 interface NavigationElement
 {
-    //
+    /**
+     * Get the label of the navigation item.
+     */
+    public function getLabel(): string;
+
+    /**
+     * Get the priority to determine the order of the navigation item.
+     */
+    public function getPriority(): int;
+
+    /**
+     * Get the group identifier key of the navigation item, if any.
+     *
+     * For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
+     * When using automatic subdirectory based groups, the subdirectory name is the group key.
+     * Otherwise, the group key is a "slugified" version of the group's label.
+     */
+    public function getGroupKey(): ?string;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index a328593b81e..016134e76a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -36,11 +36,6 @@ public static function create(string $label, array $items = [], int $priority =
         return new static($label, $items, $priority);
     }
 
-    /**
-     * @todo Put into contract shared with NavigationItem class
-     *
-     * Get the label of the navigation item.
-     */
     public function getLabel(): string
     {
         return $this->label;
@@ -69,7 +64,6 @@ public function addItems(array $items): static
         return $this;
     }
 
-    /** @todo Put into contract shared with NavigationItem class */
     public function getGroupKey(): string
     {
         return Str::slug($this->label);
@@ -78,8 +72,6 @@ public function getGroupKey(): string
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
-     * @todo Put into contract shared with NavigationItem class
-     *
      * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
      */
     public function getPriority(): int
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 42405a2f387..e2aa669c552 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -16,8 +16,6 @@
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
  *
- * @todo Consider adding a NavigationElement contract to this class and new NavigationGroup class for shared methods and to allow easier type hinting.
- *
  * You have a few options to construct a navigation menu item:
  *   1. You can supply a Route directly and explicit properties to the constructor
  *   2. You can use NavigationItem::fromRoute() to use data from the route
@@ -137,11 +135,6 @@ public function getPriority(): int
 
     /**
      * Get the group identifier key of the navigation item, if any.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     * When using automatic subdirectory based groups, the subdirectory name is the group key.
-     * Otherwise, the group key is a "slugified" version of the group's label.
      */
     public function getGroupKey(): ?string
     {

From f3f3ecc76ab6f51c3dfaf5ec97663fcf6a0fa57b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:36 +0100
Subject: [PATCH 1202/2811] Reimplement test

---
 .../tests/Unit/NavigationGroupTest.php        | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index c8541d3b374..ddcb108a121 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -179,24 +179,10 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
 
     public function testCreate()
     {
-        $this->markTestSkipped('TODO: Reimplement this test');
-
-        $item = NavigationGroup::create(new Route(new InMemoryPage('foo')));
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavigationGroup::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
-    }
-
-    public function testCreateWithLink()
-    {
-        $this->markTestSkipped('TODO: Reimplement this test');
-
-        $item = NavigationGroup::create('foo', 'bar');
-
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $this->assertNotInstanceOf(NavigationGroup::class, $item);
-        $this->assertSame(NavigationItem::class, $item::class);
+        $this->assertEquals(
+            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
+            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
+        );
     }
 
     protected function createNavigationItems(): array

From 63ee2047bdac52a7a94f6d7fa2db95bd61359f10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:48 +0100
Subject: [PATCH 1203/2811] Move up test

---
 .../framework/tests/Unit/NavigationGroupTest.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ddcb108a121..24645519810 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -62,6 +62,14 @@ public function testIsInstanceOfNavigationElement()
         $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
     }
 
+    public function testCreate()
+    {
+        $this->assertEquals(
+            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
+            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
+        );
+    }
+
     public function testGetItems()
     {
         $children = $this->createNavigationItems();
@@ -177,14 +185,6 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
-    public function testCreate()
-    {
-        $this->assertEquals(
-            new NavigationGroup('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100),
-            NavigationGroup::create('Foo', [new NavigationItem(new Route(new InMemoryPage('foo')), 'Foo')], 100)
-        );
-    }
-
     protected function createNavigationItems(): array
     {
         return [

From 1709763df6e1a6f6caaf8d7dce31bccaa3566381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:25:56 +0100
Subject: [PATCH 1204/2811] Clarify documentation

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 016134e76a8..bd1aef93beb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -72,7 +72,7 @@ public function getGroupKey(): string
     /**
      * Get the priority to determine the order of the grouped navigation item.
      *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown itself has a lower priority.
+     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
      */
     public function getPriority(): int
     {

From 9f133ce658b0bccd0f7f7b02613f31174defcdab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:48:30 +0100
Subject: [PATCH 1205/2811] Remove todo for closed PR
 https://github.com/hydephp/develop/pull/1630

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index bd1aef93beb..d65dc297691 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -13,8 +13,6 @@
 
 /**
  * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
- *
- * @todo Consider extracting trait for shared code with navigation menu class
  */
 class NavigationGroup implements NavigationElement
 {

From 0e8e6116c64e65f543d828bed15bbd69b5849f9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:52:52 +0100
Subject: [PATCH 1206/2811] Extract helper method

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0edef08d48a..58371a0022a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -56,6 +56,12 @@ public function getItems(): Collection
      * Add a navigation item to the navigation menu.
      */
     public function add(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->add($item);
+    }
+
+    /** Type safe helper to add a navigation item to the menu. */
+    protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }

From 3c3febdc1f0db53d2e8aa1fc8229fff2666b27fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:53:21 +0100
Subject: [PATCH 1207/2811] Add additional test

---
 .../tests/Unit/NavigationMenuUnitTest.php          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 0330f4a0916..11e1c5087d7 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -82,6 +82,20 @@ public function testCanAddItems()
         $this->assertSame($item, $menu->getItems()->first());
     }
 
+    public function testCanAddMultipleItems()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+
+        $menu->add($item1);
+        $menu->add($item2);
+
+        $this->assertCount(2, $menu->getItems());
+        $this->assertSame([$item1, $item2], $menu->getItems()->all());
+    }
+
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();

From 0a7a6b25ef1a169618049da4b9ef227ec0c10e09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:54:41 +0100
Subject: [PATCH 1208/2811] Support adding multiple items at once

---
 .../Features/Navigation/NavigationMenu.php       | 16 +++++++++++++---
 .../tests/Unit/NavigationMenuUnitTest.php        | 13 +++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 58371a0022a..e9303a1ee16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -53,11 +53,21 @@ public function getItems(): Collection
     }
 
     /**
-     * Add a navigation item to the navigation menu.
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
      */
-    public function add(NavigationItem|NavigationGroup $item): void
+    public function add(NavigationItem|NavigationGroup|array $items): void
     {
-        $this->items->add($item);
+        if (is_array($items)) {
+            foreach ($items as $item) {
+                $this->addItem($item);
+            }
+
+            return;
+        }
+
+        $this->addItem($items);
     }
 
     /** Type safe helper to add a navigation item to the menu. */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index 11e1c5087d7..d60aa5e0c6f 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -96,6 +96,19 @@ public function testCanAddMultipleItems()
         $this->assertSame([$item1, $item2], $menu->getItems()->all());
     }
 
+    public function testCanAddMultipleItemsAtOnce()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item1 = $this->item('/', 'Home');
+        $item2 = $this->item('/about', 'About');
+
+        $menu->add([$item1, $item2]);
+
+        $this->assertCount(2, $menu->getItems());
+        $this->assertSame([$item1, $item2], $menu->getItems()->all());
+    }
+
     public function testItemsAreInTheOrderTheyWereAddedWhenThereAreNoCustomPriorities()
     {
         $menu = new MainNavigationMenu();

From 88a1bc5c2b64659faaca05f0e941b81a85505478 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:56:03 +0100
Subject: [PATCH 1209/2811] Wrap array to simplify method implementation

---
 .../Framework/Features/Navigation/NavigationMenu.php  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e9303a1ee16..a2e13228173 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -59,15 +60,9 @@ public function getItems(): Collection
      */
     public function add(NavigationItem|NavigationGroup|array $items): void
     {
-        if (is_array($items)) {
-            foreach ($items as $item) {
-                $this->addItem($item);
-            }
-
-            return;
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
         }
-
-        $this->addItem($items);
     }
 
     /** Type safe helper to add a navigation item to the menu. */

From 8be45e644cb00b0cecf4050cbb043639ab7bcfa6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 13:58:22 +0100
Subject: [PATCH 1210/2811] Test modifier methods are fluently chainable

---
 packages/framework/tests/Unit/NavigationGroupTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 24645519810..cbb0cd64bc7 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -185,6 +185,14 @@ public function testGetPriorityHandlesExternalUrlChildGracefully()
         $this->assertSame(999, (new NavigationGroup('Foo', [new NavigationItem('https://example.com', 'Bar', 100)]))->getPriority());
     }
 
+    public function testModifierMethodsAreFluentlyChainable()
+    {
+        $group = new NavigationGroup('Foo');
+
+        $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
+        $this->assertSame($group, $group->addItems([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+    }
+
     protected function createNavigationItems(): array
     {
         return [

From 8a063c2c42c92c8de85e6de81852048df2f9717b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:00:45 +0100
Subject: [PATCH 1211/2811] Update setter to be fluently chainable

---
 .../src/Framework/Features/Navigation/NavigationMenu.php | 4 +++-
 packages/framework/tests/Unit/NavigationMenuUnitTest.php | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index a2e13228173..cd3b22e08eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -58,11 +58,13 @@ public function getItems(): Collection
      *
      * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
      */
-    public function add(NavigationItem|NavigationGroup|array $items): void
+    public function add(NavigationItem|NavigationGroup|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
         }
+
+        return $this;
     }
 
     /** Type safe helper to add a navigation item to the menu. */
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index d60aa5e0c6f..e90b159624f 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -139,6 +139,15 @@ public function testItemsAreSortedByPriority()
         $this->assertSame([$item1, $item2, $item3], $menu->getItems()->all());
     }
 
+    public function testModifierMethodsAreFluentlyChainable()
+    {
+        $menu = new MainNavigationMenu();
+
+        $item = $this->item('/', 'Home');
+
+        $this->assertSame($menu, $menu->add($item));
+    }
+
     protected function getItems(): array
     {
         return [

From ea23d59721141da0d52b5c874082fd19f38ce191 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:17:14 +0100
Subject: [PATCH 1212/2811] Add items using dynamic helper

---
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cd3b22e08eb..7b6a18b1f70 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -28,13 +28,7 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        foreach ($items as $item) {
-            // Instead of adding the items directly, we iterate through them and
-            // add them through the helper. This ensures that all the items are
-            // of the correct type, bringing type safety to the menu's items.
-
-            $this->add($item);
-        }
+        $this->add($items instanceof Arrayable ? $items->toArray() : $items);
     }
 
     /**

From 7332c237845b50bb1fab4acbd7af9385f60a6009 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:17:39 +0100
Subject: [PATCH 1213/2811] Evaluate arrayable using helper function

---
 .../src/Framework/Features/Navigation/NavigationMenu.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7b6a18b1f70..d066d09bada 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -8,6 +8,8 @@
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
+use function Hyde\evaluate_arrayable;
+
 /**
  * Represents a site navigation menu, and contains all of its navigation items.
  *
@@ -28,7 +30,7 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        $this->add($items instanceof Arrayable ? $items->toArray() : $items);
+        $this->add(evaluate_arrayable($items));
     }
 
     /**

From 1677b818f51a7f21cc37f8bc4a6088327aa7a74b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:30:06 +0100
Subject: [PATCH 1214/2811] Merge adder methods to simplify API

---
 .../Features/Navigation/NavigationGroup.php   | 24 +++++++++----------
 .../tests/Unit/NavigationGroupTest.php        |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index d65dc297691..e5b8c3aa8c2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\ExternalRoute;
 
@@ -26,7 +27,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->addItems($items);
+        $this->addItem($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
@@ -45,18 +46,11 @@ public function getItems(): array
         return $this->items;
     }
 
-    public function addItem(NavigationItem $item): static
+    /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
+    public function addItem(NavigationItem|array $items): static
     {
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    /** @param  array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function addItems(array $items): static
-    {
-        foreach ($items as $item) {
-            $this->addItem($item);
+        foreach (Arr::wrap($items) as $item) {
+            $this->pushItem($item);
         }
 
         return $this;
@@ -91,4 +85,10 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** Type safe helper to add a navigation item to the group. */
+    protected function pushItem(NavigationItem $item): void
+    {
+        $this->items[] = $item;
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index cbb0cd64bc7..d17e3020736 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -104,14 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->addItems($items)->getItems());
+        $this->assertSame($items, $group->addItem($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItems([]));
+        $this->assertSame($group, $group->addItem([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
@@ -190,7 +190,7 @@ public function testModifierMethodsAreFluentlyChainable()
         $group = new NavigationGroup('Foo');
 
         $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
-        $this->assertSame($group, $group->addItems([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+        $this->assertSame($group, $group->addItem([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
     protected function createNavigationItems(): array

From b632b88a1e1f7ddd602f629268ee5cfad15668b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:36:18 +0100
Subject: [PATCH 1215/2811] Rename helper method to make it more fluent

I thought $group->addItem benefited from having the item suffix to make it clear what is added, but considering an entire operation looks like $group->add($items) it's redundant to have it twice.
---
 .../Features/Navigation/NavigationGroup.php    |  4 ++--
 .../Navigation/NavigationMenuGenerator.php     |  2 +-
 .../tests/Unit/NavigationGroupTest.php         | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e5b8c3aa8c2..0aa9664d34d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -27,7 +27,7 @@ public function __construct(string $label, array $items = [], int $priority = Na
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->addItem($items);
+        $this->add($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static
@@ -47,7 +47,7 @@ public function getItems(): array
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function addItem(NavigationItem|array $items): static
+    public function add(NavigationItem|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->pushItem($item);
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 12c6e225a16..995ce8b81d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -139,7 +139,7 @@ protected function addRouteToGroup(Route $route): void
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 
-        $groupItem->addItem($item);
+        $groupItem->add($item);
 
         if (! $this->items->has($groupItem->getGroupKey())) {
             $this->items->put($groupItem->getGroupKey(), $groupItem);
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index d17e3020736..9b51ed0c122 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -88,7 +88,7 @@ public function testCanAddItemToDropdown()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->addItem($child)->getItems());
+        $this->assertSame([$child], $group->add($child)->getItems());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -96,7 +96,7 @@ public function testAddChildMethodReturnsSelf()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame($group, $group->addItem($child));
+        $this->assertSame($group, $group->add($child));
     }
 
     public function testCanAddMultipleItemsToDropdown()
@@ -104,14 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->addItem($items)->getItems());
+        $this->assertSame($items, $group->add($items)->getItems());
     }
 
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItem([]));
+        $this->assertSame($group, $group->add([]));
     }
 
     public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
@@ -119,7 +119,7 @@ public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
 
-        $group->addItem($child);
+        $group->add($child);
 
         $this->assertSame('bar', $child->getGroupKey());
     }
@@ -129,7 +129,7 @@ public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $group->addItem($child);
+        $group->add($child);
 
         $this->assertNull($child->getGroupKey());
     }
@@ -169,7 +169,7 @@ public function testGetPriorityUsesGroupPriorityForMixedChildTypes()
 
         foreach (HydeCoreExtension::getPageClasses() as $type) {
             $child = new NavigationItem(new Route(new $type()), 'Bar', 100);
-            $group->addItem($child);
+            $group->add($child);
         }
 
         $this->assertSame(999, $group->getPriority());
@@ -189,8 +189,8 @@ public function testModifierMethodsAreFluentlyChainable()
     {
         $group = new NavigationGroup('Foo');
 
-        $this->assertSame($group, $group->addItem(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
-        $this->assertSame($group, $group->addItem([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
+        $this->assertSame($group, $group->add(new NavigationItem(new Route(new MarkdownPage()), 'Bar')));
+        $this->assertSame($group, $group->add([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
     protected function createNavigationItems(): array

From 80c97e45d3b03c2b049002a50a20083e1dca19b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:36:33 +0100
Subject: [PATCH 1216/2811] Normalize helper method name

---
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0aa9664d34d..ab529816035 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -50,7 +50,7 @@ public function getItems(): array
     public function add(NavigationItem|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
-            $this->pushItem($item);
+            $this->addItem($item);
         }
 
         return $this;
@@ -87,7 +87,7 @@ protected function containsOnlyDocumentationPages(): bool
     }
 
     /** Type safe helper to add a navigation item to the group. */
-    protected function pushItem(NavigationItem $item): void
+    protected function addItem(NavigationItem $item): void
     {
         $this->items[] = $item;
     }

From 9b754da09b48b391c78f0002d3debbeaf24ee92e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:56:07 +0100
Subject: [PATCH 1217/2811] Remove relatively unnecessary PHPDoc comments

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 -
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ab529816035..949482618f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -86,7 +86,6 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** Type safe helper to add a navigation item to the group. */
     protected function addItem(NavigationItem $item): void
     {
         $this->items[] = $item;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index d066d09bada..46e904cde29 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -63,7 +63,6 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
-    /** Type safe helper to add a navigation item to the menu. */
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);

From f4750752d631d36a345d25381afb2d62561a4e1b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:56:45 +0100
Subject: [PATCH 1218/2811] Shift comment from method description to body

This is not relevant for users wanting to learn about the method usage, it's just desired to explain why we have the complex sorting, so it's better to have it within the body.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 949482618f7..e12859c6a7c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -63,12 +63,11 @@ public function getGroupKey(): string
 
     /**
      * Get the priority to determine the order of the grouped navigation item.
-     *
-     * For sidebar groups, this is the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
      */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
+            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
             return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
         }
 

From 868ec55d42ce7b9caf6f77122d5efb9f5bff8fcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:57:31 +0100
Subject: [PATCH 1219/2811] Remove unnecessary PHPDoc comment

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index e12859c6a7c..30a2016d22a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -61,9 +61,6 @@ public function getGroupKey(): string
         return Str::slug($this->label);
     }
 
-    /**
-     * Get the priority to determine the order of the grouped navigation item.
-     */
     public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {

From 06a97398dfba1632b475470c3e18d3d2604b75c4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:57:39 +0100
Subject: [PATCH 1220/2811] Simplify class description

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 30a2016d22a..8fd22055a16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -13,7 +13,7 @@
 use function collect;
 
 /**
- * Abstraction for a grouped navigation menu item. For main navigation menus, this is a dropdown.
+ * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
 class NavigationGroup implements NavigationElement
 {

From fcefc89a0fe92def5b92099684efc4a7d7dcc7e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 14:59:00 +0100
Subject: [PATCH 1221/2811] Reorder methods to move up contracted ones

---
 .../Features/Navigation/NavigationGroup.php   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 8fd22055a16..96525a5db19 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -40,6 +40,21 @@ public function getLabel(): string
         return $this->label;
     }
 
+    public function getGroupKey(): string
+    {
+        return Str::slug($this->label);
+    }
+
+    public function getPriority(): int
+    {
+        if ($this->containsOnlyDocumentationPages()) {
+            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+        }
+
+        return $this->priority;
+    }
+
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
@@ -56,19 +71,9 @@ public function add(NavigationItem|array $items): static
         return $this;
     }
 
-    public function getGroupKey(): string
-    {
-        return Str::slug($this->label);
-    }
-
-    public function getPriority(): int
+    protected function addItem(NavigationItem $item): void
     {
-        if ($this->containsOnlyDocumentationPages()) {
-            // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
-        }
-
-        return $this->priority;
+        $this->items[] = $item;
     }
 
     protected function containsOnlyDocumentationPages(): bool
@@ -81,9 +86,4 @@ protected function containsOnlyDocumentationPages(): bool
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
-
-    protected function addItem(NavigationItem $item): void
-    {
-        $this->items[] = $item;
-    }
 }

From cbab526f1a977dd35c6b1870422ac42da8c671da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 16:47:00 +0100
Subject: [PATCH 1222/2811] Merge conditional early return into return
 expression

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 96525a5db19..0ef773f944f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,11 +78,7 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        if (empty($this->getItems())) {
-            return false;
-        }
-
-        return collect($this->getItems())->every(function (NavigationItem $child): bool {
+        return $this->getItems() && collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }

From 4f3a66a5f4adb75eca207baa47fbf5d778e0445d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:07:11 +0100
Subject: [PATCH 1223/2811] Use clearer expression

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0ef773f944f..ebd076aa9af 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,7 +78,7 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return $this->getItems() && collect($this->getItems())->every(function (NavigationItem $child): bool {
+        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
             return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }

From 61dfa89869317f2c35e9cc7b046c2440cfcb4b0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:09:03 +0100
Subject: [PATCH 1224/2811] Move specific method docs from interface to
 implementation

---
 .../src/Framework/Features/Navigation/NavigationElement.php  | 5 -----
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 985517a7cf3..6084549e48b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -18,11 +18,6 @@ public function getPriority(): int;
 
     /**
      * Get the group identifier key of the navigation item, if any.
-     *
-     * For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     * When using automatic subdirectory based groups, the subdirectory name is the group key.
-     * Otherwise, the group key is a "slugified" version of the group's label.
      */
     public function getGroupKey(): ?string;
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index e2aa669c552..9a6917ec8fe 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -135,6 +135,11 @@ public function getPriority(): int
 
     /**
      * Get the group identifier key of the navigation item, if any.
+     *
+     *  For sidebars this is the category key, for navigation menus this is the dropdown key.
+     *
+     *  When using automatic subdirectory based groups, the subdirectory name is the group key.
+     *  Otherwise, the group key is a 'slugified' version of the group's label.
      */
     public function getGroupKey(): ?string
     {

From e1121b11dac5e075b902daa764929ae5d38a58e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:24:29 +0100
Subject: [PATCH 1225/2811] Use the new create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9a6917ec8fe..ff93747abc0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -90,7 +90,7 @@ public static function create(Route|string $destination, ?string $label = null,
      */
     public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
     {
-        return new NavigationGroup($label, $items, $priority);
+        return NavigationGroup::create($label, $items, $priority);
     }
 
     /**

From 2c643945d08f9e49fffeb57551b6920c864b9db5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:29:49 +0100
Subject: [PATCH 1226/2811] Inline and remove the `NavigationItem::forGroup`
 method

---
 .../Features/Navigation/NavigationItem.php       | 16 ----------------
 .../Navigation/NavigationMenuGenerator.php       |  2 +-
 .../tests/Feature/NavigationMenuTest.php         |  5 +++--
 .../Services/DocumentationSidebarTest.php        |  7 ++++---
 .../framework/tests/Unit/NavigationItemTest.php  |  7 ++++---
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ff93747abc0..ba93936fa98 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -77,22 +77,6 @@ public static function create(Route|string $destination, ?string $label = null,
         return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
-    /**
-     * Create a new dropdown navigation menu item.
-     *
-     * @deprecated Use NavigationGroup::create() instead.
-     *
-     * TODO: Move to NavigationGroup::create() as this solves the naming issue, and because it makes little sense for it to be here. It also resolves the self/static issue.
-     *
-     * @param  string  $label  The label of the dropdown item.
-     * @param  array<NavigationItem>  $items  The items to be included in the dropdown.
-     * @param  int  $priority  The priority of the dropdown item. Leave blank to use the default priority, which is last in the menu.
-     */
-    public static function forGroup(string $label, array $items, int $priority = NavigationMenu::LAST): NavigationGroup
-    {
-        return NavigationGroup::create($label, $items, $priority);
-    }
-
     /**
      * Resolve a link to the navigation item.
      */
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 995ce8b81d2..0c2b05cb223 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -177,7 +177,7 @@ protected function createGroupItem(string $groupKey, string $groupName): Navigat
 
         $priority = $this->searchForGroupPriorityInConfig($groupKey);
 
-        return NavigationItem::forGroup($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
+        return NavigationGroup::create($this->normalizeGroupLabel($label), [], $priority ?? NavigationMenu::LAST);
     }
 
     protected function normalizeGroupLabel(string $label): string
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 2c81be2ea36..d0ede48df22 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\ExternalRoute;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\MarkdownPage;
@@ -230,7 +231,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $menu = $this->createNavigationMenu();
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
-            NavigationItem::forGroup('Foo', [
+            NavigationGroup::create('Foo', [
                 NavigationItem::create(Routes::get('foo/bar')),
             ]),
         ]);
@@ -251,7 +252,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
         $this->assertEquals([
             NavigationItem::create(Routes::get('index')),
             NavigationItem::create((new MarkdownPage('foo'))->getRoute()),
-            NavigationItem::forGroup('Bar', [
+            NavigationGroup::create('Bar', [
                 NavigationItem::create((new MarkdownPage('bar/baz'))->getRoute()),
             ]),
         ], $menu->getItems()->all());
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 454cf6ecd05..f6a19307a61 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Filesystem;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Hyde;
@@ -267,10 +268,10 @@ public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forGroup('Bar', [
+                NavigationGroup::create('Bar', [
                     NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                 ]),
-                NavigationItem::forGroup('Foo', [
+                NavigationGroup::create('Foo', [
                     NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
             ]),
@@ -288,7 +289,7 @@ public function testDuplicateLabelsWithinTheSameGroupAreNotRemoved()
 
         $this->assertEquals(
             collect([
-                NavigationItem::forGroup('Foo', [
+                NavigationGroup::create('Foo', [
                     NavigationItem::create(Routes::get('docs/bar'), priority: 999),
                     NavigationItem::create(Routes::get('docs/foo'), priority: 999),
                 ]),
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 51510b06de0..b613557ac9b 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,6 +14,7 @@
 use Hyde\Support\Models\Route;
 use Hyde\Testing\UnitTestCase;
 use Mockery;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
@@ -209,7 +210,7 @@ public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
 
     public function testDropdownFacade()
     {
-        $item = NavigationItem::forGroup('foo', []);
+        $item = NavigationGroup::create('foo');
 
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame([], $item->getItems());
@@ -222,14 +223,14 @@ public function testDropdownFacadeWithChildren()
             new NavigationItem(new Route(new MarkdownPage()), 'bar'),
         ];
 
-        $item = NavigationItem::forGroup('foo', $children);
+        $item = NavigationGroup::create('foo', $children);
         $this->assertSame($children, $item->getItems());
         $this->assertSame(999, $item->getPriority());
     }
 
     public function testDropdownFacadeWithCustomPriority()
     {
-        $item = NavigationItem::forGroup('foo', [], 500);
+        $item = NavigationGroup::create('foo', [], 500);
 
         $this->assertSame(500, $item->getPriority());
     }

From b4cf19ad30bd6fdbd2b8424dcfb3fe89504ce68b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:36:41 +0100
Subject: [PATCH 1227/2811] Add new todo markers

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b50e38682c3..cbd281afd81 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,6 +62,8 @@ public function hasGroups(): bool
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *
+     * @todo See if we can make this deterministic, so we pre-discover which group will be active, without having to weirdly check this in the view.
+     *
      * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
      *
      * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ba93936fa98..53df7171678 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -26,6 +26,8 @@ class NavigationItem implements NavigationElement, Stringable
     protected ?Route $route;
     protected string $label;
     protected int $priority;
+
+    // TODO: Do we actually need this? We should just care if it's physically stored in a group.
     protected ?string $group = null;
 
     /**

From f2295da2be5fe3f1ab6197d96e22cd58ea51f278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:40:07 +0100
Subject: [PATCH 1228/2811] Draft new method to get active group

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index cbd281afd81..1700fc35f62 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -59,6 +59,11 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
+    public function getActiveGroup(): ?string
+    {
+        return Render::getPage()->navigationMenuGroup();
+    }
+
     /**
      * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
      *

From 62b71fd26cc5704450dc4efe296462b836396f7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:43:13 +0100
Subject: [PATCH 1229/2811] Get active group using current logic

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1700fc35f62..dd5f8c9d766 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,7 +61,9 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?string
     {
-        return Render::getPage()->navigationMenuGroup();
+        return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
+            return $this->isGroupActive($item->getGroupKey());
+        })?->getGroupKey();
     }
 
     /**

From bce8386ceccc65f012e72604599872c9d5262162 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:43:48 +0100
Subject: [PATCH 1230/2811] Return the actual group instance

Want to move away from depending so much on the keys
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index dd5f8c9d766..ae3fae6ffd9 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -59,11 +59,11 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
-    public function getActiveGroup(): ?string
+    public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->isGroupActive($item->getGroupKey());
-        })?->getGroupKey();
+        });
     }
 
     /**

From ee47718baf3a65873794f847dd4aae2dda7cda3c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:45:22 +0100
Subject: [PATCH 1231/2811] Move old logic to temporary method for refactor

---
 .../Features/Navigation/DocumentationSidebar.php          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ae3fae6ffd9..b623e7dcfae 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,7 +62,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->isGroupActive($item->getGroupKey());
+            return $this->legacy_isGroupActive($item->getGroupKey());
         });
     }
 
@@ -78,6 +78,12 @@ public function getActiveGroup(): ?NavigationGroup
      * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
      */
     public function isGroupActive(string $group): bool
+    {
+        return $this->legacy_isGroupActive($group);
+    }
+
+    /** @deprecated Temporary method to aid in refactoring. */
+    public function legacy_isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 

From 5708c2c6e9e6bd2aa0fbe834e6c80d68a2b8c45a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:46:34 +0100
Subject: [PATCH 1232/2811] Get state using new method

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b623e7dcfae..923880f054f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,7 +79,7 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        return $this->legacy_isGroupActive($group);
+        return $group === $this->getActiveGroup()?->getGroupKey();
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From 44c2302ced31db07eae6574a125cc00130d6b750 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:50:23 +0100
Subject: [PATCH 1233/2811] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 923880f054f..ef343fefb87 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,6 +64,8 @@ public function getActiveGroup(): ?NavigationGroup
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->legacy_isGroupActive($item->getGroupKey());
         });
+
+        // TODO:  ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other')
     }
 
     /**

From 79a2124185752748620e4d06833f1747676b9fec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:50:49 +0100
Subject: [PATCH 1234/2811] Implement todo to support opening other groups

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index ef343fefb87..1c77bd21373 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,9 +63,7 @@ public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
             return $this->legacy_isGroupActive($item->getGroupKey());
-        });
-
-        // TODO:  ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other')
+        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**

From 0e198a4349baae7f198781e73aa77360237b93ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:51:46 +0100
Subject: [PATCH 1235/2811] Replace fallback to earlier null coalesce

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c77bd21373..e3519bb2cdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,8 +62,8 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey());
-        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
+            return $this->legacy_isGroupActive($item->getGroupKey() ?? 'other');
+        });
     }
 
     /**

From 7f908d3ea9a836cb3d71978d23bd61e781a76377 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:51:49 +0100
Subject: [PATCH 1236/2811] Revert "Replace fallback to earlier null coalesce"

This reverts commit 0e198a4349baae7f198781e73aa77360237b93ea.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e3519bb2cdf..1c77bd21373 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,8 +62,8 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey() ?? 'other');
-        });
+            return $this->legacy_isGroupActive($item->getGroupKey());
+        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**

From 869283e95b9ed06d18831a16cbb8105fa6bd7242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:52:18 +0100
Subject: [PATCH 1237/2811] Handle type error

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c77bd21373..aeb20af17bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -62,7 +62,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
-            return $this->legacy_isGroupActive($item->getGroupKey());
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
         }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From dc4a5399a1f8637ae487523ea83f05d5b4e1d25a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 17:54:20 +0100
Subject: [PATCH 1238/2811] Update mocks

See https://github.com/hydephp/develop/pull/1632#issuecomment-2015506136
---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f6a19307a61..cc057064539 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -209,12 +209,14 @@ public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
+        $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
+        $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
         $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
     }

From 7161f0b32da591041173f2d4da4568af2339719e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:01:45 +0100
Subject: [PATCH 1239/2811] Evaluate types before loop

---
 .../Features/Navigation/DocumentationSidebar.php       |  8 ++++++--
 .../Feature/Services/DocumentationSidebarTest.php      | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index aeb20af17bc..f5478f3d07d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,9 +61,13 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?NavigationGroup
     {
-        return $this->items->first(function (NavigationItem|NavigationGroup $item): bool {
+        if (! $this->hasGroups()) {
+            return null;
+        }
+
+        return $this->items->first(function (NavigationGroup $item): bool {
             return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
-        }) ?? $this->items->first(fn (NavigationItem|NavigationGroup $item): bool => $item->getLabel() === 'Other');
+        }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index cc057064539..c8b9db2df3d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -201,6 +201,16 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         );
     }
 
+//    public function testGetActiveGroup()
+//    {
+//        $this->makePage('foo', ['navigation.group' => 'foo']);
+//        $this->makePage('bar', ['navigation.group' => 'bar']);
+//        $this->makePage('baz');
+//
+//        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
+//        dd(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup());
+//    }
+
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));

From ee3aa690d284f4cb3e2ee7dacee786759973abcb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:06:33 +0100
Subject: [PATCH 1240/2811] Protect legacy method being removed

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f5478f3d07d..008af3d845b 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -87,7 +87,7 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    public function legacy_isGroupActive(string $group): bool
+    protected function legacy_isGroupActive(string $group): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
 

From 1ac4204de961957eb8551642604a3a3ad92a0f82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:09:04 +0100
Subject: [PATCH 1241/2811] Create parameter for internal data hopping

This is temporary as I want to visualise how the data is passed here for the refactor
---
 .../Navigation/DocumentationSidebar.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 008af3d845b..3367feff1cf 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -66,7 +66,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $item): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey());
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), Render::getPage());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
@@ -87,27 +87,27 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group): bool
+    protected function legacy_isGroupActive(string $group, DocumentationPage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey(Render::getPage()->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
 
-        if ($this->isCurrentPageIndexPage()) {
-            return $this->shouldIndexPageBeActive($group) || $groupMatchesCurrentPageGroup;
+        if ($this->isCurrentPageIndexPage($currentPage)) {
+            return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
         }
 
         return $groupMatchesCurrentPageGroup;
     }
 
-    private function isCurrentPageIndexPage(): bool
+    private function isCurrentPageIndexPage(DocumentationPage $currentPage): bool
     {
-        return Render::getPage()->getRoute()->is(DocumentationPage::homeRouteName());
+        return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    private function shouldIndexPageBeActive(string $group): bool
+    private function shouldIndexPageBeActive(string $group, DocumentationPage $currentPage): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
-        if (filled(Render::getPage()->navigationMenuGroup())) {
+        if (filled($currentPage->navigationMenuGroup())) {
             return false;
         }
 

From c1ef8c86a6cbdf351a910197101978ece637f8a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:10:48 +0100
Subject: [PATCH 1242/2811] Introduce local variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 3367feff1cf..4213c2eccc8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,10 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        return $this->items->first(function (NavigationGroup $item): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), Render::getPage());
+        $currentPage = Render::getPage();
+
+        return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From 393820191aac4ead8a5cd606603efb68724b5586 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:10:59 +0100
Subject: [PATCH 1243/2811] Annotate type which should be constant

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4213c2eccc8..07a4dfd704e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,6 +65,7 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
+        /** @var DocumentationPage $currentPage */
         $currentPage = Render::getPage();
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {

From 136f1253cdf6aadf4a3a1f6f6a1a6fd11517d6a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:11:03 +0100
Subject: [PATCH 1244/2811] Revert "Annotate type which should be constant"

This reverts commit 393820191aac4ead8a5cd606603efb68724b5586.
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 07a4dfd704e..4213c2eccc8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,7 +65,6 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        /** @var DocumentationPage $currentPage */
         $currentPage = Render::getPage();
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {

From 30f3424ed8884960007de1ca96d62f9f6fe0a170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:11:40 +0100
Subject: [PATCH 1245/2811] Use more generic type

Apparently some tests use other pages, and I think that's fine for now
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4213c2eccc8..63df79b7398 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,6 +7,7 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
@@ -89,7 +90,7 @@ public function isGroupActive(string $group): bool
     }
 
     /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group, DocumentationPage $currentPage): bool
+    protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
         $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
 
@@ -100,12 +101,12 @@ protected function legacy_isGroupActive(string $group, DocumentationPage $curren
         return $groupMatchesCurrentPageGroup;
     }
 
-    private function isCurrentPageIndexPage(DocumentationPage $currentPage): bool
+    private function isCurrentPageIndexPage(HydePage $currentPage): bool
     {
         return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
 
-    private function shouldIndexPageBeActive(string $group, DocumentationPage $currentPage): bool
+    private function shouldIndexPageBeActive(string $group, HydePage $currentPage): bool
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 

From 9255856825b5fdc676aaed679e4191dd3d54be3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:13:14 +0100
Subject: [PATCH 1246/2811] Extract helper

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 63df79b7398..c3bd971c8f4 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,7 +92,7 @@ public function isGroupActive(string $group): bool
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
+        $groupMatchesCurrentPageGroup = $this->groupMatchesCurrentPageGroup($currentPage, $group);
 
         if ($this->isCurrentPageIndexPage($currentPage)) {
             return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
@@ -116,4 +116,9 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
 
         return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
+
+    protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool
+    {
+        return NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
+    }
 }

From ff21524fa247a42532b352eb2b90a0c67ecd9a34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:13:23 +0100
Subject: [PATCH 1247/2811] Inline variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c3bd971c8f4..a2e479f5d35 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -92,13 +92,11 @@ public function isGroupActive(string $group): bool
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
-        $groupMatchesCurrentPageGroup = $this->groupMatchesCurrentPageGroup($currentPage, $group);
-
         if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage) || $groupMatchesCurrentPageGroup;
+            return $this->shouldIndexPageBeActive($group, $currentPage) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
         }
 
-        return $groupMatchesCurrentPageGroup;
+        return $this->groupMatchesCurrentPageGroup($currentPage, $group);
     }
 
     private function isCurrentPageIndexPage(HydePage $currentPage): bool

From 44b901e2790eb3d42d6f472bdda59df5d4a07868 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:15:15 +0100
Subject: [PATCH 1248/2811] Shift auxiliary return path to helper method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a2e479f5d35..1a050fef99c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -93,7 +93,7 @@ public function isGroupActive(string $group): bool
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
         if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
+            return $this->shouldIndexPageBeActive($group, $currentPage);
         }
 
         return $this->groupMatchesCurrentPageGroup($currentPage, $group);
@@ -112,7 +112,7 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
             return false;
         }
 
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
+        return ($group === $this->getItems()->firstOrFail()->getGroupKey()) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
     }
 
     protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool

From 2f8b7cc66109e3f07fa4daf908f8ed81aca11c5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:17:06 +0100
Subject: [PATCH 1249/2811] Evaluate condition earlier

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1a050fef99c..a4bfb4fe3c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -108,11 +108,15 @@ private function shouldIndexPageBeActive(string $group, HydePage $currentPage):
     {
         // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
+        if ($this->groupMatchesCurrentPageGroup($currentPage, $group)) {
+            return true;
+        }
+
         if (filled($currentPage->navigationMenuGroup())) {
             return false;
         }
 
-        return ($group === $this->getItems()->firstOrFail()->getGroupKey()) || $this->groupMatchesCurrentPageGroup($currentPage, $group);
+        return $group === $this->getItems()->firstOrFail()->getGroupKey();
     }
 
     protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool

From 2efed29d02d17be7f56605675e63db2dc7ae22a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:24:04 +0100
Subject: [PATCH 1250/2811] Update active group check to compare against
 determined state

---
 .../resources/views/components/docs/sidebar-items.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-items.blade.php b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
index aef909869ad..6efff702add 100644
--- a/packages/framework/resources/views/components/docs/sidebar-items.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-items.blade.php
@@ -8,7 +8,7 @@
     <ul id="sidebar-items" role="list">
         @php /** @var \Hyde\Framework\Features\Navigation\NavigationGroup $group */ @endphp
         @foreach ($sidebar->getItems() as $group)
-            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ $sidebar->isGroupActive($group->getGroupKey()) ? 'true' : 'false' }} }" @endif>
+            <li class="sidebar-group" role="listitem" @if($sidebar->isCollapsible()) x-data="{ groupOpen: {{ ($sidebar->getActiveGroup() === $group) ? 'true' : 'false' }} }" @endif>
                 <header @class(['sidebar-group-header p-2 px-4 -ml-2 flex justify-between items-center', 'group hover:bg-black/10' => $sidebar->isCollapsible()]) @if($sidebar->isCollapsible()) @click="groupOpen = ! groupOpen" @endif>
                     <h4 @class(['sidebar-group-heading text-base font-semibold', 'cursor-pointer dark:group-hover:text-white' => $sidebar->isCollapsible()])>{{ $group->getLabel() }}</h4>
                     @if($sidebar->isCollapsible())

From a4a38f5e18efafb58ba3e7928b16b6fdd3c261c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 18:25:21 +0100
Subject: [PATCH 1251/2811] Add todo

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a4bfb4fe3c6..d106cbfdc88 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,7 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
+            // Todo we should also consider checking if the sidebar is collapsible, because if it isn't all groups are always active.
             return null;
         }
 

From eb67f0816b8023ba2f16534cb547ceb9e1f7722f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 22 Mar 2024 19:50:33 +0100
Subject: [PATCH 1252/2811] Return null when current page is null

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index d106cbfdc88..b6f04f4b01c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -69,6 +69,10 @@ public function getActiveGroup(): ?NavigationGroup
 
         $currentPage = Render::getPage();
 
+        if ($currentPage === null) {
+            return null;
+        }
+
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
             return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');

From 9387233254bdb3cdfcac90b5bfc268f6a56f9430 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:31:50 +0100
Subject: [PATCH 1253/2811] Create
 DocumentationSidebarGetActiveGroupUnitTest.php

---
 ...DocumentationSidebarGetActiveGroupUnitTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
new file mode 100644
index 00000000000..a0e0e627ef4
--- /dev/null
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ */
+class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
+{
+    //
+}

From a5df7c6e08a9d57325e2df507252b677c6241ae8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:32:02 +0100
Subject: [PATCH 1254/2811] Annotate test crosslinks

---
 .../tests/Feature/Services/DocumentationSidebarTest.php        | 1 +
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +++
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 1 +
 3 files changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index c8b9db2df3d..90f57c2b39c 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -27,6 +27,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationItem
  *
  * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarUnitTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  */
 class DocumentationSidebarTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index a0e0e627ef4..5c009047574 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -8,6 +8,9 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 036350064ae..9b9c4b7bb6a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -16,6 +16,7 @@
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  *
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
+ * @see \Hyde\Framework\Testing\Unit\DocumentationSidebarGetActiveGroupUnitTest
  * @see \Hyde\Framework\Testing\Unit\NavigationMenuUnitTest
  */
 class DocumentationSidebarUnitTest extends UnitTestCase

From 5203626b8032d7583ff7a18ab201f9c391098a4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:33:28 +0100
Subject: [PATCH 1255/2811] Implement the main test method

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 5c009047574..d28f8b1be56 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -4,7 +4,17 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Mockery;
+use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\RenderData;
+use Hyde\Foundation\Facades\Routes;
+use Illuminate\Support\Facades\View;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -14,5 +24,48 @@
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
-    //
+    protected static bool $needsConfig = true;
+    protected static bool $needsKernel = true;
+
+    public function testGetActiveGroup()
+    {
+        View::swap(Mockery::mock(Factory::class)->makePartial());
+        $renderData = new RenderData();
+        Render::swap($renderData);
+
+        $pages = [
+            'foo' => 'one',
+            'bar' => 'two',
+            'baz' => 'three',
+        ];
+
+        foreach ($pages as $page => $group) {
+            $page = new DocumentationPage($page, ['navigation.group' => $group]);
+            Routes::addRoute($page->getRoute());
+        }
+
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+
+        $this->assertNull($menu->getActiveGroup());
+
+        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+
+        $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
+        $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+
+        foreach ($pages as $page => $group) {
+            $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
+        }
+
+        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+
+        $this->assertSame([
+            'one' => true,
+            'two' => false,
+            'three' => false,
+        ], $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $menu->getActiveGroup(),
+        ])->all());
+    }
 }

From 4c868f242a16984b811b1e4617aa9d9d80ef091a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:41:20 +0100
Subject: [PATCH 1256/2811] Refactor test using ChatGPT

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 41 ++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index d28f8b1be56..ddbe41363ba 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -27,8 +27,10 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
-    public function testGetActiveGroup()
+    protected function setUp(): void
     {
+        parent::setUp();
+
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $renderData = new RenderData();
         Render::swap($renderData);
@@ -43,29 +45,58 @@ public function testGetActiveGroup()
             $page = new DocumentationPage($page, ['navigation.group' => $group]);
             Routes::addRoute($page->getRoute());
         }
+    }
 
+    public function testActiveGroupIsNullInitially()
+    {
         $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-
         $this->assertNull($menu->getActiveGroup());
+    }
+
+    public function testSetActiveGroup()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
 
+        $renderData = Render::getFacadeRoot();
         $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
         $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
         $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+    }
+
+    public function testActiveGroupUpdatesWithPageChanges()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $renderData = Render::getFacadeRoot();
+
+        $pages = [
+            'foo' => 'one',
+            'bar' => 'two',
+            'baz' => 'three',
+        ];
 
         foreach ($pages as $page => $group) {
             $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
             $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
         }
+    }
 
+    public function testActiveGroupItems()
+    {
+        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $renderData = Render::getFacadeRoot();
         $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $this->assertSame([
+        $expectedItems = [
             'one' => true,
             'two' => false,
             'three' => false,
-        ], $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+        ];
+
+        $actualItems = $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
             $item->getGroupKey() => $item === $menu->getActiveGroup(),
-        ])->all());
+        ])->all();
+
+        $this->assertSame($expectedItems, $actualItems);
     }
 }

From b8504ca155c63f818e08e3af1c6e161d4fcc2a83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 10:46:19 +0100
Subject: [PATCH 1257/2811] Cleanup generated test

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index ddbe41363ba..10a79e0ba32 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -27,13 +27,16 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
+    protected RenderData $renderData;
+    protected DocumentationSidebar $menu;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         View::swap(Mockery::mock(Factory::class)->makePartial());
-        $renderData = new RenderData();
-        Render::swap($renderData);
+        $this->renderData = new RenderData();
+        Render::swap($this->renderData);
 
         $pages = [
             'foo' => 'one',
@@ -45,30 +48,25 @@ protected function setUp(): void
             $page = new DocumentationPage($page, ['navigation.group' => $group]);
             Routes::addRoute($page->getRoute());
         }
+
+        $this->menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function testActiveGroupIsNullInitially()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertNull($menu->getActiveGroup());
+        $this->assertNull($this->menu->getActiveGroup());
     }
 
     public function testSetActiveGroup()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $renderData = Render::getFacadeRoot();
-        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
-
-        $this->assertInstanceOf(NavigationGroup::class, $menu->getActiveGroup());
-        $this->assertSame('one', $menu->getActiveGroup()->getGroupKey());
+        $this->assertInstanceOf(NavigationGroup::class, $this->menu->getActiveGroup());
+        $this->assertSame('one', $this->menu->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUpdatesWithPageChanges()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $renderData = Render::getFacadeRoot();
-
         $pages = [
             'foo' => 'one',
             'bar' => 'two',
@@ -76,16 +74,14 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
-            $this->assertSame($group, $menu->getActiveGroup()->getGroupKey());
+            $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->assertSame($group, $this->menu->getActiveGroup()->getGroupKey());
         }
     }
 
     public function testActiveGroupItems()
     {
-        $menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $renderData = Render::getFacadeRoot();
-        $renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
         $expectedItems = [
             'one' => true,
@@ -93,8 +89,8 @@ public function testActiveGroupItems()
             'three' => false,
         ];
 
-        $actualItems = $menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $menu->getActiveGroup(),
+        $actualItems = $this->menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $this->menu->getActiveGroup(),
         ])->all();
 
         $this->assertSame($expectedItems, $actualItems);

From 0376cb37494cb0f8063a567beae5aef95ed9fd18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:29:36 +0100
Subject: [PATCH 1258/2811] Split out unit test method

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 10a79e0ba32..3e3606549a7 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -53,6 +53,12 @@ protected function setUp(): void
     }
 
     public function testActiveGroupIsNullInitially()
+    {
+        $menu = new DocumentationSidebar();
+        $this->assertNull($menu->getActiveGroup());
+    }
+
+    public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->menu->getActiveGroup());
     }

From c2c0716da71cf6de8cd9dd0c5e233c75111eeead Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:36:58 +0100
Subject: [PATCH 1259/2811] Return null if sidebar is not collapsible

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b6f04f4b01c..22678febb17 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,7 +63,10 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
-            // Todo we should also consider checking if the sidebar is collapsible, because if it isn't all groups are always active.
+            return null;
+        }
+
+        if (! $this->isCollapsible()) {
             return null;
         }
 

From d39a6e1e8a99b2c165d44af8026fd9f94d1192f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:37:53 +0100
Subject: [PATCH 1260/2811] Add todos

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 22678febb17..78271f4d5df 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,10 +63,12 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
+            // Todo: Would it make more sense to throw an exception here?
             return null;
         }
 
         if (! $this->isCollapsible()) {
+            // Todo: Would it make more sense to throw an exception here?
             return null;
         }
 

From e43260bc58501c3aa5765edc7c5fdf8f9bb85562 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:46:25 +0100
Subject: [PATCH 1261/2811] Refactor test to make data flow clearer

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 3e3606549a7..69befc453a3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -28,7 +28,6 @@ class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
     protected static bool $needsKernel = true;
 
     protected RenderData $renderData;
-    protected DocumentationSidebar $menu;
 
     protected function setUp(): void
     {
@@ -37,19 +36,6 @@ protected function setUp(): void
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $this->renderData = new RenderData();
         Render::swap($this->renderData);
-
-        $pages = [
-            'foo' => 'one',
-            'bar' => 'two',
-            'baz' => 'three',
-        ];
-
-        foreach ($pages as $page => $group) {
-            $page = new DocumentationPage($page, ['navigation.group' => $group]);
-            Routes::addRoute($page->getRoute());
-        }
-
-        $this->menu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
     public function testActiveGroupIsNullInitially()
@@ -60,15 +46,17 @@ public function testActiveGroupIsNullInitially()
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
-        $this->assertNull($this->menu->getActiveGroup());
+        $this->assertNull($this->sidebar()->getActiveGroup());
     }
 
     public function testSetActiveGroup()
     {
         $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 
-        $this->assertInstanceOf(NavigationGroup::class, $this->menu->getActiveGroup());
-        $this->assertSame('one', $this->menu->getActiveGroup()->getGroupKey());
+        $sidebar = $this->sidebar();
+
+        $this->assertInstanceOf(NavigationGroup::class, $sidebar->getActiveGroup());
+        $this->assertSame('one', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUpdatesWithPageChanges()
@@ -81,7 +69,7 @@ public function testActiveGroupUpdatesWithPageChanges()
 
         foreach ($pages as $page => $group) {
             $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
-            $this->assertSame($group, $this->menu->getActiveGroup()->getGroupKey());
+            $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
 
@@ -95,10 +83,26 @@ public function testActiveGroupItems()
             'three' => false,
         ];
 
-        $actualItems = $this->menu->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $this->menu->getActiveGroup(),
+        $sidebar = $this->sidebar();
+
+        $actualItems = $sidebar->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
+            $item->getGroupKey() => $item === $sidebar->getActiveGroup(),
         ])->all();
 
         $this->assertSame($expectedItems, $actualItems);
     }
+
+    protected function sidebar(array $pages = [
+        'foo' => 'one',
+        'bar' => 'two',
+        'baz' => 'three',
+    ]): DocumentationSidebar
+    {
+        foreach ($pages as $page => $group) {
+            $page = new DocumentationPage($page, ['navigation.group' => $group]);
+            Routes::addRoute($page->getRoute());
+        }
+
+        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
+    }
 }

From a0b0d22b6eee36d0480634090589a67f4e77494b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:42:16 +0100
Subject: [PATCH 1262/2811] Test active group is null when there are no groups

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 69befc453a3..b0bc5d6b8bf 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -44,6 +44,12 @@ public function testActiveGroupIsNullInitially()
         $this->assertNull($menu->getActiveGroup());
     }
 
+    public function testActiveGroupIsNullWhenThereAreNoGroups()
+    {
+        $menu = new DocumentationSidebar();
+        $this->assertNull($menu->getActiveGroup());
+    }
+
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->sidebar()->getActiveGroup());

From 70dccebfc9f3d52056e44cde200415790c6f12e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:40:52 +0100
Subject: [PATCH 1263/2811] Throw exceptions when trying to get group data for
 non grouped menu

I think trying to do this means something is wrong in the application, as you should not care about these methods if you are not using groups, so if you are, something is wrong, and it's helpful to have an exception explain exactly what is wrong than making the user trying to debug which part returns null.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 78271f4d5df..30fcbf5063d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use BadMethodCallException;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\Concerns\HydePage;
@@ -63,13 +64,11 @@ public function hasGroups(): bool
     public function getActiveGroup(): ?NavigationGroup
     {
         if (! $this->hasGroups()) {
-            // Todo: Would it make more sense to throw an exception here?
-            return null;
+            throw new BadMethodCallException('Cannot get the active group when there are no groups.');
         }
 
         if (! $this->isCollapsible()) {
-            // Todo: Would it make more sense to throw an exception here?
-            return null;
+            throw new BadMethodCallException('Cannot get the active group when the sidebar is not collapsible.');
         }
 
         $currentPage = Render::getPage();

From 68118a4674019d64f03bbbd5364a0c451143a20c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 11:41:37 +0100
Subject: [PATCH 1264/2811] Add early throw if there are no items

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 30fcbf5063d..711631cad13 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,10 @@ public function hasGroups(): bool
 
     public function getActiveGroup(): ?NavigationGroup
     {
+        if ($this->items->isEmpty()) {
+            throw new BadMethodCallException('Cannot get the active group when there are no items.');
+        }
+
         if (! $this->hasGroups()) {
             throw new BadMethodCallException('Cannot get the active group when there are no groups.');
         }

From 96f16bf956fff3120d5da640e415be0f1ce79f2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:42:18 +0100
Subject: [PATCH 1265/2811] Tests that exceptions are now thrown

---
 ...umentationSidebarGetActiveGroupUnitTest.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b0bc5d6b8bf..49147d21a03 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Mockery;
+use BadMethodCallException;
 use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Facades\Render;
@@ -12,6 +13,7 @@
 use Hyde\Support\Models\RenderData;
 use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Facades\View;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
@@ -38,16 +40,20 @@ protected function setUp(): void
         Render::swap($this->renderData);
     }
 
-    public function testActiveGroupIsNullInitially()
+    public function testCannotGetActiveGroupWhenNoItemsExist()
     {
-        $menu = new DocumentationSidebar();
-        $this->assertNull($menu->getActiveGroup());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when there are no items.');
+
+        (new DocumentationSidebar())->getActiveGroup();
     }
 
-    public function testActiveGroupIsNullWhenThereAreNoGroups()
+    public function testCannotGetActiveGroupWhenNoGroupsExist()
     {
-        $menu = new DocumentationSidebar();
-        $this->assertNull($menu->getActiveGroup());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when there are no groups.');
+
+        (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
     }
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()

From 683d988419d5cd5a28a9c2218acc29d6d33f2730 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:45:17 +0100
Subject: [PATCH 1266/2811] Manually mock config for each test to reset it

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 49147d21a03..d701672ecfe 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -26,7 +26,6 @@
  */
 class DocumentationSidebarGetActiveGroupUnitTest extends UnitTestCase
 {
-    protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
 
     protected RenderData $renderData;
@@ -38,6 +37,8 @@ protected function setUp(): void
         View::swap(Mockery::mock(Factory::class)->makePartial());
         $this->renderData = new RenderData();
         Render::swap($this->renderData);
+
+        self::mockConfig();
     }
 
     public function testCannotGetActiveGroupWhenNoItemsExist()

From fa5876d3b15f5dc5011ed123f5848cf2548a1f28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:46:52 +0100
Subject: [PATCH 1267/2811] Test cannot get active group when sidebars are not
 collapsible

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index d701672ecfe..b1295cece1a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -57,6 +57,16 @@ public function testCannotGetActiveGroupWhenNoGroupsExist()
         (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
     }
 
+    public function testCannotGetActiveGroupWhenSidebarsAreNotCollapsible()
+    {
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Cannot get the active group when the sidebar is not collapsible.');
+
+        (new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup();
+    }
+
     public function testActiveGroupIsNullWhenNoGroupIsActive()
     {
         $this->assertNull($this->sidebar()->getActiveGroup());

From d05c77a1d8cf51dcbf0fbbc7453c864ad2ccdeb2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 12:55:43 +0100
Subject: [PATCH 1268/2811] Catch exception to return false

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 711631cad13..b932a682daa 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -99,7 +99,11 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        return $group === $this->getActiveGroup()?->getGroupKey();
+        try {
+            return $group === $this->getActiveGroup()?->getGroupKey();
+        } catch (BadMethodCallException) {
+            return false;
+        }
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From 48f0d32dddf92a3d3a125af11472893601555afd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:10:30 +0100
Subject: [PATCH 1269/2811] Add method description

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index b932a682daa..1c519169727 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -61,6 +61,9 @@ public function hasGroups(): bool
         return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
+    /**
+     * Get the group that should be open when the sidebar is loaded.
+     */
     public function getActiveGroup(): ?NavigationGroup
     {
         if ($this->items->isEmpty()) {

From 1a34ce4dbd64a24e748fb2cae22cc8797e32255d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:11:37 +0100
Subject: [PATCH 1270/2811] Mark method as experimental

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 1c519169727..4c7583cb535 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -63,6 +63,8 @@ public function hasGroups(): bool
 
     /**
      * Get the group that should be open when the sidebar is loaded.
+     *
+     * @experimental This method is experimental and may be changed or made internal in the future. If internal, we will not need the validation checks.
      */
     public function getActiveGroup(): ?NavigationGroup
     {

From 48ac6d080a1a13fa0eaf7fd9a379523084c81a92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:18:47 +0100
Subject: [PATCH 1271/2811] Mark method as internal and remove validation

I don't see that this will be used that much outside our view, so we don't need complexity to improve the DX of this.
---
 .../Navigation/DocumentationSidebar.php       | 14 +++---------
 ...mentationSidebarGetActiveGroupUnitTest.php | 22 +++++--------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 4c7583cb535..c865580b629 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -64,20 +64,12 @@ public function hasGroups(): bool
     /**
      * Get the group that should be open when the sidebar is loaded.
      *
-     * @experimental This method is experimental and may be changed or made internal in the future. If internal, we will not need the validation checks.
+     * @internal This method offloads logic for the sidebar view, and is not intended to be used in other contexts.
      */
     public function getActiveGroup(): ?NavigationGroup
     {
-        if ($this->items->isEmpty()) {
-            throw new BadMethodCallException('Cannot get the active group when there are no items.');
-        }
-
-        if (! $this->hasGroups()) {
-            throw new BadMethodCallException('Cannot get the active group when there are no groups.');
-        }
-
-        if (! $this->isCollapsible()) {
-            throw new BadMethodCallException('Cannot get the active group when the sidebar is not collapsible.');
+        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
+            return null;
         }
 
         $currentPage = Render::getPage();
diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b1295cece1a..60d7ed925a2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Mockery;
-use BadMethodCallException;
 use Illuminate\View\Factory;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Facades\Render;
@@ -41,30 +40,21 @@ protected function setUp(): void
         self::mockConfig();
     }
 
-    public function testCannotGetActiveGroupWhenNoItemsExist()
+    public function testGetActiveGroupIsNullWhenNoItemsExist()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when there are no items.');
-
-        (new DocumentationSidebar())->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar())->getActiveGroup());
     }
 
-    public function testCannotGetActiveGroupWhenNoGroupsExist()
+    public function testGetActiveGroupIsNullWhenNoGroupsExist()
     {
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when there are no groups.');
-
-        (new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
-    public function testCannotGetActiveGroupWhenSidebarsAreNotCollapsible()
+    public function testGetActiveGroupIsNullWhenSidebarsAreNotCollapsible()
     {
         self::mockConfig(['docs.sidebar.collapsible' => false]);
 
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Cannot get the active group when the sidebar is not collapsible.');
-
-        (new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup();
+        $this->assertNull((new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup());
     }
 
     public function testActiveGroupIsNullWhenNoGroupIsActive()

From a6942b13bc158a29cdd9f82cc8958dadd9581320 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:21:45 +0100
Subject: [PATCH 1272/2811] Test get active group

---
 .../Services/DocumentationSidebarTest.php     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 90f57c2b39c..6c361083693 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -202,15 +202,21 @@ public function testGetItemsInGroupDoesNotIncludeDocsIndex()
         );
     }
 
-//    public function testGetActiveGroup()
-//    {
-//        $this->makePage('foo', ['navigation.group' => 'foo']);
-//        $this->makePage('bar', ['navigation.group' => 'bar']);
-//        $this->makePage('baz');
-//
-//        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-//        dd(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup());
-//    }
+    public function testGetActiveGroup()
+    {
+        $this->makePage('foo', ['navigation.group' => 'foo']);
+        $this->makePage('bar', ['navigation.group' => 'bar']);
+        $this->makePage('baz');
+
+        Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
+
+        $this->assertEquals(
+            NavigationGroup::create('Foo', [
+                NavigationItem::create(Routes::get('docs/foo'), priority: 999),
+            ]),
+            NavigationMenuGenerator::handle(DocumentationSidebar::class)->getActiveGroup()
+        );
+    }
 
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {

From 91e64ce5b40dd1e5271a238d91117df01856911e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:22:03 +0100
Subject: [PATCH 1273/2811] Revert "Catch exception to return false"

This reverts commit d05c77a1d8cf51dcbf0fbbc7453c864ad2ccdeb2.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c865580b629..c7abd1d0cf3 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use BadMethodCallException;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\Concerns\HydePage;
@@ -96,11 +95,7 @@ public function getActiveGroup(): ?NavigationGroup
      */
     public function isGroupActive(string $group): bool
     {
-        try {
-            return $group === $this->getActiveGroup()?->getGroupKey();
-        } catch (BadMethodCallException) {
-            return false;
-        }
+        return $group === $this->getActiveGroup()?->getGroupKey();
     }
 
     /** @deprecated Temporary method to aid in refactoring. */

From be0b049ca76ffc4d3d7c8704e607a691d63a93ff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:23:25 +0100
Subject: [PATCH 1274/2811] Inline old method now only used in tests

---
 .../Navigation/DocumentationSidebar.php       | 16 --------
 .../Services/DocumentationSidebarTest.php     | 39 ++++++++++++-------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index c7abd1d0cf3..f7a88e4cf2f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -82,22 +82,6 @@ public function getActiveGroup(): ?NavigationGroup
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
-    /**
-     * Is a page within the group the current page? This is used to determine if the sidebar group should be open when loading the page.
-     *
-     * @todo See if we can make this deterministic, so we pre-discover which group will be active, without having to weirdly check this in the view.
-     *
-     * @internal This method is used in the sidebar view to determine if a group should be open, and is not intended to be used in other contexts.
-     *
-     * For index pages, this will also return true for the first group in the menu, unless the index page has a specific group set.
-     *
-     * We have this logic here because not all NavigationItem instances belong to sidebars, and we need data from both.
-     */
-    public function isGroupActive(string $group): bool
-    {
-        return $group === $this->getActiveGroup()?->getGroupKey();
-    }
-
     /** @deprecated Temporary method to aid in refactoring. */
     protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
     {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6c361083693..11b578cd405 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -221,21 +221,24 @@ public function testGetActiveGroup()
     public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
     {
         $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
     {
         $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo-bar'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo-bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -246,9 +249,12 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz']);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('bar' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -259,9 +265,12 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -272,9 +281,12 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
         $this->makePage('baz', ['navigation.group' => 'baz', 'navigation.priority' => 3]);
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('bar'));
-        $this->assertTrue(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('baz'));
+        $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertTrue('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -322,7 +334,8 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
         $this->makePage('index');
 
         Render::setPage(DocumentationPage::get('index'));
-        $this->assertFalse(NavigationMenuGenerator::handle(DocumentationSidebar::class)->isGroupActive('foo'));
+        $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
+        $this->assertFalse('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()

From d462ff7c93886017f45b0b6b1549e27cfa6dc384 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:34:44 +0100
Subject: [PATCH 1275/2811] Fix test method name

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 60d7ed925a2..442e901c2b6 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -62,7 +62,7 @@ public function testActiveGroupIsNullWhenNoGroupIsActive()
         $this->assertNull($this->sidebar()->getActiveGroup());
     }
 
-    public function testSetActiveGroup()
+    public function testWithActiveGroup()
     {
         $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
 

From cf52c68d3a8661cea5af1d4b2d5730a292931220 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 18:39:28 +0100
Subject: [PATCH 1276/2811] Create new test method with more realistic sample

Makes it easier to visualise when the structure looks like real data
---
 ...mentationSidebarGetActiveGroupUnitTest.php | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 442e901c2b6..34851dc3048 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -40,6 +40,36 @@ protected function setUp(): void
         self::mockConfig();
     }
 
+    public function testGetActiveGroup()
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar
+        foreach ($items as $group => $groupItems) {
+            $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
+            $group = new NavigationGroup($group, $groupItems);
+            $items[$group->getGroupKey()] = $group;
+        }
+
+        $sidebar = new DocumentationSidebar($items);
+    }
+
     public function testGetActiveGroupIsNullWhenNoItemsExist()
     {
         $this->assertNull((new DocumentationSidebar())->getActiveGroup());

From 180e8f0ff7ee680c550fdd1bd3159b69a2e166b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:04:24 +0100
Subject: [PATCH 1277/2811] Inline variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 34851dc3048..5f5c624fe24 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -63,8 +63,7 @@ public function testGetActiveGroup()
         // Create the sidebar
         foreach ($items as $group => $groupItems) {
             $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
-            $group = new NavigationGroup($group, $groupItems);
-            $items[$group->getGroupKey()] = $group;
+            $items[$group] = new NavigationGroup($group, $groupItems);
         }
 
         $sidebar = new DocumentationSidebar($items);

From ae51390f19c0ada3f334a893c36fb95bb064c31f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:04:32 +0100
Subject: [PATCH 1278/2811] Inline variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 5f5c624fe24..4ce76579b7e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -62,8 +62,7 @@ public function testGetActiveGroup()
 
         // Create the sidebar
         foreach ($items as $group => $groupItems) {
-            $groupItems = array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems);
-            $items[$group] = new NavigationGroup($group, $groupItems);
+            $items[$group] = new NavigationGroup($group, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
         $sidebar = new DocumentationSidebar($items);

From 71aa97d90f1036f7cb0c55561421305e84382cc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:06:13 +0100
Subject: [PATCH 1279/2811] Rename variables

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 4ce76579b7e..e60eef88aeb 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -61,8 +61,8 @@ public function testGetActiveGroup()
         ];
 
         // Create the sidebar
-        foreach ($items as $group => $groupItems) {
-            $items[$group] = new NavigationGroup($group, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
         $sidebar = new DocumentationSidebar($items);

From 22cf763d3eaf777a8e4b60ce8475bf4fe38e2bcd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:07:19 +0100
Subject: [PATCH 1280/2811] Assert null

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index e60eef88aeb..b7acd4eef8a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,6 +66,8 @@ public function testGetActiveGroup()
         }
 
         $sidebar = new DocumentationSidebar($items);
+
+        $this->assertNull($sidebar->getActiveGroup());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 8a89a37df52c1d7244a6365905edd4a08d4870b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:10:28 +0100
Subject: [PATCH 1281/2811] Extract helper method

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index b7acd4eef8a..45048d3f101 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -94,7 +94,7 @@ public function testActiveGroupIsNullWhenNoGroupIsActive()
 
     public function testWithActiveGroup()
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->mockCurrentPageForActiveGroup('one');
 
         $sidebar = $this->sidebar();
 
@@ -111,14 +111,14 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $this->renderData->setPage(new DocumentationPage($page, ['navigation.group' => $group]));
+            $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
 
     public function testActiveGroupItems()
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'one']));
+        $this->mockCurrentPageForActiveGroup('one');
 
         $expectedItems = [
             'one' => true,
@@ -148,4 +148,9 @@ protected function sidebar(array $pages = [
 
         return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
+
+    protected function mockCurrentPageForActiveGroup(string $group): void
+    {
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => $group]));
+    }
 }

From c4d7884876ae026285e4f812785480c70519643f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:10:36 +0100
Subject: [PATCH 1282/2811] Remove variable

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 45048d3f101..18ab2d032b5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -110,7 +110,7 @@ public function testActiveGroupUpdatesWithPageChanges()
             'baz' => 'three',
         ];
 
-        foreach ($pages as $page => $group) {
+        foreach ($pages as $group) {
             $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }

From e93a0c5b5137232b9e5d5fd34bd4f50fe7132d7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:11:10 +0100
Subject: [PATCH 1283/2811] Section code

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 18ab2d032b5..2ca1f734278 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -60,11 +60,12 @@ public function testGetActiveGroup()
             ],
         ];
 
-        // Create the sidebar
+        // Create the sidebar items
         foreach ($items as $groupKey => $groupItems) {
             $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
         }
 
+        // Create the sidebar
         $sidebar = new DocumentationSidebar($items);
 
         $this->assertNull($sidebar->getActiveGroup());

From 89debff7926ec93291a7c5f6ec7db94298efc080 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:15:57 +0100
Subject: [PATCH 1284/2811] Add comment

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2ca1f734278..2cfd7db7367 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -68,6 +68,7 @@ public function testGetActiveGroup()
         // Create the sidebar
         $sidebar = new DocumentationSidebar($items);
 
+        // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
     }
 

From c7399432f9bb9f1828c6e7fc5b0a1f7174779383 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:17:40 +0100
Subject: [PATCH 1285/2811] Revert "Remove variable"

This reverts commit c4d7884876ae026285e4f812785480c70519643f.
---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2cfd7db7367..79398acc75d 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -112,7 +112,7 @@ public function testActiveGroupUpdatesWithPageChanges()
             'baz' => 'three',
         ];
 
-        foreach ($pages as $group) {
+        foreach ($pages as $page => $group) {
             $this->mockCurrentPageForActiveGroup($group);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }

From 066a804795707b9b41366887d5eeb38a8fcf9381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:18:23 +0100
Subject: [PATCH 1286/2811] Allow setting the identifier in the testing helper
 method

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 79398acc75d..19a457608be 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -113,7 +113,7 @@ public function testActiveGroupUpdatesWithPageChanges()
         ];
 
         foreach ($pages as $page => $group) {
-            $this->mockCurrentPageForActiveGroup($group);
+            $this->mockCurrentPageForActiveGroup($group, $page);
             $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
         }
     }
@@ -151,8 +151,8 @@ protected function sidebar(array $pages = [
         return NavigationMenuGenerator::handle(DocumentationSidebar::class);
     }
 
-    protected function mockCurrentPageForActiveGroup(string $group): void
+    protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
-        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => $group]));
+        $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
 }

From d70fccf5791968451348ac34c3e02193514a7258 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:21:18 +0100
Subject: [PATCH 1287/2811] Add more assertions

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 19a457608be..e02768c674e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -70,6 +70,52 @@ public function testGetActiveGroup()
 
         // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
+
+        // Assert is null when active group is outside the sidebar
+        $this->mockCurrentPageForActiveGroup('foo');
+        $this->assertNull($sidebar->getActiveGroup());
+
+        // Assert is null when sidebar is not collapsible
+        self::mockConfig(['docs.sidebar.collapsible' => false]);
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertNull($sidebar->getActiveGroup());
+        self::mockConfig(['docs.sidebar.collapsible' => true]);
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('configuration');
+        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group
+        $this->mockCurrentPageForActiveGroup('usage');
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
+        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for identifier within the group
+        $this->mockCurrentPageForActiveGroup('usage', 'Routing');
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('Getting-Started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+
+        // Assert the active group for with group key having different casing
+        $this->mockCurrentPageForActiveGroup('getting-started');
+        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 65352b86f8dbb1e6392680d890b16ab025912907 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:22:16 +0100
Subject: [PATCH 1288/2811] Remove overlapping tests

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 71 -------------------
 1 file changed, 71 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index e02768c674e..08cfbd0dc7a 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -10,12 +10,10 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Models\RenderData;
-use Hyde\Foundation\Facades\Routes;
 use Illuminate\Support\Facades\View;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
@@ -128,75 +126,6 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
-    public function testGetActiveGroupIsNullWhenSidebarsAreNotCollapsible()
-    {
-        self::mockConfig(['docs.sidebar.collapsible' => false]);
-
-        $this->assertNull((new DocumentationSidebar([new NavigationGroup('foo')]))->getActiveGroup());
-    }
-
-    public function testActiveGroupIsNullWhenNoGroupIsActive()
-    {
-        $this->assertNull($this->sidebar()->getActiveGroup());
-    }
-
-    public function testWithActiveGroup()
-    {
-        $this->mockCurrentPageForActiveGroup('one');
-
-        $sidebar = $this->sidebar();
-
-        $this->assertInstanceOf(NavigationGroup::class, $sidebar->getActiveGroup());
-        $this->assertSame('one', $sidebar->getActiveGroup()->getGroupKey());
-    }
-
-    public function testActiveGroupUpdatesWithPageChanges()
-    {
-        $pages = [
-            'foo' => 'one',
-            'bar' => 'two',
-            'baz' => 'three',
-        ];
-
-        foreach ($pages as $page => $group) {
-            $this->mockCurrentPageForActiveGroup($group, $page);
-            $this->assertSame($group, $this->sidebar()->getActiveGroup()->getGroupKey());
-        }
-    }
-
-    public function testActiveGroupItems()
-    {
-        $this->mockCurrentPageForActiveGroup('one');
-
-        $expectedItems = [
-            'one' => true,
-            'two' => false,
-            'three' => false,
-        ];
-
-        $sidebar = $this->sidebar();
-
-        $actualItems = $sidebar->getItems()->mapWithKeys(fn (NavigationGroup $item): array => [
-            $item->getGroupKey() => $item === $sidebar->getActiveGroup(),
-        ])->all();
-
-        $this->assertSame($expectedItems, $actualItems);
-    }
-
-    protected function sidebar(array $pages = [
-        'foo' => 'one',
-        'bar' => 'two',
-        'baz' => 'three',
-    ]): DocumentationSidebar
-    {
-        foreach ($pages as $page => $group) {
-            $page = new DocumentationPage($page, ['navigation.group' => $group]);
-            Routes::addRoute($page->getRoute());
-        }
-
-        return NavigationMenuGenerator::handle(DocumentationSidebar::class);
-    }
-
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From 2baf0d0991be3a63246332a0bed7121c7f6c55e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:23:38 +0100
Subject: [PATCH 1289/2811] Extract helper method

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 08cfbd0dc7a..dd7656817c2 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -40,31 +40,7 @@ protected function setUp(): void
 
     public function testGetActiveGroup()
     {
-        // The sidebar structure
-        $items = [
-            // Group keys
-            'getting-started' => [
-                // Group items
-                'Introduction',
-                'Installation',
-            ],
-            'configuration' => [
-                'Configuration',
-                'Environment Variables',
-            ],
-            'usage' => [
-                'Routing',
-                'Middleware',
-            ],
-        ];
-
-        // Create the sidebar items
-        foreach ($items as $groupKey => $groupItems) {
-            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
-        }
-
-        // Create the sidebar
-        $sidebar = new DocumentationSidebar($items);
+        $sidebar = $this->createSidebar();
 
         // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
@@ -130,4 +106,33 @@ protected function mockCurrentPageForActiveGroup(string $group, string $identifi
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
+
+    protected function createSidebar(): DocumentationSidebar
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar items
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        }
+
+        // Create the sidebar
+        return new DocumentationSidebar($items);
+    }
 }

From 73e60d4977f950d2023a57c6d917534ed47f60e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:23:50 +0100
Subject: [PATCH 1290/2811] Move up helper method in class

Makes it easier to understand the test
---
 ...mentationSidebarGetActiveGroupUnitTest.php | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index dd7656817c2..86b6a637f26 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -38,6 +38,35 @@ protected function setUp(): void
         self::mockConfig();
     }
 
+    protected function createSidebar(): DocumentationSidebar
+    {
+        // The sidebar structure
+        $items = [
+            // Group keys
+            'getting-started' => [
+                // Group items
+                'Introduction',
+                'Installation',
+            ],
+            'configuration' => [
+                'Configuration',
+                'Environment Variables',
+            ],
+            'usage' => [
+                'Routing',
+                'Middleware',
+            ],
+        ];
+
+        // Create the sidebar items
+        foreach ($items as $groupKey => $groupItems) {
+            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
+        }
+
+        // Create the sidebar
+        return new DocumentationSidebar($items);
+    }
+
     public function testGetActiveGroup()
     {
         $sidebar = $this->createSidebar();
@@ -106,33 +135,4 @@ protected function mockCurrentPageForActiveGroup(string $group, string $identifi
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
-
-    protected function createSidebar(): DocumentationSidebar
-    {
-        // The sidebar structure
-        $items = [
-            // Group keys
-            'getting-started' => [
-                // Group items
-                'Introduction',
-                'Installation',
-            ],
-            'configuration' => [
-                'Configuration',
-                'Environment Variables',
-            ],
-            'usage' => [
-                'Routing',
-                'Middleware',
-            ],
-        ];
-
-        // Create the sidebar items
-        foreach ($items as $groupKey => $groupItems) {
-            $items[$groupKey] = new NavigationGroup($groupKey, array_map(fn (string $item): NavigationItem => new NavigationItem($item, $item), $groupItems));
-        }
-
-        // Create the sidebar
-        return new DocumentationSidebar($items);
-    }
 }

From 655598c1986f306bdaa6d86683e6c7aff53e8f71 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:24:43 +0100
Subject: [PATCH 1291/2811] Use ChatGPT to split out assertions into new tests

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 86b6a637f26..ed990ac146b 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,57 +66,87 @@ protected function createSidebar(): DocumentationSidebar
         // Create the sidebar
         return new DocumentationSidebar($items);
     }
-
-    public function testGetActiveGroup()
+    public function testNoActiveGroupWhenNoneExists()
     {
         $sidebar = $this->createSidebar();
-
-        // Assert is null when there is no active group
         $this->assertNull($sidebar->getActiveGroup());
+    }
 
-        // Assert is null when active group is outside the sidebar
+    public function testNoActiveGroupWhenOutsideSidebar()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('foo');
         $this->assertNull($sidebar->getActiveGroup());
+    }
 
-        // Assert is null when sidebar is not collapsible
+    public function testNoActiveGroupWhenSidebarNotCollapsible()
+    {
+        $sidebar = $this->createSidebar();
         self::mockConfig(['docs.sidebar.collapsible' => false]);
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertNull($sidebar->getActiveGroup());
         self::mockConfig(['docs.sidebar.collapsible' => true]);
+    }
 
-        // Assert the active group
+    public function testActiveGroupGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group
+    public function testActiveGroupConfiguration()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration');
         $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group
+    public function testActiveGroupUsage()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage');
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierConfiguration()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
         $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for identifier within the group
+    public function testActiveGroupWithIdentifierUsage()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted2()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('Getting-Started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+    }
 
-        // Assert the active group for with group key having different casing
+    public function testActiveGroupDifferentCasingGettingStarted3()
+    {
+        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
         $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
     }

From a4cd4af7d706622ab0e281717c866baa4f0d85cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:25:19 +0100
Subject: [PATCH 1292/2811] Inline local variables

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index ed990ac146b..a11f294c7db 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -68,87 +68,75 @@ protected function createSidebar(): DocumentationSidebar
     }
     public function testNoActiveGroupWhenNoneExists()
     {
-        $sidebar = $this->createSidebar();
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
     }
 
     public function testNoActiveGroupWhenOutsideSidebar()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('foo');
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
     }
 
     public function testNoActiveGroupWhenSidebarNotCollapsible()
     {
-        $sidebar = $this->createSidebar();
         self::mockConfig(['docs.sidebar.collapsible' => false]);
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertNull($sidebar->getActiveGroup());
+        $this->assertNull($this->createSidebar()->getActiveGroup());
         self::mockConfig(['docs.sidebar.collapsible' => true]);
     }
 
     public function testActiveGroupGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupConfiguration()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration');
-        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupUsage()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage');
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierConfiguration()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
-        $this->assertSame('configuration', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupWithIdentifierUsage()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted2()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('Getting-Started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted3()
     {
-        $sidebar = $this->createSidebar();
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()

From 5b510896440b063f666312a087424977ebb3d281 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:26:00 +0100
Subject: [PATCH 1293/2811] Add missing newline

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index a11f294c7db..fd7fd4482a5 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -66,6 +66,7 @@ protected function createSidebar(): DocumentationSidebar
         // Create the sidebar
         return new DocumentationSidebar($items);
     }
+
     public function testNoActiveGroupWhenNoneExists()
     {
         $this->assertNull($this->createSidebar()->getActiveGroup());

From 7e86d30f82d1c023b1f900f39744ed866f474a9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:27:12 +0100
Subject: [PATCH 1294/2811] Comment logic abstract

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f7a88e4cf2f..6567c24c95c 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -67,6 +67,8 @@ public function hasGroups(): bool
      */
     public function getActiveGroup(): ?NavigationGroup
     {
+        // A group is active when it contains the current page being rendered
+
         if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
             return null;
         }

From 1495094980fedd0182d6f081159eff7555ba2031 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:36:54 +0100
Subject: [PATCH 1295/2811] Draft new unit tests

---
 ...DocumentationSidebarGetActiveGroupUnitTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index fd7fd4482a5..c17f1059238 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -150,6 +150,21 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
+    public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
+    {
+
+    }
+
+    public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
+    {
+
+    }
+
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
+    {
+
+    }
+
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From 528d9f4bcd423fe6c132f48a644ac992d86907dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:39:33 +0100
Subject: [PATCH 1296/2811] Implement the tests

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index c17f1059238..f82ffc1a14e 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -152,17 +152,25 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
 
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
-
+        $this->renderData->setPage(new DocumentationPage('index'));
+        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
+        $sidebar = $this->createSidebar();
+        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
+        $this->renderData->setPage(new DocumentationPage('index'));
+        $this->assertSame('other', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
     {
+        $sidebar = $this->createSidebar();
 
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
     }
 
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void

From 04aa0f6433ed891417b9cc896911d2b1cfac53d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:39:45 +0100
Subject: [PATCH 1297/2811] Add additional unit test

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index f82ffc1a14e..2b196ef5775 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -173,6 +173,15 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
     }
 
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
+    {
+        $sidebar = $this->createSidebar();
+        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+    }
+
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));

From d0ef0052a263f12b30a20077332aca13a0873b9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:43:56 +0100
Subject: [PATCH 1298/2811] Add additional unit test

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 2b196ef5775..79286a5bfc9 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -150,6 +150,12 @@ public function testGetActiveGroupIsNullWhenNoGroupsExist()
         $this->assertNull((new DocumentationSidebar([new NavigationItem('foo', 'Foo')]))->getActiveGroup());
     }
 
+    public function testGetActiveGroupIsNullIfTheSetGroupIsNotPresentInTheSidebarItems()
+    {
+        $this->renderData->setPage(new DocumentationPage('foo', ['navigation.group' => 'foo']));
+        $this->assertNull($this->createSidebar()->getActiveGroup());
+    }
+
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
         $this->renderData->setPage(new DocumentationPage('index'));

From 35446053ba7c11cc7874098e20ecc7cca1a18a56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:44:44 +0100
Subject: [PATCH 1299/2811] Compare using deterministic logic instead of legacy
 loop

Performance consideration is negligible (new is 0.038ms instead of 0.085ms) but it makes it more understandable and reduces the need of a complex loop
---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 6567c24c95c..5286c48c005 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -80,7 +80,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
-            return $item->getGroupKey() && $this->legacy_isGroupActive($item->getGroupKey(), $currentPage);
+            return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 

From 2e96c0212117c64c1fcb15831f960f324de4989d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:48:08 +0100
Subject: [PATCH 1300/2811] Add early check for index page handling

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5286c48c005..80c075c976e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,6 +79,10 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
+        if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+            return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
+        }
+
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');

From d167719d86d77024535db81e3b49ae19f0ceb6a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:49:26 +0100
Subject: [PATCH 1301/2811] Remove legacy code that is now no longer needed

---
 .../Navigation/DocumentationSidebar.php       | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 80c075c976e..5b58dd70bbd 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -7,11 +7,9 @@
 use Hyde\Facades\Config;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Facades\Render;
-use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function app;
-use function filled;
 use function is_string;
 
 class DocumentationSidebar extends NavigationMenu
@@ -88,38 +86,8 @@ public function getActiveGroup(): ?NavigationGroup
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 
-    /** @deprecated Temporary method to aid in refactoring. */
-    protected function legacy_isGroupActive(string $group, HydePage $currentPage): bool
-    {
-        if ($this->isCurrentPageIndexPage($currentPage)) {
-            return $this->shouldIndexPageBeActive($group, $currentPage);
-        }
-
-        return $this->groupMatchesCurrentPageGroup($currentPage, $group);
-    }
-
     private function isCurrentPageIndexPage(HydePage $currentPage): bool
     {
         return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
     }
-
-    private function shouldIndexPageBeActive(string $group, HydePage $currentPage): bool
-    {
-        // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
-
-        if ($this->groupMatchesCurrentPageGroup($currentPage, $group)) {
-            return true;
-        }
-
-        if (filled($currentPage->navigationMenuGroup())) {
-            return false;
-        }
-
-        return $group === $this->getItems()->firstOrFail()->getGroupKey();
-    }
-
-    protected function groupMatchesCurrentPageGroup(HydePage $currentPage, string $group): bool
-    {
-        return NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup()) === $group;
-    }
 }

From 1c1080f3c59cb1ace3096616db1f4cca2e1e72a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:49:54 +0100
Subject: [PATCH 1302/2811] Add back code comment

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5b58dd70bbd..bc45b8a6c33 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,6 +78,8 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+            // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
+
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 

From c860213004c8d685e519ed79757f0046b8daefb6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:50:09 +0100
Subject: [PATCH 1303/2811] Inline method

---
 .../Framework/Features/Navigation/DocumentationSidebar.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index bc45b8a6c33..8957ba16936 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,7 +77,7 @@ public function getActiveGroup(): ?NavigationGroup
             return null;
         }
 
-        if ($this->isCurrentPageIndexPage($currentPage) && blank($currentPage->navigationMenuGroup())) {
+        if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
@@ -87,9 +87,4 @@ public function getActiveGroup(): ?NavigationGroup
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
-
-    private function isCurrentPageIndexPage(HydePage $currentPage): bool
-    {
-        return $currentPage->getRoute()->is(DocumentationPage::homeRouteName());
-    }
 }

From f9886f201c6ea4f53fdd9736b9becc1a7de74ece Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:52:28 +0100
Subject: [PATCH 1304/2811] Merge up conditional into null return block

---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 8957ba16936..0895c5787f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -67,16 +67,12 @@ public function getActiveGroup(): ?NavigationGroup
     {
         // A group is active when it contains the current page being rendered
 
-        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible())) {
+        if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible()) || Render::getPage() === null) {
             return null;
         }
 
         $currentPage = Render::getPage();
 
-        if ($currentPage === null) {
-            return null;
-        }
-
         if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
 

From ddcb510439fefd0c8ea2e494efaafcdacf3a855e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:09 +0100
Subject: [PATCH 1305/2811] Shift down code comment

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 0895c5787f5..aca4aef029d 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -65,8 +65,6 @@ public function hasGroups(): bool
      */
     public function getActiveGroup(): ?NavigationGroup
     {
-        // A group is active when it contains the current page being rendered
-
         if ($this->items->isEmpty() || (! $this->hasGroups()) || (! $this->isCollapsible()) || Render::getPage() === null) {
             return null;
         }
@@ -75,11 +73,11 @@ public function getActiveGroup(): ?NavigationGroup
 
         if ($currentPage->getRoute()->is(DocumentationPage::homeRouteName()) && blank($currentPage->navigationMenuGroup())) {
             // Unless the index page has a specific group set, the first group in the sidebar should be open when visiting the index page.
-
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 
         return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+            // A group is active when it contains the current page being rendered
             return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }

From ec6139beb224166d93b3cb56c668255282e07b7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:30 +0100
Subject: [PATCH 1306/2811] Rename loop variable to better match type

---
 .../Framework/Features/Navigation/DocumentationSidebar.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index aca4aef029d..9787e425f57 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -76,9 +76,9 @@ public function getActiveGroup(): ?NavigationGroup
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 
-        return $this->items->first(function (NavigationGroup $item) use ($currentPage): bool {
+        return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered
-            return $item->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
     }
 }

From 8ef1198d724b44287b0221a2180d47a2bb2f5328 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 19:53:58 +0100
Subject: [PATCH 1307/2811] Remove unused null coalesce to other group

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 9787e425f57..a36ddc4f2eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -79,6 +79,6 @@ public function getActiveGroup(): ?NavigationGroup
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered
             return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
-        }) ?? $this->items->first(fn (NavigationGroup $item): bool => $item->getLabel() === 'Other');
+        });
     }
 }

From 63ca58a14091407a1e005a34231ea649e2d9d148 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 20:01:16 +0100
Subject: [PATCH 1308/2811] Style comment formatting

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a36ddc4f2eb..5a6e6a380a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -77,7 +77,7 @@ public function getActiveGroup(): ?NavigationGroup
         }
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
-            // A group is active when it contains the current page being rendered
+            // A group is active when it contains the current page being rendered.
             return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }

From a2baea5088223bd7781b1357698f8f2cfc892b04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 23 Mar 2024 20:09:47 +0100
Subject: [PATCH 1309/2811] Type hint against the shared contract

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5a6e6a380a0..f2a5d485fa6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -55,7 +55,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationElement $item): bool => $item instanceof NavigationGroup);
     }
 
     /**

From 58be9bbfb2b88a9ae3bace3c71ae85c2bc036c40 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:23:57 +0100
Subject: [PATCH 1310/2811] Deprecate ExternalRoute class

See https://github.com/hydephp/develop/pull/1635
---
 packages/framework/src/Support/Models/ExternalRoute.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index f6ad450b071..f39ce405dae 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -8,6 +8,7 @@
  * A route that leads to an external URI.
  *
  * @experimental Take caution when using this class, as it may be subject to change.
+ * @deprecated This class may be removed before release.
  */
 class ExternalRoute extends Route
 {

From 3bc2b90735ca6e5847bc01b741258c907ee16b4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:24:55 +0100
Subject: [PATCH 1311/2811] Create NavigationDestination.php

---
 .../Features/Navigation/NavigationDestination.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationDestination.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
new file mode 100644
index 00000000000..875e9c7ebb7
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationDestination
+{
+    //
+}

From 9e734e0342abc3eb007134433d11aee17231afc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:25:09 +0100
Subject: [PATCH 1312/2811] Class `NavigationDestination` implements
 `Stringable`

---
 .../Framework/Features/Navigation/NavigationDestination.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 875e9c7ebb7..87849d69473 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-class NavigationDestination
+use Stringable;
+
+class NavigationDestination implements Stringable
 {
     //
 }

From 50180ce593e751ced7f3100e6166f6441d81de86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:23:57 +0100
Subject: [PATCH 1313/2811] Deprecate ExternalRoute class

See https://github.com/hydephp/develop/pull/1635
---
 packages/framework/src/Support/Models/ExternalRoute.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
index f6ad450b071..721b89a7c13 100644
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ b/packages/framework/src/Support/Models/ExternalRoute.php
@@ -8,6 +8,8 @@
  * A route that leads to an external URI.
  *
  * @experimental Take caution when using this class, as it may be subject to change.
+ *
+ * @deprecated This class may be removed before release.
  */
 class ExternalRoute extends Route
 {

From e2ec80d675497c710ba24fd6cdff0c5459357a19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:28:00 +0100
Subject: [PATCH 1314/2811] Remove nullable type from route property

I don't think this is used anymore
---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 53df7171678..1bc5001decb 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    protected ?Route $route;
+    protected Route $route;
     protected string $label;
     protected int $priority;
 

From 9353eef2c4b9f290a024738bae47dbc775f4b004 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 11:29:56 +0100
Subject: [PATCH 1315/2811] Remove nullable destination parameter type

Also no longer needed since decoupling the navigation classes
---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1bc5001decb..7d67811207a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -33,12 +33,12 @@ class NavigationItem implements NavigationElement, Stringable
     /**
      * Create a new navigation menu item with your own properties.
      *
-     * @param  \Hyde\Support\Models\Route|string|null  $destination  Route instance, route key, or external URI. For dropdowns/groups, this should be null.
+     * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
-    public function __construct(Route|string|null $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);

From 6f482348067dcf487642af97eb4ec5207cbd806a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:18 +0100
Subject: [PATCH 1316/2811] Add destination property

---
 .../Framework/Features/Navigation/NavigationDestination.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 87849d69473..ab873893c8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -5,8 +5,9 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Stringable;
+use Hyde\Support\Models\Route;
 
 class NavigationDestination implements Stringable
 {
-    //
+    protected Route|string $destination;
 }

From c6f7a595a7ae32362093756d203f9502364b089d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:27 +0100
Subject: [PATCH 1317/2811] Add constructor

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index ab873893c8f..dfc1693712f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -10,4 +10,9 @@
 class NavigationDestination implements Stringable
 {
     protected Route|string $destination;
+
+    public function __construct(Route|string $destination)
+    {
+        $this->destination = $destination;
+    }
 }

From 84861054315805ac8829f69313c06b5d44766f1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:33:40 +0100
Subject: [PATCH 1318/2811] Implement stringable method

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index dfc1693712f..48cedb49a28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -15,4 +15,9 @@ public function __construct(Route|string $destination)
     {
         $this->destination = $destination;
     }
+
+    public function __toString(): string
+    {
+        return (string) $this->destination;
+    }
 }

From 954ccc78f175bcf43604520252fb2caf2e748272 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:34:49 +0100
Subject: [PATCH 1319/2811] Get route instance for route keys

---
 .../Features/Navigation/NavigationDestination.php          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 48cedb49a28..b78a5d04ae1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -6,6 +6,9 @@
 
 use Stringable;
 use Hyde\Support\Models\Route;
+use Hyde\Foundation\Facades\Routes;
+
+use function is_string;
 
 class NavigationDestination implements Stringable
 {
@@ -13,6 +16,10 @@ class NavigationDestination implements Stringable
 
     public function __construct(Route|string $destination)
     {
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
+        }
+
         $this->destination = $destination;
     }
 

From 8da04dbbc0df1273bd05ca53d8f532f2950a85d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:35:15 +0100
Subject: [PATCH 1320/2811] Add get link method

---
 .../Framework/Features/Navigation/NavigationDestination.php  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index b78a5d04ae1..04b7d2f091a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -24,6 +24,11 @@ public function __construct(Route|string $destination)
     }
 
     public function __toString(): string
+    {
+        return $this->getLink();
+    }
+
+    public function getLink(): string
     {
         return (string) $this->destination;
     }

From fff2088833a97a9caeca9f05edf3f112e39df3d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:36:10 +0100
Subject: [PATCH 1321/2811] Deprecate route property

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7d67811207a..8d7a2766640 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,6 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
+    /** @deprecated */
     protected Route $route;
     protected string $label;
     protected int $priority;

From 74a98f52754b96e09a8be2d48894af0b93edfee6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:36:31 +0100
Subject: [PATCH 1322/2811] Add new destination property

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8d7a2766640..7e4c1647f79 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -25,6 +25,7 @@ class NavigationItem implements NavigationElement, Stringable
 {
     /** @deprecated */
     protected Route $route;
+    protected NavigationDestination $destination;
     protected string $label;
     protected int $priority;
 

From a56db505bbb0ead19916d37ff27c3c9a723e2ee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:37:20 +0100
Subject: [PATCH 1323/2811] Construct destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7e4c1647f79..339f018a473 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -42,6 +42,8 @@ class NavigationItem implements NavigationElement, Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
+        $this->destination = new NavigationDestination($destination);
+
         if (is_string($destination)) {
             $destination = Routes::get($destination) ?? new ExternalRoute($destination);
         }

From b28c520afd8074461ea9b06d50fe42d39cf19a73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:41:33 +0100
Subject: [PATCH 1324/2811] Get link using new destination class

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 339f018a473..f2064bf86d0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -104,7 +104,7 @@ public function getRoute(): ?Route
      */
     public function getUrl(): string
     {
-        return (string) $this->route;
+        return $this->destination->getLink();
     }
 
     /**

From e8c1f2f79cbbdc5d8ae3e0808acaa258d21ced3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:44:41 +0100
Subject: [PATCH 1325/2811] Add experimental route getter

---
 .../Framework/Features/Navigation/NavigationDestination.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
index 04b7d2f091a..bcf07e11763 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
@@ -32,4 +32,10 @@ public function getLink(): string
     {
         return (string) $this->destination;
     }
+
+    /** @experimental */
+    public function getRoute(): ?Route
+    {
+        return $this->destination instanceof Route ? $this->destination : null;
+    }
 }

From 5cc2163e2a2ddc6bee55bb20ea7e35d6ed4f48fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:45:00 +0100
Subject: [PATCH 1326/2811] Get route using destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f2064bf86d0..b7b2ee9f0aa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -96,7 +96,7 @@ public function __toString(): string
      */
     public function getRoute(): ?Route
     {
-        return $this->route;
+        return $this->destination->getRoute();
     }
 
     /**

From 6efd8b909212d88e2768a488403e83528e220d7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:48:01 +0100
Subject: [PATCH 1327/2811] Skip tests needing to be reimplemented for
 https://github.com/hydephp/develop/pull/1636

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b613557ac9b..6daf921bb83 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -68,6 +68,7 @@ public function testPassingRouteKeyToConstructorUsesRouteInstance()
 
     public function testPassingUrlToConstructorUsesExternalRoute()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('https://example.com', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
@@ -76,6 +77,7 @@ public function testPassingUrlToConstructorUsesExternalRoute()
 
     public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('foo', 'Home');
         $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());

From c5203902c6ad55a8ae3e5531894aad1526da37c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:55:14 +0100
Subject: [PATCH 1328/2811] Use null check instead of instanceof on deprecated
 class

---
 .../src/Framework/Features/Navigation/NavigationGroup.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ebd076aa9af..5b9c0ea8896 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Arr;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\ExternalRoute;
 
 use function min;
 use function collect;
@@ -79,7 +78,7 @@ protected function addItem(NavigationItem $item): void
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return (! $child->getRoute() instanceof ExternalRoute) && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return ($child->getRoute() !== null) && $child->getRoute()->getPage() instanceof DocumentationPage;
         });
     }
 }

From faea07b04747ed3ec1b616dc6b28f86696030800 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 12:56:59 +0100
Subject: [PATCH 1329/2811] Reimplement tests for changed types

---
 .../framework/tests/Unit/NavigationItemTest.php  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 6daf921bb83..3cb99793a9c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -66,22 +66,18 @@ public function testPassingRouteKeyToConstructorUsesRouteInstance()
         $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
     }
 
-    public function testPassingUrlToConstructorUsesExternalRoute()
+    public function testPassingUrlToConstructorSetsRouteToNull()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('https://example.com', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
-        $this->assertEquals(new ExternalRoute('https://example.com'), $item->getRoute());
-        $this->assertSame('https://example.com', (string) $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('https://example.com', $item->getUrl());
     }
 
-    public function testPassingUnknownRouteKeyToConstructorUsesExternalRoute()
+    public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = new NavigationItem('foo', 'Home');
-        $this->assertInstanceOf(ExternalRoute::class, $item->getRoute());
-        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
-        $this->assertSame('foo', (string) $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('foo', $item->getUrl());
     }
 
     public function testGetDestination()

From f5a356736b6fe7152dda673c3cd08fb4bb401ec8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:06:03 +0100
Subject: [PATCH 1330/2811] Compare state using destination

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b7b2ee9f0aa..db5b1526127 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -141,7 +141,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->route->getLink();
+        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
     }
 
     /** @return ($group is null ? null : string) */

From 39108997d1d707bc9f948e267795b3a518ce99c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:06:59 +0100
Subject: [PATCH 1331/2811] Use accessor with same logic

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index db5b1526127..9d89484bdf9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -141,7 +141,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->destination->getLink();
+        return Hyde::currentRoute()->getLink() === $this->getUrl();
     }
 
     /** @return ($group is null ? null : string) */

From cdceed7f81f011f347c8ba079a84a535a59a3b4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 13:07:51 +0100
Subject: [PATCH 1332/2811] Remove deprecated route property

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9d89484bdf9..1cf373a5081 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,8 +23,6 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    /** @deprecated */
-    protected Route $route;
     protected NavigationDestination $destination;
     protected string $label;
     protected int $priority;
@@ -44,11 +42,6 @@ public function __construct(Route|string $destination, string $label, int $prior
     {
         $this->destination = new NavigationDestination($destination);
 
-        if (is_string($destination)) {
-            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
-        }
-
-        $this->route = $destination;
         $this->label = $label;
         $this->priority = $priority;
 

From d16368c378772d6bb8accabda2f6c7be20f793f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:30:35 +0100
Subject: [PATCH 1333/2811] Deprecate methods we probably don't actually need

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1cf373a5081..6fec030a9f6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -86,6 +86,8 @@ public function __toString(): string
 
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
+     *
+     * @deprecated To simplify the class, we may remove this as we probably don't need it.
      */
     public function getRoute(): ?Route
     {
@@ -94,6 +96,8 @@ public function getRoute(): ?Route
 
     /**
      * Resolve the destination link of the navigation item.
+     *
+     * @deprecated May be renamed to getLink() in the future.
      */
     public function getUrl(): string
     {

From eb81668e91594e9944a5d72cffb5f7d29246f2f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:31:28 +0100
Subject: [PATCH 1334/2811] Skip tests needing to be reimplemented for #1636

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 3cb99793a9c..002270845b2 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -129,6 +129,7 @@ public function testToString()
 
     public function testCreateWithLink()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
@@ -171,6 +172,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
+        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 

From 798acda5546fd8d09ca9ee25d3b5693fb22915a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:34:58 +0100
Subject: [PATCH 1335/2811] Normalize logic with new destination constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6fec030a9f6..4615fdbbdf2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -60,8 +60,8 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
     {
-        if (is_string($destination)) {
-            $destination = Routes::get($destination) ?? new ExternalRoute($destination);
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
         }
 
         if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {

From 6a64d131765e101171c9ef2a1694ed5f1207eb54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:36:27 +0100
Subject: [PATCH 1336/2811] Remove type check for old class

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 4615fdbbdf2..c3fa4d1973d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
-use Hyde\Support\Models\ExternalRoute;
 
 use function is_string;
 
@@ -64,7 +63,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $destination = Routes::get($destination);
         }
 
-        if ($destination instanceof Route && ! $destination instanceof ExternalRoute) {
+        if ($destination instanceof Route) {
             return new self(
                 $destination,
                 $label ?? $destination->getPage()->navigationMenuLabel(),

From 1eea4dead92bd0c80208eac6b6fe160760e082a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:38:28 +0100
Subject: [PATCH 1337/2811] Update deprecation notice

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c3fa4d1973d..867684ea5f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -96,7 +96,7 @@ public function getRoute(): ?Route
     /**
      * Resolve the destination link of the navigation item.
      *
-     * @deprecated May be renamed to getLink() in the future.
+     * @deprecated May be renamed to getLink() in the future to better match its usage, and to match the Route class.
      */
     public function getUrl(): string
     {

From 218590dcc9f41daf390d209f1c299c7e5de3a28d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:42:28 +0100
Subject: [PATCH 1338/2811] Replace dependences on deprecated class with
 inlined strings

We need the kernel and config so we can check if the routes exist
---
 packages/framework/tests/Feature/NavigationMenuTest.php     | 3 +--
 .../framework/tests/Unit/DocumentationSidebarUnitTest.php   | 6 ++++--
 packages/framework/tests/Unit/NavigationMenuUnitTest.php    | 6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index d0ede48df22..a98931a6e41 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -268,7 +267,7 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         Hyde::boot();
 
         $navigation = app('navigation.main');
-        $navigation->add(new NavigationItem(new ExternalRoute('/foo'), 'Foo'));
+        $navigation->add(new NavigationItem('/foo', 'Foo'));
 
         $this->assertCount(2, $navigation->getItems());
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 9b9c4b7bb6a..4c009f9382d 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
@@ -21,6 +20,9 @@
  */
 class DocumentationSidebarUnitTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     // Base menu tests
 
     public function testCanConstruct()
@@ -228,6 +230,6 @@ protected function getItems(): array
 
     protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem($destination, $label, $priority);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuUnitTest.php b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
index e90b159624f..8de2aba9229 100644
--- a/packages/framework/tests/Unit/NavigationMenuUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuUnitTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
@@ -19,6 +18,9 @@
  */
 class NavigationMenuUnitTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     // Base menu tests
 
     public function testCanConstruct()
@@ -159,6 +161,6 @@ protected function getItems(): array
 
     protected function item(string $destination, string $label, int $priority = 500): NavigationItem
     {
-        return new NavigationItem(new ExternalRoute($destination), $label, $priority);
+        return new NavigationItem($destination, $label, $priority);
     }
 }

From 67941949381dd87fea22fbe69131b5a23d17ffbb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:44:43 +0100
Subject: [PATCH 1339/2811] Remove logic added to base of test

---
 packages/framework/tests/Unit/DocumentationSidebarUnitTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
index 4c009f9382d..27e1e3826e3 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarUnitTest.php
@@ -209,9 +209,6 @@ public function testHasGroupsReturnsFalseWhenNoItemsHaveChildren()
 
     public function testHasGroupsReturnsTrueWhenAtLeastOneItemIsNavigationGroupInstance()
     {
-        self::mockConfig();
-        self::setupKernel();
-
         $menu = new DocumentationSidebar([
             new NavigationGroup('foo', []),
         ]);

From ba65f1c5d38c9cd786065fb9b424cb181e288b0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:48:30 +0100
Subject: [PATCH 1340/2811] Delete ExternalRoute.php

---
 .../src/Support/Models/ExternalRoute.php      | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 packages/framework/src/Support/Models/ExternalRoute.php

diff --git a/packages/framework/src/Support/Models/ExternalRoute.php b/packages/framework/src/Support/Models/ExternalRoute.php
deleted file mode 100644
index 721b89a7c13..00000000000
--- a/packages/framework/src/Support/Models/ExternalRoute.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Support\Models;
-
-/**
- * A route that leads to an external URI.
- *
- * @experimental Take caution when using this class, as it may be subject to change.
- *
- * @deprecated This class may be removed before release.
- */
-class ExternalRoute extends Route
-{
-    protected string $destination;
-
-    /** @noinspection PhpMissingParentConstructorInspection */
-    public function __construct(string $destination)
-    {
-        $this->destination = $destination;
-    }
-
-    public function getLink(): string
-    {
-        return $this->destination;
-    }
-}

From 72fce42a51c6730a8588dbf0b7d4663e14723c86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:51:13 +0100
Subject: [PATCH 1341/2811] Revert "Skip tests needing to be reimplemented for
 #1636"

This reverts commit eb81668e91594e9944a5d72cffb5f7d29246f2f9.
---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 002270845b2..3cb99793a9c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -129,7 +129,6 @@ public function testToString()
 
     public function testCreateWithLink()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
@@ -172,7 +171,6 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->markTestSkipped('Todo: Reimplement this test for https://github.com/hydephp/develop/pull/1636');
         $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
     }
 

From cab21b70721c0a3d20c37334ab0252d5aab78c43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:53:31 +0100
Subject: [PATCH 1342/2811] Reimplement tests for changed types

---
 packages/framework/tests/Unit/NavigationItemTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 3cb99793a9c..a74e1d94d76 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Support\Models\ExternalRoute;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\MarkdownPage;
@@ -131,7 +130,8 @@ public function testCreateWithLink()
     {
         $item = NavigationItem::create('foo', 'bar');
 
-        $this->assertEquals(new ExternalRoute('foo'), $item->getRoute());
+        $this->assertNull($item->getRoute());
+        $this->assertSame('foo', $item->getUrl());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -171,7 +171,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->assertInstanceOf(ExternalRoute::class, NavigationItem::create('foo', 'foo')->getRoute());
+        $this->assertNull(NavigationItem::create('foo', 'foo')->getRoute());
     }
 
     public function testCreateWithCustomPriority()

From 0dec761e7ba554dcee8ebff754f31d934a882ced Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:54:01 +0100
Subject: [PATCH 1343/2811] Rename test for removed class

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a74e1d94d76..209727ea153 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -243,7 +243,7 @@ public function testIsCurrent()
         $this->assertFalse(NavigationItem::create(new Route(new InMemoryPage('bar')))->isActive());
     }
 
-    public function testIsCurrentWithExternalRoute()
+    public function testIsCurrentWithLink()
     {
         Render::swap(Mockery::mock(RenderData::class, [
             'getRoute' => new Route(new InMemoryPage('foo')),

From 976d7ff5dd46fa6d10118ee4c2a1084ee585c6c7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:54:12 +0100
Subject: [PATCH 1344/2811] Remove removed new class from release notes

---
 RELEASE_NOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1c7e3aa81e5..3c8def52a9b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,7 +11,6 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
-- Added a new `ExternalRoute` class to represent external routes.
 - Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed

From 45332ecf91178c4083eeddf44f75f2ba1df41581 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:57:08 +0100
Subject: [PATCH 1345/2811] Add a new page accessor

---
 .../src/Framework/Features/Navigation/NavigationItem.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 867684ea5f5..ea8febd647a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -83,6 +84,14 @@ public function __toString(): string
         return $this->getUrl();
     }
 
+    /**
+     * If the navigation item is a link to a routed page, get the corresponding page instance.
+     */
+    public function getPage(): ?HydePage
+    {
+        return $this->destination->getRoute()?->getPage();
+    }
+
     /**
      * Get the destination route of the navigation item. For dropdowns, this will return null.
      *

From 2f963c617e0432e957ba780439479989b0274bcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 15:58:38 +0100
Subject: [PATCH 1346/2811] Simplify search logic to access page directly

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 5b9c0ea8896..937d1647ddd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -78,7 +78,7 @@ protected function addItem(NavigationItem $item): void
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return ($child->getRoute() !== null) && $child->getRoute()->getPage() instanceof DocumentationPage;
+            return $child->getPage() instanceof DocumentationPage;
         });
     }
 }

From 6aa82b7257f2696e5a180fad9a7a771a3a38225c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:03:40 +0100
Subject: [PATCH 1347/2811] Restructure test to improve assertions

And to care less about the route state
---
 .../tests/Unit/NavigationItemTest.php         | 68 +++++++++++++------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 209727ea153..b97a192056c 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -41,10 +41,10 @@ protected function setUp(): void
 
     public function testConstruct()
     {
-        $route = new Route(new MarkdownPage());
-        $item = new NavigationItem($route, 'Test', 500);
-
-        $this->assertSame($route, $item->getRoute());
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem('foo', 'Test'));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test'));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
+        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'));
     }
 
     public function testIsInstanceOfNavigationElement()
@@ -55,36 +55,45 @@ public function testIsInstanceOfNavigationElement()
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());
-        $this->assertSame($route, (new NavigationItem($route, 'Home'))->getRoute());
+        $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
     public function testPassingRouteKeyToConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');
-
-        $this->assertSame($route, (new NavigationItem('index', 'Home'))->getRoute());
+        $item = new NavigationItem('index', 'Home');
+        $this->assertNotNull($item->getPage());
+        $this->assertSame($route->getPage(), $item->getPage());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('https://example.com', 'Home');
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('https://example.com', $item->getUrl());
     }
 
     public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('foo', 'Home');
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('foo', $item->getUrl());
     }
 
-    public function testGetDestination()
+    public function testCanGetPage()
+    {
+        $page = new MarkdownPage();
+        $item = new NavigationItem(new Route($page), 'Test', 500);
+
+        $this->assertSame($page, $item->getPage());
+    }
+
+    public function testGetPageRoute()
     {
         $route = new Route(new InMemoryPage('foo'));
         $NavigationItem = new NavigationItem($route, 'Page', 500);
 
-        $this->assertSame($route, $NavigationItem->getRoute());
+        $this->assertEquals($route, $NavigationItem->getPage()->getRoute());
     }
 
     public function testGetLink()
@@ -113,10 +122,12 @@ public function testGetGroup()
 
     public function testFromRoute()
     {
-        $route = new Route(new MarkdownPage());
+        $page = new MarkdownPage();
+        $route = new Route($page);
         $item = NavigationItem::create($route);
 
-        $this->assertSame($route, $item->getRoute());
+        $this->assertSame($page, $item->getPage());
+        $this->assertEquals($route, $item->getPage()->getRoute());
     }
 
     public function testToString()
@@ -130,7 +141,7 @@ public function testCreateWithLink()
     {
         $item = NavigationItem::create('foo', 'bar');
 
-        $this->assertNull($item->getRoute());
+        $this->assertNull($item->getPage());
         $this->assertSame('foo', $item->getUrl());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
@@ -146,19 +157,38 @@ public function testCreate()
         $route = Routes::get('404');
         $item = NavigationItem::create($route, 'foo');
 
-        $this->assertSame($route, $item->getRoute());
+        $this->assertSame($route->getPage(), $item->getPage());
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
+        $this->assertEquals($route, $item->getPage()->getRoute());
+        $this->assertSame('404.html', $item->getUrl());
+        $this->assertSame('404.html', (string) $item);
+        $this->assertNull($item->getGroupKey());
     }
 
     public function testForIndexRoute()
     {
         $route = Routes::get('index');
-        $item = NavigationItem::create($route, 'foo');
+        $item = NavigationItem::create($route);
 
-        $this->assertSame($route, $item->getRoute());
-        $this->assertSame('foo', $item->getLabel());
+        $this->assertSame($route->getPage(), $item->getPage());
+        $this->assertSame('Home', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
+        $this->assertEquals($route, $item->getPage()->getRoute());
+        $this->assertSame('index.html', $item->getUrl());
+        $this->assertSame('index.html', (string) $item);
+        $this->assertNull($item->getGroupKey());
+    }
+
+    public function testCreateWithLabels()
+    {
+        $route = Routes::get('404');
+        $item = NavigationItem::create($route, 'foo');
+        $this->assertSame('foo', $item->getLabel());
+
+        $route = Routes::get('index');
+        $item = NavigationItem::create($route);
+        $this->assertSame('Home', $item->getLabel());
     }
 
     public function testCreateWithRouteKey()
@@ -171,7 +201,7 @@ public function testCreateWithRouteKey()
 
     public function testCreateWithMissingRouteKey()
     {
-        $this->assertNull(NavigationItem::create('foo', 'foo')->getRoute());
+        $this->assertNull(NavigationItem::create('foo', 'foo')->getPage());
     }
 
     public function testCreateWithCustomPriority()

From b4011e124fcd9cd7b80d23f2e5aeb7f6631859f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:26:31 +0100
Subject: [PATCH 1348/2811] Use the resolved link instead of implicit route
 resolve

---
 .../resources/views/components/docs/sidebar-item.blade.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index cab03d7c3f3..d57c5d468a5 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
     @if($item->isActive())
-        <a href="{{ $item->getRoute() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getUrl() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getRoute() }}" @class([$grouped
+        <a href="{{ $item->getUrl() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>

From 1b94a90fa45f286967a6efa3c8499aaa1f176f7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:30:07 +0100
Subject: [PATCH 1349/2811] Remove `NavigationItem::getRoute` method

Use `$item->getPage()->getRoute()` instead
---
 .../Framework/Features/Navigation/NavigationItem.php   | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ea8febd647a..ff72167d305 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -92,16 +92,6 @@ public function getPage(): ?HydePage
         return $this->destination->getRoute()?->getPage();
     }
 
-    /**
-     * Get the destination route of the navigation item. For dropdowns, this will return null.
-     *
-     * @deprecated To simplify the class, we may remove this as we probably don't need it.
-     */
-    public function getRoute(): ?Route
-    {
-        return $this->destination->getRoute();
-    }
-
     /**
      * Resolve the destination link of the navigation item.
      *

From 37c51c2f0f47a1e14d41a66631bad27ad0ae236e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:37:21 +0100
Subject: [PATCH 1350/2811] Rename `NavigationItem` method `getUrl` to
 `getLink`

---
 .../views/components/docs/sidebar-item.blade.php     |  4 ++--
 .../Framework/Features/Navigation/NavigationItem.php |  8 +++-----
 packages/framework/tests/Unit/NavigationItemTest.php | 12 ++++++------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index d57c5d468a5..c22f14182e8 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -4,7 +4,7 @@
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()
     ]) role="listitem">
     @if($item->isActive())
-        <a href="{{ $item->getUrl() }}" aria-current="true" @class([$grouped
+        <a href="{{ $item->getLink() }}" aria-current="true" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out hover:bg-black/10'
             : '-ml-4 p-2 block hover:bg-black/5 dark:hover:bg-black/10 text-indigo-600 dark:text-indigo-400 dark:font-medium border-l-[0.325rem] border-indigo-500 transition-colors duration-300 ease-in-out'
         ])>
@@ -16,7 +16,7 @@
             {!! $page->getTableOfContents() !!}
         @endif
     @else
-        <a href="{{ $item->getUrl() }}" @class([$grouped
+        <a href="{{ $item->getLink() }}" @class([$grouped
             ? '-ml-8 pl-4 py-1 px-2 block border-l-[0.325rem] border-transparent transition-colors duration-300 ease-in-out hover:bg-black/10'
             : 'block -ml-4 p-2 border-l-[0.325rem] border-transparent hover:bg-black/5 dark:hover:bg-black/10'
         ])>
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ff72167d305..5e6b12da234 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -81,7 +81,7 @@ public static function create(Route|string $destination, ?string $label = null,
      */
     public function __toString(): string
     {
-        return $this->getUrl();
+        return $this->getLink();
     }
 
     /**
@@ -94,10 +94,8 @@ public function getPage(): ?HydePage
 
     /**
      * Resolve the destination link of the navigation item.
-     *
-     * @deprecated May be renamed to getLink() in the future to better match its usage, and to match the Route class.
      */
-    public function getUrl(): string
+    public function getLink(): string
     {
         return $this->destination->getLink();
     }
@@ -136,7 +134,7 @@ public function getGroupKey(): ?string
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->getUrl();
+        return Hyde::currentRoute()->getLink() === $this->getLink();
     }
 
     /** @return ($group is null ? null : string) */
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b97a192056c..10a76006f56 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -70,14 +70,14 @@ public function testPassingUrlToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('https://example.com', 'Home');
         $this->assertNull($item->getPage());
-        $this->assertSame('https://example.com', $item->getUrl());
+        $this->assertSame('https://example.com', $item->getLink());
     }
 
     public function testPassingUnknownRouteKeyToConstructorSetsRouteToNull()
     {
         $item = new NavigationItem('foo', 'Home');
         $this->assertNull($item->getPage());
-        $this->assertSame('foo', $item->getUrl());
+        $this->assertSame('foo', $item->getLink());
     }
 
     public function testCanGetPage()
@@ -99,7 +99,7 @@ public function testGetPageRoute()
     public function testGetLink()
     {
         $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertSame('foo.html', $NavigationItem->getUrl());
+        $this->assertSame('foo.html', $NavigationItem->getLink());
     }
 
     public function testGetLabel()
@@ -142,7 +142,7 @@ public function testCreateWithLink()
         $item = NavigationItem::create('foo', 'bar');
 
         $this->assertNull($item->getPage());
-        $this->assertSame('foo', $item->getUrl());
+        $this->assertSame('foo', $item->getLink());
         $this->assertSame('bar', $item->getLabel());
         $this->assertSame(500, $item->getPriority());
     }
@@ -161,7 +161,7 @@ public function testCreate()
         $this->assertSame('foo', $item->getLabel());
         $this->assertSame(999, $item->getPriority());
         $this->assertEquals($route, $item->getPage()->getRoute());
-        $this->assertSame('404.html', $item->getUrl());
+        $this->assertSame('404.html', $item->getLink());
         $this->assertSame('404.html', (string) $item);
         $this->assertNull($item->getGroupKey());
     }
@@ -175,7 +175,7 @@ public function testForIndexRoute()
         $this->assertSame('Home', $item->getLabel());
         $this->assertSame(0, $item->getPriority());
         $this->assertEquals($route, $item->getPage()->getRoute());
-        $this->assertSame('index.html', $item->getUrl());
+        $this->assertSame('index.html', $item->getLink());
         $this->assertSame('index.html', (string) $item);
         $this->assertNull($item->getGroupKey());
     }

From 53a8b08e03e987d6681b28b56535c03c3804ac9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:40:46 +0100
Subject: [PATCH 1351/2811] Add type annotation

---
 .../resources/views/components/docs/sidebar-item.blade.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/resources/views/components/docs/sidebar-item.blade.php b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
index c22f14182e8..fe320513408 100644
--- a/packages/framework/resources/views/components/docs/sidebar-item.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar-item.blade.php
@@ -1,4 +1,5 @@
 @props(['grouped' => false])
+@php /** @var \Hyde\Framework\Features\Navigation\NavigationItem $item */ @endphp
 <li @class(['sidebar-item -ml-4 pl-4', $grouped
         ? 'active -ml-8 pl-8 bg-black/5 dark:bg-black/10'
         : 'active bg-black/5 dark:bg-black/10' => $item->isActive()

From 1b8cd1bbd008da76befbfe83c2fc4ac20ca24d73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 16:53:46 +0100
Subject: [PATCH 1352/2811] Unwrap unnecessary null check

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 5e6b12da234..00e1c2bba4c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -45,9 +45,7 @@ public function __construct(Route|string $destination, string $label, int $prior
         $this->label = $label;
         $this->priority = $priority;
 
-        if ($group !== null) {
-            $this->group = static::normalizeGroupKey($group);
-        }
+        $this->group = static::normalizeGroupKey($group);
     }
 
     /**

From d3b2044b087b41335a3191fa4834dbb0d73077f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:00:54 +0100
Subject: [PATCH 1353/2811] Inline the navigation destination class

Turns out we really didn't need this. It does add one test for the new side effect of constructor now being less magic (desirable as it's the scope of the create method)
---
 .../Navigation/NavigationDestination.php      | 41 -------------------
 .../Features/Navigation/NavigationItem.php    |  8 ++--
 .../tests/Unit/NavigationItemTest.php         | 15 +++++--
 3 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationDestination.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php b/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
deleted file mode 100644
index bcf07e11763..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationDestination.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use Stringable;
-use Hyde\Support\Models\Route;
-use Hyde\Foundation\Facades\Routes;
-
-use function is_string;
-
-class NavigationDestination implements Stringable
-{
-    protected Route|string $destination;
-
-    public function __construct(Route|string $destination)
-    {
-        if (is_string($destination) && Routes::has($destination)) {
-            $destination = Routes::get($destination);
-        }
-
-        $this->destination = $destination;
-    }
-
-    public function __toString(): string
-    {
-        return $this->getLink();
-    }
-
-    public function getLink(): string
-    {
-        return (string) $this->destination;
-    }
-
-    /** @experimental */
-    public function getRoute(): ?Route
-    {
-        return $this->destination instanceof Route ? $this->destination : null;
-    }
-}
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 00e1c2bba4c..6c8d73ad3f5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,7 +23,7 @@
  */
 class NavigationItem implements NavigationElement, Stringable
 {
-    protected NavigationDestination $destination;
+    protected string|Route $destination;
     protected string $label;
     protected int $priority;
 
@@ -40,7 +40,7 @@ class NavigationItem implements NavigationElement, Stringable
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
     {
-        $this->destination = new NavigationDestination($destination);
+        $this->destination = $destination;
 
         $this->label = $label;
         $this->priority = $priority;
@@ -87,7 +87,7 @@ public function __toString(): string
      */
     public function getPage(): ?HydePage
     {
-        return $this->destination->getRoute()?->getPage();
+        return $this->destination instanceof Route ? $this->destination->getPage() : null;
     }
 
     /**
@@ -95,7 +95,7 @@ public function getPage(): ?HydePage
      */
     public function getLink(): string
     {
-        return $this->destination->getLink();
+        return (string) $this->destination;
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 10a76006f56..f003b3400b0 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -58,12 +58,11 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
-    public function testPassingRouteKeyToConstructorUsesRouteInstance()
+    public function testPassingRouteKeyToConstructorUsesDestinationAsLink()
     {
-        $route = Routes::get('index');
         $item = new NavigationItem('index', 'Home');
-        $this->assertNotNull($item->getPage());
-        $this->assertSame($route->getPage(), $item->getPage());
+        $this->assertNull($item->getPage());
+        $this->assertSame('index', $item->getLink());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()
@@ -209,6 +208,14 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
+    {
+        $route = Routes::get('index');
+        $item = NavigationItem::create('index', 'Home');
+        $this->assertNotNull($item->getPage());
+        $this->assertSame($route->getPage(), $item->getPage());
+    }
+
     public function testRouteBasedNavigationItemDestinationsAreResolvedRelatively()
     {
         Render::swap(Mockery::mock(RenderData::class, [

From 1ed674b7f55c77b5d4591ab1f0a094688c566f96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:02:58 +0100
Subject: [PATCH 1354/2811] Reorder methods in class

---
 .../Features/Navigation/NavigationItem.php       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6c8d73ad3f5..c0d65bd58df 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -82,14 +82,6 @@ public function __toString(): string
         return $this->getLink();
     }
 
-    /**
-     * If the navigation item is a link to a routed page, get the corresponding page instance.
-     */
-    public function getPage(): ?HydePage
-    {
-        return $this->destination instanceof Route ? $this->destination->getPage() : null;
-    }
-
     /**
      * Resolve the destination link of the navigation item.
      */
@@ -127,6 +119,14 @@ public function getGroupKey(): ?string
         return $this->group;
     }
 
+    /**
+     * If the navigation item is a link to a routed page, get the corresponding page instance.
+     */
+    public function getPage(): ?HydePage
+    {
+        return $this->destination instanceof Route ? $this->destination->getPage() : null;
+    }
+
     /**
      * Check if the NavigationItem instance is the current page being rendered.
      */

From 4ea66c6d938952aeefd262b1b247e07bd93b4007 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:04:35 +0100
Subject: [PATCH 1355/2811] Replace early construct call with property coalesce
 assignments

---
 .../src/Framework/Features/Navigation/NavigationItem.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c0d65bd58df..099e539cd48 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -63,12 +63,9 @@ public static function create(Route|string $destination, ?string $label = null,
         }
 
         if ($destination instanceof Route) {
-            return new self(
-                $destination,
-                $label ?? $destination->getPage()->navigationMenuLabel(),
-                $priority ?? $destination->getPage()->navigationMenuPriority(),
-                $group ?? $destination->getPage()->navigationMenuGroup(),
-            );
+            $label ??= $destination->getPage()->navigationMenuLabel();
+            $priority ??= $destination->getPage()->navigationMenuPriority();
+            $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
         return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);

From 3e4901bee4d4f1313bea62170e52bbb55c91a45d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:05:18 +0100
Subject: [PATCH 1356/2811] Return new static instead of self

Now longer needed as we decoupled the navigation group class
---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 099e539cd48..0649c7e44e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -56,7 +56,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): self
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new self($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**

From 4909d15d8fa73d57589630d64c58e2cfdef373d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:12:53 +0100
Subject: [PATCH 1357/2811] Test create with null label

---
 packages/framework/tests/Unit/NavigationItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index f003b3400b0..6857189254f 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -208,6 +208,11 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testCreateWithNullLabel()
+    {
+        $this->assertSame('', NavigationItem::create('foo')->getLabel());
+    }
+
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');

From 41db3d1c7772439de56abf46449463e71c6591a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:29:16 +0100
Subject: [PATCH 1358/2811] Test create with null label for route

---
 packages/framework/tests/Unit/NavigationItemTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 6857189254f..fe66e9c57d4 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -208,6 +208,11 @@ public function testCreateWithCustomPriority()
         $this->assertSame(100, NavigationItem::create(Routes::get('index'), 'foo', 100)->getPriority());
     }
 
+    public function testCreateWithNullLabelForRoute()
+    {
+        $this->assertSame('Home', NavigationItem::create('index')->getLabel());
+    }
+
     public function testCreateWithNullLabel()
     {
         $this->assertSame('', NavigationItem::create('foo')->getLabel());

From 0c0a87c95098f3e6fd97813bf49e10097338dfbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:37:37 +0100
Subject: [PATCH 1359/2811] Update label to fall back to the supplied link

---
 .../Features/Navigation/NavigationItem.php      |  2 +-
 .../framework/tests/Unit/NavigationItemTest.php | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 0649c7e44e9..22ac69f8e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? '', $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index fe66e9c57d4..a92b27e25d5 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,7 +215,22 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('', NavigationItem::create('foo')->getLabel());
+        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
+
+        foreach ($links as $link) {
+            $this->assertSame($link, NavigationItem::create($link)->getLink());
+        }
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 180e0dfadec01d844eeba0f4d22340257145cc9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:46:30 +0100
Subject: [PATCH 1360/2811] Fix method being asserted

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index a92b27e25d5..4b7fa9cff2a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -229,7 +229,7 @@ public function testCreateWithNullLabel()
         ];
 
         foreach ($links as $link) {
-            $this->assertSame($link, NavigationItem::create($link)->getLink());
+            $this->assertSame($link, NavigationItem::create($link)->getLabel());
         }
     }
 

From 99ef0ed92c2c3b3dfbdcfcf678fe30108e447108 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:46:43 +0100
Subject: [PATCH 1361/2811] Extract helper method

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 22ac69f8e28..ac93f435a14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? static::makeTitleFromUrl($destination), $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
@@ -137,4 +137,9 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
+
+    protected static function makeTitleFromUrl(string $url): string
+    {
+        return $url;
+    }
 }

From ea50e0f38245ac9ce553cc5851f5cdcc6e85bc2f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:50:49 +0100
Subject: [PATCH 1362/2811] Dynamically generate titles from input links

---
 .../Features/Navigation/NavigationItem.php    |  7 ++-
 .../tests/Unit/NavigationItemTest.php         | 48 +++++++++++++------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ac93f435a14..ed4132e3bc6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -138,8 +138,13 @@ public static function normalizeGroupKey(?string $group): ?string
         return $group ? Str::slug($group) : null;
     }
 
+    /** @experimental This feature may be removed before release, and the label will just fall back to the input $url */
     protected static function makeTitleFromUrl(string $url): string
     {
-        return $url;
+        $basename = basename($url);
+        $basename = Str::replaceFirst('www.', '', $basename);
+        $basename = Str::replaceLast('.html', '', $basename);
+
+        return Hyde::makeTitle($basename);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4b7fa9cff2a..cee578da044 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,22 +215,40 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
-
-        $links = [
-            'www.example.com',
-            'https://example.com',
-            'https://example.com/',
-            'https://example.com/foo',
-            'https://example.com/foo/',
-            'https://example.com/foo/bar',
-            'https://example.com/foo/bar.html',
-            'https://example.com/foo/bar.png',
-        ];
+        $this->assertSame('Foo', NavigationItem::create('foo')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinks()
+    {
+        $this->assertSame('Example.com', NavigationItem::create('example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('example.com/')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://example.com/')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinksWithSubdomain()
+    {
+        $this->assertSame('Example.com', NavigationItem::create('www.example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('www.example.com/')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com')->getLabel());
+        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com/')->getLabel());
+    }
 
-        foreach ($links as $link) {
-            $this->assertSame($link, NavigationItem::create($link)->getLabel());
-        }
+    public function testCreateWithNullLabelForLinksWithPages()
+    {
+        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo')->getLabel());
+        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo/')->getLabel());
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar')->getLabel());
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar/')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinkWithPageWithHtmlExtension()
+    {
+        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar.html')->getLabel());
+    }
+
+    public function testCreateWithNullLabelForLinkWithPageWithOtherExtension()
+    {
+        $this->assertSame('Bar.png', NavigationItem::create('https://example.com/foo/bar.png')->getLabel());
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 8f2bd586a87f3e29a2c24978d53996b50d7655bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:51:37 +0100
Subject: [PATCH 1363/2811] Revert "Dynamically generate titles from input
 links"

This reverts commit ea50e0f38245ac9ce553cc5851f5cdcc6e85bc2f. See https://github.com/hydephp/develop/pull/1638/files#r1536861523

Revert "Extract helper method"

This reverts commit 99ef0ed92c2c3b3dfbdcfcf678fe30108e447108.
---
 .../Features/Navigation/NavigationItem.php    | 12 +----
 .../tests/Unit/NavigationItemTest.php         | 48 ++++++-------------
 2 files changed, 16 insertions(+), 44 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index ed4132e3bc6..22ac69f8e28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -68,7 +68,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? static::makeTitleFromUrl($destination), $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
     }
 
     /**
@@ -137,14 +137,4 @@ public static function normalizeGroupKey(?string $group): ?string
     {
         return $group ? Str::slug($group) : null;
     }
-
-    /** @experimental This feature may be removed before release, and the label will just fall back to the input $url */
-    protected static function makeTitleFromUrl(string $url): string
-    {
-        $basename = basename($url);
-        $basename = Str::replaceFirst('www.', '', $basename);
-        $basename = Str::replaceLast('.html', '', $basename);
-
-        return Hyde::makeTitle($basename);
-    }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index cee578da044..4b7fa9cff2a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -215,40 +215,22 @@ public function testCreateWithNullLabelForRoute()
 
     public function testCreateWithNullLabel()
     {
-        $this->assertSame('Foo', NavigationItem::create('foo')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinks()
-    {
-        $this->assertSame('Example.com', NavigationItem::create('example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('example.com/')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://example.com/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinksWithSubdomain()
-    {
-        $this->assertSame('Example.com', NavigationItem::create('www.example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('www.example.com/')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com')->getLabel());
-        $this->assertSame('Example.com', NavigationItem::create('https://www.example.com/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinksWithPages()
-    {
-        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo')->getLabel());
-        $this->assertSame('Foo', NavigationItem::create('https://example.com/foo/')->getLabel());
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar')->getLabel());
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar/')->getLabel());
-    }
-
-    public function testCreateWithNullLabelForLinkWithPageWithHtmlExtension()
-    {
-        $this->assertSame('Bar', NavigationItem::create('https://example.com/foo/bar.html')->getLabel());
-    }
+        $this->assertSame('foo', NavigationItem::create('foo')->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
 
-    public function testCreateWithNullLabelForLinkWithPageWithOtherExtension()
-    {
-        $this->assertSame('Bar.png', NavigationItem::create('https://example.com/foo/bar.png')->getLabel());
+        foreach ($links as $link) {
+            $this->assertSame($link, NavigationItem::create($link)->getLabel());
+        }
     }
 
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()

From 71c068ce5419a50393782d21e08f1565c8463537 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:56:39 +0100
Subject: [PATCH 1364/2811] Update todo abstract

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 22ac69f8e28..f56f370b831 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -27,7 +27,7 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    // TODO: Do we actually need this? We should just care if it's physically stored in a group.
+    // TODO: Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here?
     protected ?string $group = null;
 
     /**

From cd791af70839ef6bbfdee1c347dd43e356319765 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:57:03 +0100
Subject: [PATCH 1365/2811] Convert todo into deprecation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f56f370b831..345576b38b3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -27,7 +27,7 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    // TODO: Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here?
+    /** @deprecated Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here? */
     protected ?string $group = null;
 
     /**

From f45eb19814c9b6f972dbad01344104f7ddf4b279 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 17:58:10 +0100
Subject: [PATCH 1366/2811] Deprecate accessor for deprecated property

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 345576b38b3..694db93176d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -106,6 +106,8 @@ public function getPriority(): int
     /**
      * Get the group identifier key of the navigation item, if any.
      *
+     * @deprecated as the property is deprecated.
+     *
      *  For sidebars this is the category key, for navigation menus this is the dropdown key.
      *
      *  When using automatic subdirectory based groups, the subdirectory name is the group key.

From 48d945d6fd1a2674eab7826a86482a5d621ac858 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:01:00 +0100
Subject: [PATCH 1367/2811] Deprecate the group paramters

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 694db93176d..764a758a62f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\Concerns\HydePage;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -38,7 +39,7 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  int  $priority  The priority to determine the order of the navigation item.
      * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
     {
         $this->destination = $destination;
 
@@ -56,7 +57,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, ?string $group = null): static
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);

From 51f562023bd8239b68cb4814b267a2c259622c47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:06:03 +0100
Subject: [PATCH 1368/2811] Remove tests for deprecated group accessor

May be radical at this point, but I want to remove usages so I can see better how this is used
---
 .../AutomaticNavigationConfigurationsTest.php |  8 ++---
 .../tests/Unit/NavigationGroupTest.php        | 20 -----------
 .../tests/Unit/NavigationItemTest.php         | 34 -------------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 4277e67ef84..0f5404ee4ef 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1284,21 +1284,19 @@ protected function sidebar(?array $withPages = null): AssertableNavigationMenu
 class TestNavigationItem
 {
     public readonly string $label;
-    public readonly ?string $group;
     public readonly int $priority;
     public readonly array $children;
 
-    public function __construct(string $label, ?string $group, int $priority, array $children)
+    public function __construct(string $label, int $priority, array $children)
     {
         $this->label = $label;
-        $this->group = $group;
         $this->priority = $priority;
         $this->children = collect($children)->map(fn (NavigationItem|NavigationGroup $child) => $child->getLabel())->toArray();
     }
 
     public static function properties(): array
     {
-        return ['label', 'group', 'priority', 'children'];
+        return ['label', 'priority', 'children'];
     }
 }
 
@@ -1320,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getGroupKey(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 9b51ed0c122..2baaf30d2fc 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -114,26 +114,6 @@ public function testAddChildrenMethodReturnsSelf()
         $this->assertSame($group, $group->add([]));
     }
 
-    public function testAddingAnItemWithAGroupKeyKeepsTheSetGroupKey()
-    {
-        $group = new NavigationGroup('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Child', group: 'bar');
-
-        $group->add($child);
-
-        $this->assertSame('bar', $child->getGroupKey());
-    }
-
-    public function testAddingAnItemWithNoGroupKeyDoesNotModifyGroupIdentifier()
-    {
-        $group = new NavigationGroup('Foo');
-        $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
-
-        $group->add($child);
-
-        $this->assertNull($child->getGroupKey());
-    }
-
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 4b7fa9cff2a..bb35faac14a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -113,12 +113,6 @@ public function testGetPriority()
         $this->assertSame(500, $NavigationItem->getPriority());
     }
 
-    public function testGetGroup()
-    {
-        $NavigationItem = new NavigationItem(new Route(new InMemoryPage('foo')), 'Page', 500);
-        $this->assertNull($NavigationItem->getGroupKey());
-    }
-
     public function testFromRoute()
     {
         $page = new MarkdownPage();
@@ -162,7 +156,6 @@ public function testCreate()
         $this->assertEquals($route, $item->getPage()->getRoute());
         $this->assertSame('404.html', $item->getLink());
         $this->assertSame('404.html', (string) $item);
-        $this->assertNull($item->getGroupKey());
     }
 
     public function testForIndexRoute()
@@ -176,7 +169,6 @@ public function testForIndexRoute()
         $this->assertEquals($route, $item->getPage()->getRoute());
         $this->assertSame('index.html', $item->getLink());
         $this->assertSame('index.html', (string) $item);
-        $this->assertNull($item->getGroupKey());
     }
 
     public function testCreateWithLabels()
@@ -315,32 +307,6 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
 
-    public function testGetGroupWithNoGroup()
-    {
-        $this->assertNull((new NavigationItem(new Route(new MarkdownPage()), 'Test', 500))->getGroupKey());
-    }
-
-    public function testGetGroupWithGroup()
-    {
-        $this->assertSame('foo', (new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'))->getGroupKey());
-    }
-
-    public function testGetGroupFromRouteWithGroup()
-    {
-        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])))->getGroupKey());
-    }
-
-    public function testGetGroupCreateWithGroup()
-    {
-        $this->assertSame('foo', NavigationItem::create(new Route(new MarkdownPage(matter: ['navigation.group' => 'foo'])), 'foo')->getGroupKey());
-    }
-
-    public function testGroupKeysAreNormalized()
-    {
-        $item = new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'Foo Bar');
-        $this->assertSame('foo-bar', $item->getGroupKey());
-    }
-
     public function testNormalizeGroupKeyCreatesSlugs()
     {
         $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));

From 9a893d11b798ca91f2ee568cca80b2500e8c07af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:13:14 +0100
Subject: [PATCH 1369/2811] Replace ternary expression with if/else block

---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 0c2b05cb223..deb58efc204 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,11 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
-        $groupName = $this->generatesSidebar ? ($item->getGroupKey() ?? 'Other') : $item->getGroupKey();
+        if ($this->generatesSidebar) {
+            $groupName = ($item->getGroupKey() ?? 'Other');
+        } else {
+            $groupName = $item->getGroupKey();
+        }
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 769744fea76e0690cabe87f98dc2ba6ace3aebf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:14:15 +0100
Subject: [PATCH 1370/2811] Introduce local variable

---
 .../Features/Navigation/NavigationMenuGenerator.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index deb58efc204..1f8d17d549a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,10 +135,11 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
+        $groupKey = $item->getGroupKey();
         if ($this->generatesSidebar) {
-            $groupName = ($item->getGroupKey() ?? 'Other');
+            $groupName = ($groupKey ?? 'Other');
         } else {
-            $groupName = $item->getGroupKey();
+            $groupName = $groupKey;
         }
 
         $groupItem = $this->getOrCreateGroupItem($groupName);

From 2fafd0f7f419dc904edd293e1fe349c20eea24ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:16:51 +0100
Subject: [PATCH 1371/2811] Get group key through page instance

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 1f8d17d549a..7790152efc2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -135,7 +135,7 @@ protected function addRouteToGroup(Route $route): void
     {
         $item = NavigationItem::create($route);
 
-        $groupKey = $item->getGroupKey();
+        $groupKey = $item->getPage()->navigationMenuGroup();
         if ($this->generatesSidebar) {
             $groupName = ($groupKey ?? 'Other');
         } else {

From ba03fb8573ca3b5339365af05cc3ee8eeaa3fe0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:24:04 +0100
Subject: [PATCH 1372/2811] Replace conditional with ternary expression

---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 7790152efc2..c0942e77bfa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -136,11 +136,7 @@ protected function addRouteToGroup(Route $route): void
         $item = NavigationItem::create($route);
 
         $groupKey = $item->getPage()->navigationMenuGroup();
-        if ($this->generatesSidebar) {
-            $groupName = ($groupKey ?? 'Other');
-        } else {
-            $groupName = $groupKey;
-        }
+        $groupName = $this->generatesSidebar ? $groupKey ?? 'Other' : $groupKey;
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 252764819fd6ee759ca8acad63072276936fa6aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:24:31 +0100
Subject: [PATCH 1373/2811] Add clarifying parentheses

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index c0942e77bfa..2d79194d299 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -136,7 +136,7 @@ protected function addRouteToGroup(Route $route): void
         $item = NavigationItem::create($route);
 
         $groupKey = $item->getPage()->navigationMenuGroup();
-        $groupName = $this->generatesSidebar ? $groupKey ?? 'Other' : $groupKey;
+        $groupName = $this->generatesSidebar ? ($groupKey ?? 'Other') : $groupKey;
 
         $groupItem = $this->getOrCreateGroupItem($groupName);
 

From 0eda65fe12c676fd405a9fe1dd8ba187ead848ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:26:09 +0100
Subject: [PATCH 1374/2811] Use helper method with essentially the same
 semantics

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 2d79194d299..d43c0638185 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Illuminate\Support\Str;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -149,7 +148,7 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
-        $groupKey = Str::slug($groupName);
+        $groupKey = NavigationItem::normalizeGroupKey($groupName);
         $group = $this->items->get($groupKey);
 
         if ($group instanceof NavigationGroup) {

From 13435431e8e9e3795a21b242477795b2f70a394a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:27:25 +0100
Subject: [PATCH 1375/2811] Get group through the connected page

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 764a758a62f..7b36daf841e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -116,7 +116,7 @@ public function getPriority(): int
      */
     public function getGroupKey(): ?string
     {
-        return $this->group;
+        return $this->getPage()?->navigationMenuGroup();
     }
 
     /**

From d362701cac27054d93e0ab84fefff3f41ce5fefd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:45:54 +0100
Subject: [PATCH 1376/2811] Remove the group property

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7b36daf841e..105e432205d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -28,9 +28,6 @@ class NavigationItem implements NavigationElement, Stringable
     protected string $label;
     protected int $priority;
 
-    /** @deprecated Do we actually need this? We should just care if it's physically stored in a group. Adding the group key here doesn't magically make it appear in the group, it needs to be added to the group's items array, so why should we care about the key here? */
-    protected ?string $group = null;
-
     /**
      * Create a new navigation menu item with your own properties.
      *

From 35c2cd828559191a8eedbabcdeb788f7bd7fcb7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:48:11 +0100
Subject: [PATCH 1377/2811] Remove group parameter documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 105e432205d..49c5205a3c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -34,7 +34,6 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
-     * @param  string|null  $group  The dropdown/group key of the navigation item, if any.
      */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
     {
@@ -52,7 +51,6 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
-     * @param  string|null  $group  Leave blank to use the group of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
     {

From fbb7b3bbf8d0b537f50ba6fd0631f46ecd16719d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:48:20 +0100
Subject: [PATCH 1378/2811] No longer construct the group

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 49c5205a3c3..f1d4940a78f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -41,8 +41,6 @@ public function __construct(Route|string $destination, string $label, int $prior
 
         $this->label = $label;
         $this->priority = $priority;
-
-        $this->group = static::normalizeGroupKey($group);
     }
 
     /**

From daef8281436555f355e873f051477e37261c8f20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:49:30 +0100
Subject: [PATCH 1379/2811] Remove the group parameter from item constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 ++--
 packages/framework/tests/Unit/NavigationItemTest.php          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f1d4940a78f..7a1c0d0a10e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -35,7 +35,7 @@ class NavigationItem implements NavigationElement, Stringable
      * @param  string  $label  The label of the navigation item.
      * @param  int  $priority  The priority to determine the order of the navigation item.
      */
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT, #[Deprecated] ?string $group = null)
+    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
         $this->destination = $destination;
 
@@ -62,7 +62,7 @@ public static function create(Route|string $destination, ?string $label = null,
             $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $group);
+        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index bb35faac14a..b39e7f83506 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -44,7 +44,6 @@ public function testConstruct()
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem('foo', 'Test'));
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test'));
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
-        $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500, 'foo'));
     }
 
     public function testIsInstanceOfNavigationElement()

From 91d9cac1010d5c92963561860884fbeb1448a0f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:51:18 +0100
Subject: [PATCH 1380/2811] Remove coalesce assignment for the removed group

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7a1c0d0a10e..bcf35a9b304 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -59,7 +59,6 @@ public static function create(Route|string $destination, ?string $label = null,
         if ($destination instanceof Route) {
             $label ??= $destination->getPage()->navigationMenuLabel();
             $priority ??= $destination->getPage()->navigationMenuPriority();
-            $group ??= $destination->getPage()->navigationMenuGroup();
         }
 
         return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);

From 8cad7f21877770ccc486e9f540813ad57cbceb7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:52:52 +0100
Subject: [PATCH 1381/2811] Remove the group parameter from item create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bcf35a9b304..caaa73d74e2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -50,7 +50,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, #[Deprecated] ?string $group = null): static
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);

From 8c37e9443c5d894887c7d1c13f297e32347a4edd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:53:39 +0100
Subject: [PATCH 1382/2811] Fix wrong order of parameter annotations

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index caaa73d74e2..f19a63ee96c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -47,8 +47,8 @@ public function __construct(Route|string $destination, string $label, int $prior
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
+     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {

From 13298c4c5b90d0190565f51623790d774de36403 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:53:43 +0100
Subject: [PATCH 1383/2811] Introduce local variable

---
 .../tests/Feature/Services/DocumentationSidebarTest.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 11b578cd405..9c3601ab46d 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,7 +159,8 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        $this->assertEquals('bar', collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first()->getGroupKey());
+        $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
+        $this->assertEquals('bar', $firstItem->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 81f2e03b74e046571ccaf5572d2f4acd64620428 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:54:36 +0100
Subject: [PATCH 1384/2811] Add type annotation

---
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 9c3601ab46d..0dd3ae74393 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,6 +159,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
+        /** @var NavigationItem $firstItem */
         $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
         $this->assertEquals('bar', $firstItem->getGroupKey());
     }

From 8ecc783d6bbab4edc68200f3092d10df6ac75f20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:13 +0100
Subject: [PATCH 1385/2811] Simplify local variable name

---
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 0dd3ae74393..f622e08dcb5 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,9 +159,9 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
-        /** @var NavigationItem $firstItem */
-        $firstItem = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertEquals('bar', $firstItem->getGroupKey());
+        /** @var NavigationItem $item */
+        $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
+        $this->assertEquals('bar', $item->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 4f3ba21408678fefe5782bb63b9c2776d35aaf66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:26 +0100
Subject: [PATCH 1386/2811] Add some spacing

---
 .../tests/Feature/Services/DocumentationSidebarTest.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index f622e08dcb5..6a7ac43bd42 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -159,6 +159,7 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
     public function testGroupCanBeSetInFrontMatter()
     {
         $this->makePage('foo', ['navigation.group' => 'bar']);
+
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
         $this->assertEquals('bar', $item->getGroupKey());

From be0820e1ca8682df3f0e10e988191f3255eaafc9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 18:55:51 +0100
Subject: [PATCH 1387/2811] Use assert same

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 6a7ac43bd42..562fb83fd4a 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -162,7 +162,7 @@ public function testGroupCanBeSetInFrontMatter()
 
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertEquals('bar', $item->getGroupKey());
+        $this->assertSame('bar', $item->getGroupKey());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 80f9a5c1d06bce0b7a5593dc92bedf1614a83fa4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:00:08 +0100
Subject: [PATCH 1388/2811] Inline method usage

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 562fb83fd4a..3fe5722e880 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -162,7 +162,7 @@ public function testGroupCanBeSetInFrontMatter()
 
         /** @var NavigationItem $item */
         $item = collect(NavigationMenuGenerator::handle(DocumentationSidebar::class)->getItems()->first()->getItems())->first();
-        $this->assertSame('bar', $item->getGroupKey());
+        $this->assertSame('bar', $item->getPage()->navigationMenuGroup());
     }
 
     public function testHasGroupsReturnsFalseWhenThereAreNoGroups()

From 660edfccdedfb524b6889b24039e7bea9885cbbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:00:27 +0100
Subject: [PATCH 1389/2811] Extract testing helper method for data access

---
 .../Services/DocumentationSidebarTest.php     | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 3fe5722e880..a1971486787 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -225,7 +225,7 @@ public function testIsGroupActiveReturnsFalseWhenSuppliedGroupIsNotActive()
     {
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
@@ -233,7 +233,7 @@ public function testIsGroupActiveReturnsTrueWhenSuppliedGroupIsActive()
         $this->makePage('foo', ['navigation.group' => 'foo']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'foo']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueForDifferingCasing()
@@ -241,7 +241,7 @@ public function testIsGroupActiveReturnsTrueForDifferingCasing()
         $this->makePage('foo', ['navigation.group' => 'Foo Bar']);
         Render::setPage(new DocumentationPage(matter: ['navigation.group' => 'Foo Bar']));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo-bar' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo-bar' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
@@ -253,11 +253,11 @@ public function testIsGroupActiveReturnsTrueFirstGroupOfIndexPage()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('bar' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('bar' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
@@ -269,11 +269,11 @@ public function testIsGroupActiveReturnsTrueFirstSortedGroupOfIndexPage()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('foo' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenuSettings()
@@ -285,11 +285,11 @@ public function testAutomaticIndexPageGroupExpansionRespectsCustomNavigationMenu
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu2 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu2->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu2));
         $mainNavigationMenu1 = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('bar' === $mainNavigationMenu1->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('bar' === $this->getGroupKey($mainNavigationMenu1));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertTrue('baz' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertTrue('baz' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testCanHaveMultipleGroupedPagesWithTheSameNameLabels()
@@ -338,7 +338,7 @@ public function testIsGroupActiveForIndexPageWithNoGroups()
 
         Render::setPage(DocumentationPage::get('index'));
         $mainNavigationMenu = NavigationMenuGenerator::handle(DocumentationSidebar::class);
-        $this->assertFalse('foo' === $mainNavigationMenu->getActiveGroup()?->getGroupKey());
+        $this->assertFalse('foo' === $this->getGroupKey($mainNavigationMenu));
     }
 
     public function testIndexPageAddedToSidebarWhenItIsTheOnlyPage()
@@ -380,4 +380,9 @@ protected function makePage(string $name, ?array $matter = null): void
             (new ConvertsArrayToFrontMatter)->execute($matter ?? [])
         );
     }
+
+    protected function getGroupKey(DocumentationSidebar $menu): ?string
+    {
+        return $menu->getActiveGroup()?->getGroupKey();
+    }
 }

From c2254b02d79c586bdae099483a7341dc13589c3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:04:09 +0100
Subject: [PATCH 1390/2811] Extract testing helper method for data access

---
 ...mentationSidebarGetActiveGroupUnitTest.php | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 79286a5bfc9..08dd6279872 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -89,55 +89,55 @@ public function testNoActiveGroupWhenSidebarNotCollapsible()
     public function testActiveGroupGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupConfiguration()
     {
         $this->mockCurrentPageForActiveGroup('configuration');
-        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupUsage()
     {
         $this->mockCurrentPageForActiveGroup('usage');
-        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('getting-started', 'Introduction');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierConfiguration()
     {
         $this->mockCurrentPageForActiveGroup('configuration', 'Configuration');
-        $this->assertSame('configuration', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('configuration', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupWithIdentifierUsage()
     {
         $this->mockCurrentPageForActiveGroup('usage', 'Routing');
-        $this->assertSame('usage', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted()
     {
         $this->mockCurrentPageForActiveGroup('GETTING-STARTED');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted2()
     {
         $this->mockCurrentPageForActiveGroup('Getting-Started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testActiveGroupDifferentCasingGettingStarted3()
     {
         $this->mockCurrentPageForActiveGroup('getting-started');
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testGetActiveGroupIsNullWhenNoItemsExist()
@@ -159,7 +159,7 @@ public function testGetActiveGroupIsNullIfTheSetGroupIsNotPresentInTheSidebarIte
     public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
     {
         $this->renderData->setPage(new DocumentationPage('index'));
-        $this->assertSame('getting-started', $this->createSidebar()->getActiveGroup()->getGroupKey());
+        $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
@@ -168,7 +168,7 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
         $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index'));
-        $this->assertSame('other', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('other', $this->getActiveGroupKey($sidebar));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
@@ -176,7 +176,7 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $sidebar = $this->createSidebar();
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
@@ -185,11 +185,18 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
         $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $sidebar->getActiveGroup()->getGroupKey());
+        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
     }
 
     protected function mockCurrentPageForActiveGroup(string $group, string $identifier = 'foo'): void
     {
         $this->renderData->setPage(new DocumentationPage($identifier, ['navigation.group' => $group]));
     }
+
+    protected function getActiveGroupKey(?DocumentationSidebar $sidebar = null): string
+    {
+        $sidebar ??= $this->createSidebar();
+
+        return $sidebar->getActiveGroup()->getGroupKey();
+    }
 }

From 524e1ea8e4f13cb3b085242fcfc1eada8bcfb9b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:04:46 +0100
Subject: [PATCH 1391/2811] Update
 DocumentationSidebarGetActiveGroupUnitTest.php

---
 .../tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 08dd6279872..91ca9487966 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -173,10 +173,8 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
     {
-        $sidebar = $this->createSidebar();
-
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $this->getActiveGroupKey($sidebar));
+        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
     }
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()

From c52a912366314b1419f4852f1becb385475d5a92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:05:01 +0100
Subject: [PATCH 1392/2811] Move up test in source

---
 .../DocumentationSidebarGetActiveGroupUnitTest.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 91ca9487966..34a266fbc59 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -162,6 +162,12 @@ public function testGetActiveGroupReturnsFirstGroupWhenRenderingIndexPage()
         $this->assertSame('getting-started', $this->getActiveGroupKey());
     }
 
+    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
+    {
+        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
+        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
+    }
+
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
         $sidebar = $this->createSidebar();
@@ -171,12 +177,6 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
         $this->assertSame('other', $this->getActiveGroupKey($sidebar));
     }
 
-    public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPage()
-    {
-        $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
-        $this->assertSame('usage', $this->getActiveGroupKey($this->createSidebar()));
-    }
-
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
     {
         $sidebar = $this->createSidebar();

From 09b909f45a95d7419732641c3bd9df79ff8ca559 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:06:01 +0100
Subject: [PATCH 1393/2811] Use fluent method call

---
 .../Unit/DocumentationSidebarGetActiveGroupUnitTest.php     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
index 34a266fbc59..85cfca99569 100644
--- a/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
+++ b/packages/framework/tests/Unit/DocumentationSidebarGetActiveGroupUnitTest.php
@@ -170,8 +170,7 @@ public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderin
 
     public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRenderingIndexPage()
     {
-        $sidebar = $this->createSidebar();
-        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+        $sidebar = $this->createSidebar()->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index'));
         $this->assertSame('other', $this->getActiveGroupKey($sidebar));
@@ -179,8 +178,7 @@ public function testGetActiveGroupReturnsFirstGroupByLowestPriorityWhenRendering
 
     public function testGetActiveGroupReturnsExplicitlySetIndexPageGroupWhenRenderingIndexPageRegardlessOfPriorities()
     {
-        $sidebar = $this->createSidebar();
-        $sidebar->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
+        $sidebar = $this->createSidebar()->add(new NavigationGroup('other', [new NavigationItem('Other', 'Other')], 0));
 
         $this->renderData->setPage(new DocumentationPage('index', ['navigation.group' => 'usage']));
         $this->assertSame('usage', $this->getActiveGroupKey($sidebar));

From 749d41c34fab2e745dfd1fa22f4704043e79f610 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:08:24 +0100
Subject: [PATCH 1394/2811] Remove `getGroupKey` method from
 `NavigationElement` contract

---
 .../src/Framework/Features/Navigation/NavigationElement.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 6084549e48b..10152254c5c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -15,9 +15,4 @@ public function getLabel(): string;
      * Get the priority to determine the order of the navigation item.
      */
     public function getPriority(): int;
-
-    /**
-     * Get the group identifier key of the navigation item, if any.
-     */
-    public function getGroupKey(): ?string;
 }

From 6b675523b6ad964075c08e38f195e76dd10452bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:09:30 +0100
Subject: [PATCH 1395/2811] Remove `getGroupKey` method from `NavigationItem`
 class

---
 .../Features/Navigation/NavigationItem.php       | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index f19a63ee96c..c67485e6406 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Pages\Concerns\HydePage;
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
@@ -96,21 +95,6 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /**
-     * Get the group identifier key of the navigation item, if any.
-     *
-     * @deprecated as the property is deprecated.
-     *
-     *  For sidebars this is the category key, for navigation menus this is the dropdown key.
-     *
-     *  When using automatic subdirectory based groups, the subdirectory name is the group key.
-     *  Otherwise, the group key is a 'slugified' version of the group's label.
-     */
-    public function getGroupKey(): ?string
-    {
-        return $this->getPage()?->navigationMenuGroup();
-    }
-
     /**
      * If the navigation item is a link to a routed page, get the corresponding page instance.
      */

From c359bcaac4260add8348bbfb5f21a84a05297e67 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:22:55 +0100
Subject: [PATCH 1396/2811] Move group key normalization method to navigation
 group class

---
 .../Features/Navigation/DocumentationSidebar.php   |  2 +-
 .../Features/Navigation/NavigationGroup.php        |  6 ++++++
 .../Features/Navigation/NavigationItem.php         |  7 -------
 .../Navigation/NavigationMenuGenerator.php         |  2 +-
 .../framework/tests/Unit/NavigationGroupTest.php   | 14 ++++++++++++++
 .../framework/tests/Unit/NavigationItemTest.php    | 14 --------------
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f2a5d485fa6..195d90263a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,7 +78,7 @@ public function getActiveGroup(): ?NavigationGroup
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered.
-            return $group->getGroupKey() === NavigationItem::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 937d1647ddd..516e6d7736d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -81,4 +81,10 @@ protected function containsOnlyDocumentationPages(): bool
             return $child->getPage() instanceof DocumentationPage;
         });
     }
+
+    /** @return ($group is null ? null : string) */
+    public static function normalizeGroupKey(?string $group): ?string
+    {
+        return $group ? Str::slug($group) : null;
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c67485e6406..8e406303dd3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -8,7 +8,6 @@
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
-use Illuminate\Support\Str;
 use Stringable;
 
 use function is_string;
@@ -110,10 +109,4 @@ public function isActive(): bool
     {
         return Hyde::currentRoute()->getLink() === $this->getLink();
     }
-
-    /** @return ($group is null ? null : string) */
-    public static function normalizeGroupKey(?string $group): ?string
-    {
-        return $group ? Str::slug($group) : null;
-    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d43c0638185..c0e11aa5a75 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -148,7 +148,7 @@ protected function addRouteToGroup(Route $route): void
 
     protected function getOrCreateGroupItem(string $groupName): NavigationGroup
     {
-        $groupKey = NavigationItem::normalizeGroupKey($groupName);
+        $groupKey = NavigationGroup::normalizeGroupKey($groupName);
         $group = $this->items->get($groupKey);
 
         if ($group instanceof NavigationGroup) {
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 2baaf30d2fc..ca7170207bb 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -173,6 +173,20 @@ public function testModifierMethodsAreFluentlyChainable()
         $this->assertSame($group, $group->add([new NavigationItem(new Route(new MarkdownPage()), 'Bar')]));
     }
 
+    public function testNormalizeGroupKeyCreatesSlugs()
+    {
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('Foo Bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo_bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey('foo-bar'));
+        $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey(' foo bar '));
+    }
+
+    public function testNormalizeGroupKeyReturnsNullForNull()
+    {
+        $this->assertNull(NavigationGroup::normalizeGroupKey(null));
+    }
+
     protected function createNavigationItems(): array
     {
         return [
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index b39e7f83506..02152f8a182 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -305,18 +305,4 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
-
-    public function testNormalizeGroupKeyCreatesSlugs()
-    {
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('Foo Bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo_bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey('foo-bar'));
-        $this->assertSame('foo-bar', NavigationItem::normalizeGroupKey(' foo bar '));
-    }
-
-    public function testNormalizeGroupKeyReturnsNullForNull()
-    {
-        $this->assertNull(NavigationItem::normalizeGroupKey(null));
-    }
 }

From 74933b8bb0626788d24e6a039859476a521862be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:24:11 +0100
Subject: [PATCH 1397/2811] Remove null support from group key normalization
 method

This is no longer needed
---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 packages/framework/tests/Unit/NavigationGroupTest.php        | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 516e6d7736d..7515620cc2c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -82,9 +82,8 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
-    /** @return ($group is null ? null : string) */
-    public static function normalizeGroupKey(?string $group): ?string
+    public static function normalizeGroupKey(string $group): string
     {
-        return $group ? Str::slug($group) : null;
+        return Str::slug($group);
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ca7170207bb..077659cdb9f 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -182,11 +182,6 @@ public function testNormalizeGroupKeyCreatesSlugs()
         $this->assertSame('foo-bar', NavigationGroup::normalizeGroupKey(' foo bar '));
     }
 
-    public function testNormalizeGroupKeyReturnsNullForNull()
-    {
-        $this->assertNull(NavigationGroup::normalizeGroupKey(null));
-    }
-
     protected function createNavigationItems(): array
     {
         return [

From eb346e9c526eb259810801382377ce29a1eb71cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:48:23 +0100
Subject: [PATCH 1398/2811] Add null type check

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 195d90263a8..097174d38c7 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -78,7 +78,7 @@ public function getActiveGroup(): ?NavigationGroup
 
         return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered.
-            return $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
+            return $currentPage->navigationMenuGroup() && $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
     }
 }

From de6993bac15fe29da924515a5e4eae8f5e7cd45e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 24 Mar 2024 19:48:51 +0100
Subject: [PATCH 1399/2811] Mark group key normalization method as experimental

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7515620cc2c..b0b127ddc27 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -82,6 +82,7 @@ protected function containsOnlyDocumentationPages(): bool
         });
     }
 
+    /** @experimental This method is subject to change before its release. */
     public static function normalizeGroupKey(string $group): string
     {
         return Str::slug($group);

From 67c5d1da22dc5ef659bb406a979abe6c62aef684 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:01:33 +0100
Subject: [PATCH 1400/2811] Rename local closure variables

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b0b127ddc27..0d619dce874 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -48,7 +48,7 @@ public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
             // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $child): int => $child->getPriority()));
+            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $item): int => $item->getPriority()));
         }
 
         return $this->priority;
@@ -77,8 +77,8 @@ protected function addItem(NavigationItem $item): void
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $child): bool {
-            return $child->getPage() instanceof DocumentationPage;
+        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
+            return $item->getPage() instanceof DocumentationPage;
         });
     }
 

From 34f2569cb635e88351e58fbf982b363b12504a60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:04:03 +0100
Subject: [PATCH 1401/2811] Deprecate the navigation element contract

---
 .../src/Framework/Features/Navigation/NavigationElement.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
index 10152254c5c..ddc1159ffa8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * @deprecated
+ */
 interface NavigationElement
 {
     /**

From 3175f91fe113721677d7cc8834d8924259e59ca4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:09:36 +0100
Subject: [PATCH 1402/2811] Replace interface type hint with union type

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 097174d38c7..6e8332b8ad2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -55,7 +55,7 @@ public function isCollapsible(): bool
 
     public function hasGroups(): bool
     {
-        return $this->getItems()->contains(fn (NavigationElement $item): bool => $item instanceof NavigationGroup);
+        return $this->getItems()->contains(fn (NavigationItem|NavigationGroup $item): bool => $item instanceof NavigationGroup);
     }
 
     /**

From 9b1a1d0d5fc6a82c11bdaffd88c7c30a9590e9d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:13:40 +0100
Subject: [PATCH 1403/2811] No longer implement navigation element contract

---
 .../src/Framework/Features/Navigation/NavigationGroup.php   | 2 +-
 .../src/Framework/Features/Navigation/NavigationItem.php    | 2 +-
 packages/framework/tests/Unit/NavigationGroupTest.php       | 6 +-----
 packages/framework/tests/Unit/NavigationItemTest.php        | 6 ------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 0d619dce874..ca6e696da2b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -14,7 +14,7 @@
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
-class NavigationGroup implements NavigationElement
+class NavigationGroup
 {
     /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected array $items = [];
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8e406303dd3..3847bc79b18 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -20,7 +20,7 @@
  *   2. You can use NavigationItem::fromRoute() to use data from the route
  *   3. You can use NavigationItem::create() for an external or un-routed link
  */
-class NavigationItem implements NavigationElement, Stringable
+class NavigationItem implements Stringable
 {
     protected string|Route $destination;
     protected string $label;
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 077659cdb9f..378a1d7fe52 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -26,6 +26,7 @@ public static function setUpBeforeClass(): void
 
     public function testCanConstruct()
     {
+        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
         $this->assertSame('Foo', (new NavigationGroup('Foo'))->getLabel());
     }
 
@@ -57,11 +58,6 @@ public function testCanConstructWithChildrenWithoutRoute()
         $this->assertSame($children, $item->getItems());
     }
 
-    public function testIsInstanceOfNavigationElement()
-    {
-        $this->assertInstanceOf(NavigationGroup::class, new NavigationGroup('Foo'));
-    }
-
     public function testCreate()
     {
         $this->assertEquals(
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 02152f8a182..0e1da8957b6 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -14,7 +14,6 @@
 use Hyde\Testing\UnitTestCase;
 use Mockery;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
-use Hyde\Framework\Features\Navigation\NavigationElement;
 
 /**
  * This unit test covers the basics of the NavigationItem class.
@@ -46,11 +45,6 @@ public function testConstruct()
         $this->assertInstanceOf(NavigationItem::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
     }
 
-    public function testIsInstanceOfNavigationElement()
-    {
-        $this->assertInstanceOf(NavigationElement::class, new NavigationItem(new Route(new MarkdownPage()), 'Test', 500));
-    }
-
     public function testPassingRouteInstanceToConstructorUsesRouteInstance()
     {
         $route = new Route(new MarkdownPage());

From 4385cc79a658e361ce9d2a76c1ebac7a4e200bb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:17:10 +0100
Subject: [PATCH 1404/2811] Delete NavigationElement.php

---
 .../Features/Navigation/NavigationElement.php | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationElement.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php b/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
deleted file mode 100644
index ddc1159ffa8..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/NavigationElement.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * @deprecated
- */
-interface NavigationElement
-{
-    /**
-     * Get the label of the navigation item.
-     */
-    public function getLabel(): string;
-
-    /**
-     * Get the priority to determine the order of the navigation item.
-     */
-    public function getPriority(): int;
-}

From c870acb51fbe9c65907e5bae2d73c7490d78d8cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:30:25 +0100
Subject: [PATCH 1405/2811] Clean up test

---
 .../tests/Feature/SidebarViewTest.php          | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 522d25de033..03800562e2a 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -7,10 +7,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Contracts\View\View;
-use Throwable;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -189,21 +187,7 @@ protected function renderComponent(View $view): self
         app()->instance('navigation.sidebar', $sidebar);
         view()->share('sidebar', $sidebar);
 
-        try {
-            $this->html = $view->render();
-            /** @noinspection LaravelFunctionsInspection */
-            if (env('TEST_HTML_DEBUG', false)) {
-                file_put_contents(Hyde::path('_site/test.html'), $this->html);
-                echo "\e[0;32mCreated file: \e[0m".realpath(Hyde::path('_site/test.html'));
-            }
-        } catch (Throwable $exception) {
-            /** @noinspection LaravelFunctionsInspection */
-            if (env('TEST_HTML_DEBUG', false)) {
-                throw $exception;
-            }
-            $this->fail($exception->getMessage());
-        }
-
+        $this->html = $view->render();
         $this->assertIsString($this->html);
 
         return $this;

From ea15074a0c08d9129873497c5becdc193dc4759d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:30:51 +0100
Subject: [PATCH 1406/2811] Clean up test

---
 .../tests/Feature/SidebarViewTest.php         | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/packages/framework/tests/Feature/SidebarViewTest.php b/packages/framework/tests/Feature/SidebarViewTest.php
index 03800562e2a..1f76307068b 100644
--- a/packages/framework/tests/Feature/SidebarViewTest.php
+++ b/packages/framework/tests/Feature/SidebarViewTest.php
@@ -38,8 +38,7 @@ public function testBaseSidebar()
             ->assertSeeHtml('<a href="../">Back to home page</a>')
             ->assertSeeHtml('<span class="sr-only">Toggle dark theme</span>')
             ->assertDontSee('<a href="docs/index.html">')
-            ->assertDontSee('<li class="sidebar-item')
-            ->allGood();
+            ->assertDontSee('<li class="sidebar-item');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
 
@@ -53,8 +52,7 @@ public function testBaseSidebarWithoutFooter()
 
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertDontSee('<footer id="sidebar-footer"')
-            ->assertDontSee('Back to home page')
-            ->allGood();
+            ->assertDontSee('Back to home page');
     }
 
     public function testBaseSidebarWithCustomFooterText()
@@ -64,8 +62,7 @@ public function testBaseSidebarWithCustomFooterText()
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertSeeHtml('<footer id="sidebar-footer"')
             ->assertSeeHtml('<p>My <strong>Markdown</strong> Footer Text</p>')
-            ->assertDontSee('Back to home page')
-            ->allGood();
+            ->assertDontSee('Back to home page');
     }
 
     public function testBaseSidebarCustomHeaderBrand()
@@ -74,8 +71,7 @@ public function testBaseSidebarCustomHeaderBrand()
 
         $this->renderComponent(view('hyde::components.docs.sidebar'))
             ->assertSeeText('My Custom Header')
-            ->assertDontSee('HydePHP Docs')
-            ->allGood();
+            ->assertDontSee('HydePHP Docs');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-brand'));
     }
@@ -90,8 +86,7 @@ public function testBaseSidebarWithItems()
             ->assertSeeHtml('<a href="docs/index.html">')
             ->assertSeeHtml('<nav id="sidebar-navigation"')
             ->assertSeeHtml('<ul id="sidebar-items" role="list" class="pl-2">')
-            ->assertSeeHtml('<li class="sidebar-item')
-            ->allGood();
+            ->assertSeeHtml('<li class="sidebar-item');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items'));
     }
@@ -116,8 +111,7 @@ public function testSidebarWithGroupedItems()
             ->assertSeeHtml('class="sidebar-group-toggle')
             ->assertSeeHtml('class="sidebar-group-toggle-icon')
             ->assertSeeHtml('class="sidebar-group-items')
-            ->assertSee('groupOpen')
-            ->allGood();
+            ->assertSee('groupOpen');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -147,8 +141,7 @@ public function testSidebarWithNonCollapsibleGroupedItems()
             ->assertSeeHtml('class="sidebar-group-items')
             ->assertDontSee('sidebar-group-toggle')
             ->assertDontSee('sidebar-group-toggle-icon')
-            ->assertDontSee('groupOpen')
-            ->allGood();
+            ->assertDontSee('groupOpen');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -171,8 +164,7 @@ public function testSidebarWithMixedGroupedAndUngroupedItems()
             ->assertSeeText('Other')
             ->assertSeeText('Second')
             ->assertSeeHtml('href="docs/first.html"')
-            ->assertSeeHtml('href="docs/second.html"')
-            ->allGood();
+            ->assertSeeHtml('href="docs/second.html"');
 
         $this->assertViewWasRendered(view('hyde::components.docs.sidebar-items', [
             'grouped' => true,
@@ -234,11 +226,4 @@ protected function assertDontSee(string $text): self
 
         return $this;
     }
-
-    protected function allGood(): self
-    {
-        // Just an empty helper so we get easier Git diffs when adding new assertions.
-
-        return $this;
-    }
 }

From c5d04170352c4f10a2349fe4ee18094f12f65a8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:56:49 +0100
Subject: [PATCH 1407/2811] Remove abstract modifier from navigation menu class

I see no reason why we can't allow users to create custom menus by instantiating this class
---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 46e904cde29..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-abstract class NavigationMenu
+class NavigationMenu
 {
     public const DEFAULT = 500;
     public const LAST = 999;

From 2beb314dbc338053cfe0f3677b5f99fc28c29835 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 10:57:47 +0100
Subject: [PATCH 1408/2811] Create NavigationAPITest.php

---
 .../framework/tests/Feature/NavigationAPITest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/NavigationAPITest.php

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
new file mode 100644
index 00000000000..49e7eae0e4e
--- /dev/null
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * High level tests for the Navigation API.
+ */
+class NavigationAPITest extends TestCase
+{
+    //
+}

From 102df43e6619b1907d67426caa54bf4ebd47c34d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 11:02:12 +0100
Subject: [PATCH 1409/2811] Set up test kernel

---
 .../tests/Feature/NavigationAPITest.php       | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 49e7eae0e4e..5cec9b75b4c 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,11 +5,36 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
+use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    //
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->kernel = new TestKernel();
+        HydeKernel::setInstance($this->kernel);
+    }
+}
+
+class TestKernel extends HydeKernel
+{
+    protected ?RouteCollection $mockRoutes = null;
+
+    public function setRoutes(Collection $routes): void
+    {
+        $this->mockRoutes = RouteCollection::make($routes);
+    }
+
+    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
+    public function routes(): RouteCollection
+    {
+        return $this->mockRoutes ?? parent::routes();
+    }
 }

From c462c62f695c44baedab5bf5650421c0994a3d8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:02:44 +0100
Subject: [PATCH 1410/2811] Revert "Set up test kernel"

This reverts commit 102df43e6619b1907d67426caa54bf4ebd47c34d.
---
 .../tests/Feature/NavigationAPITest.php       | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5cec9b75b4c..49e7eae0e4e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,36 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
-use Hyde\Foundation\HydeKernel;
-use Illuminate\Support\Collection;
-use Hyde\Foundation\Kernel\RouteCollection;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->kernel = new TestKernel();
-        HydeKernel::setInstance($this->kernel);
-    }
-}
-
-class TestKernel extends HydeKernel
-{
-    protected ?RouteCollection $mockRoutes = null;
-
-    public function setRoutes(Collection $routes): void
-    {
-        $this->mockRoutes = RouteCollection::make($routes);
-    }
-
-    /** @return \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */
-    public function routes(): RouteCollection
-    {
-        return $this->mockRoutes ?? parent::routes();
-    }
+    //
 }

From 85f8aa238c45e550bda2ea37e04818104633f123 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:06:31 +0100
Subject: [PATCH 1411/2811] Update NavigationMenu to implement Arrayable

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7329b6bfbe9..14904103ea6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu
+class NavigationMenu implements Arrayable
 {
     public const DEFAULT = 500;
     public const LAST = 999;

From 72b74173b8a05a57031f3a394795146b634cb104 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:06:53 +0100
Subject: [PATCH 1412/2811] Draft to array method

---
 .../Framework/Features/Navigation/NavigationMenu.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 14904103ea6..770e823373b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -63,6 +63,16 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
+    /**
+     * Get the navigation items in the menu as an array.
+     *
+     * @return array<array<string, mixed>>
+     */
+    public function toArray(): array
+    {
+        //
+    }
+
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);

From 7e8aee5a82b0fca3bc28ad962855610ceba151b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:07:03 +0100
Subject: [PATCH 1413/2811] Mark method as experimental

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 770e823373b..5abedcd74d4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -66,6 +66,8 @@ public function add(NavigationItem|NavigationGroup|array $items): static
     /**
      * Get the navigation items in the menu as an array.
      *
+     * @experimental This method is experimental and may be changed before release.
+     *
      * @return array<array<string, mixed>>
      */
     public function toArray(): array

From fe76c48f3f5f4e0fb9da9548610f930031ccd845 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:08:34 +0100
Subject: [PATCH 1414/2811] Annotate full array generics

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 5abedcd74d4..8de2abe758c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<array<string, mixed>>
+     * @return array<int, array{url: string, title: string, active: bool}>
      */
     public function toArray(): array
     {

From 493aee87d458737ff11a339b0b1d866f97bd927f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:11:44 +0100
Subject: [PATCH 1415/2811] Add null safety to active state check

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 2 +-
 packages/framework/tests/Unit/NavigationItemTest.php         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 3847bc79b18..dd4ab94709a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -107,6 +107,6 @@ public function getPage(): ?HydePage
      */
     public function isActive(): bool
     {
-        return Hyde::currentRoute()->getLink() === $this->getLink();
+        return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 0e1da8957b6..cb45bd6c9a9 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -299,4 +299,9 @@ public function testIsCurrentWithLink()
         $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
         $this->assertFalse(NavigationItem::create('https://example.com', 'bar')->isActive());
     }
+
+    public function testIsCurrentIsNullSafe()
+    {
+        $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
+    }
 }

From 473ac2056b49b5ffda20f1b985db3f3c66ceaaf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:12:27 +0100
Subject: [PATCH 1416/2811] Draft test setup

---
 .../tests/Feature/NavigationAPITest.php       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 49e7eae0e4e..64208fe8b10 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,11 +5,28 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\Facades\Routes;
+use Hyde\Testing\MocksKernelFeatures;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
 /**
  * High level tests for the Navigation API.
  */
 class NavigationAPITest extends TestCase
 {
-    //
+    use MocksKernelFeatures;
+
+    public function testNavigationMenus()
+    {
+        $this->withPages(['index', 'about', 'contact']);
+
+        $menu = new NavigationMenu([
+            new NavigationItem(Routes::get('index'), 'Home'),
+            new NavigationItem(Routes::get('about'), 'About'),
+            new NavigationItem(Routes::get('contact'), 'Contact'),
+        ]);
+
+        $this->assertCount(3, $menu->getItems());
+    }
 }

From d8630e731e6c4c7e59dd6650070476f1a87b3f9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:29:49 +0100
Subject: [PATCH 1417/2811] Create initial array representation

---
 .../src/Framework/Features/Navigation/NavigationMenu.php  | 8 +++++++-
 packages/framework/tests/Feature/NavigationAPITest.php    | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 8de2abe758c..f1a64e45be6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -72,7 +72,13 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      */
     public function toArray(): array
     {
-        //
+        return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+            return [
+                'url' => $item->getLink(),
+                'title' => $item->getLabel(),
+                'active' => $item->isActive(),
+            ];
+        })->all();
     }
 
     protected function addItem(NavigationItem|NavigationGroup $item): void
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 64208fe8b10..e0db6750d8e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -27,6 +27,10 @@ public function testNavigationMenus()
             new NavigationItem(Routes::get('contact'), 'Contact'),
         ]);
 
-        $this->assertCount(3, $menu->getItems());
+        $this->assertSame([
+            ['url' => 'index.html', 'title' => 'Home', 'active' => false],
+            ['url' => 'about.html', 'title' => 'About', 'active' => false],
+            ['url' => 'contact.html', 'title' => 'Contact', 'active' => false],
+        ], $menu->toArray());
     }
 }

From c188e01beb2a0601c242aa23b0dfd82a907f7739 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:31:29 +0100
Subject: [PATCH 1418/2811] Update array keys to match data structure

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++---
 packages/framework/tests/Feature/NavigationAPITest.php      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index f1a64e45be6..e0b7203f393 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,14 +68,14 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{url: string, title: string, active: bool}>
+     * @return array<int, array{link: string, label: string, active: bool}>
      */
     public function toArray(): array
     {
         return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
             return [
-                'url' => $item->getLink(),
-                'title' => $item->getLabel(),
+                'link' => $item->getLink(),
+                'label' => $item->getLabel(),
                 'active' => $item->isActive(),
             ];
         })->all();
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index e0db6750d8e..169c60beb53 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -28,9 +28,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['url' => 'index.html', 'title' => 'Home', 'active' => false],
-            ['url' => 'about.html', 'title' => 'About', 'active' => false],
-            ['url' => 'contact.html', 'title' => 'Contact', 'active' => false],
+            ['link' => 'index.html', 'label' => 'Home', 'active' => false],
+            ['link' => 'about.html', 'label' => 'About', 'active' => false],
+            ['link' => 'contact.html', 'label' => 'Contact', 'active' => false],
         ], $menu->toArray());
     }
 }

From 091c93725fb27d3d6af396d375b5f085585cd2b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:32:19 +0100
Subject: [PATCH 1419/2811] Remove active state from array

I think this helper makes most sense when it's portable, so we don't want render state specific data here
---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 3 +--
 packages/framework/tests/Feature/NavigationAPITest.php      | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e0b7203f393..cbb8b24cb23 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link: string, label: string, active: bool}>
+     * @return array<int, array{link: string, label: string}>
      */
     public function toArray(): array
     {
@@ -76,7 +76,6 @@ public function toArray(): array
             return [
                 'link' => $item->getLink(),
                 'label' => $item->getLabel(),
-                'active' => $item->isActive(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 169c60beb53..c44b5a9e0e4 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -28,9 +28,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home', 'active' => false],
-            ['link' => 'about.html', 'label' => 'About', 'active' => false],
-            ['link' => 'contact.html', 'label' => 'Contact', 'active' => false],
+            ['link' => 'index.html', 'label' => 'Home'],
+            ['link' => 'about.html', 'label' => 'About'],
+            ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
     }
 }

From 38050af04e6a1429f4fbc77d2e5bd0cbfa7d548f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:35:54 +0100
Subject: [PATCH 1420/2811] Array serialize navigation groups

---
 .../Features/Navigation/NavigationMenu.php    | 12 +++++++++-
 .../tests/Feature/NavigationAPITest.php       | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cbb8b24cb23..873ce83b4b6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,11 +68,21 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link: string, label: string}>
+     * @return array<int, array{link?: string, label: string, items?: array<int, array{link: string, label: string}>}>
      */
     public function toArray(): array
     {
         return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+            if ($item instanceof NavigationGroup) {
+                return [
+                    'label' => $item->getLabel(),
+                    'items' => array_map(fn (NavigationItem $item): array => [
+                        'link' => $item->getLink(),
+                        'label' => $item->getLabel(),
+                    ], $item->getItems()),
+                ];
+            }
+
             return [
                 'link' => $item->getLink(),
                 'label' => $item->getLabel(),
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index c44b5a9e0e4..54f4ab06f1f 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\MocksKernelFeatures;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
  * High level tests for the Navigation API.
@@ -33,4 +34,25 @@ public function testNavigationMenus()
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
     }
+
+    public function testNavigationMenusWithGroups()
+    {
+        $this->withPages(['index', 'about', 'contact']);
+
+        $menu = new NavigationMenu([
+            new NavigationItem(Routes::get('index'), 'Home'),
+            new NavigationGroup('About', [
+                new NavigationItem(Routes::get('about'), 'About Us'),
+                new NavigationItem(Routes::get('contact'), 'Contact Us'),
+            ]),
+        ]);
+
+        $this->assertSame([
+            ['link' => 'index.html', 'label' => 'Home'],
+            ['label' => 'About', 'items' => [
+                ['link' => 'about.html', 'label' => 'About Us'],
+                ['link' => 'contact.html', 'label' => 'Contact Us'],
+            ]],
+        ], $menu->toArray());
+    }
 }

From b1d62bfae5a58cd8d118debf18328ae4383e331b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:39:24 +0100
Subject: [PATCH 1421/2811] Make navigation menu serializable

---
 .../Features/Navigation/NavigationMenu.php      |  6 +++++-
 .../tests/Feature/NavigationAPITest.php         | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 873ce83b4b6..2c4d8d063f7 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,6 +6,8 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Hyde\Support\Concerns\Serializable;
+use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function Hyde\evaluate_arrayable;
@@ -18,8 +20,10 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements Arrayable
+class NavigationMenu implements SerializableContract
 {
+    use Serializable;
+
     public const DEFAULT = 500;
     public const LAST = 999;
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 54f4ab06f1f..657110fda4d 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -33,6 +33,23 @@ public function testNavigationMenus()
             ['link' => 'about.html', 'label' => 'About'],
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
+
+        $this->assertSame(<<<JSON
+        [
+            {
+                "link": "index.html",
+                "label": "Home"
+            },
+            {
+                "link": "about.html",
+                "label": "About"
+            },
+            {
+                "link": "contact.html",
+                "label": "Contact"
+            }
+        ]
+        JSON, $menu->toJson(JSON_PRETTY_PRINT));
     }
 
     public function testNavigationMenusWithGroups()

From 86cdc95c21e6a4a16c71d26bc073ad826e3dc660 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:39:27 +0100
Subject: [PATCH 1422/2811] Revert "Make navigation menu serializable"

This reverts commit 072c98a8f302ebeb4458d4815f62d2b58aa71efb. Probably overengineering.
---
 .../Features/Navigation/NavigationMenu.php      |  6 +-----
 .../tests/Feature/NavigationAPITest.php         | 17 -----------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2c4d8d063f7..873ce83b4b6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,8 +6,6 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
-use Hyde\Support\Concerns\Serializable;
-use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Contracts\Support\Arrayable;
 
 use function Hyde\evaluate_arrayable;
@@ -20,10 +18,8 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements SerializableContract
+class NavigationMenu implements Arrayable
 {
-    use Serializable;
-
     public const DEFAULT = 500;
     public const LAST = 999;
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 657110fda4d..54f4ab06f1f 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -33,23 +33,6 @@ public function testNavigationMenus()
             ['link' => 'about.html', 'label' => 'About'],
             ['link' => 'contact.html', 'label' => 'Contact'],
         ], $menu->toArray());
-
-        $this->assertSame(<<<JSON
-        [
-            {
-                "link": "index.html",
-                "label": "Home"
-            },
-            {
-                "link": "about.html",
-                "label": "About"
-            },
-            {
-                "link": "contact.html",
-                "label": "Contact"
-            }
-        ]
-        JSON, $menu->toJson(JSON_PRETTY_PRINT));
     }
 
     public function testNavigationMenusWithGroups()

From ecbe2fb05695eff5e39b5fbce661f9f83053d957 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:49:06 +0100
Subject: [PATCH 1423/2811] Simplify array data structure

---
 .../Framework/Features/Navigation/NavigationMenu.php |  6 ++----
 .../framework/tests/Feature/NavigationAPITest.php    | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 873ce83b4b6..c4a2f1e5eb3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -77,15 +77,13 @@ public function toArray(): array
                 return [
                     'label' => $item->getLabel(),
                     'items' => array_map(fn (NavigationItem $item): array => [
-                        'link' => $item->getLink(),
-                        'label' => $item->getLabel(),
+                        $item->getLink() => $item->getLabel(),
                     ], $item->getItems()),
                 ];
             }
 
             return [
-                'link' => $item->getLink(),
-                'label' => $item->getLabel(),
+                $item->getLink() => $item->getLabel(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 54f4ab06f1f..1325939c64d 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home'],
-            ['link' => 'about.html', 'label' => 'About'],
-            ['link' => 'contact.html', 'label' => 'Contact'],
+            ['index.html' => 'Home'],
+            ['about.html' => 'About'],
+            ['contact.html' => 'Contact'],
         ], $menu->toArray());
     }
 
@@ -48,10 +48,10 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            ['link' => 'index.html', 'label' => 'Home'],
+            ['index.html' => 'Home'],
             ['label' => 'About', 'items' => [
-                ['link' => 'about.html', 'label' => 'About Us'],
-                ['link' => 'contact.html', 'label' => 'Contact Us'],
+                ['about.html' => 'About Us'],
+                ['contact.html' => 'Contact Us'],
             ]],
         ], $menu->toArray());
     }

From cb08b9f4ccb91e746e1dae7b74ed7c7edd848af5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:52:45 +0100
Subject: [PATCH 1424/2811] Flatten array keys

---
 .../Features/Navigation/NavigationMenu.php    | 10 +++++-----
 .../tests/Feature/NavigationAPITest.php       | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c4a2f1e5eb3..c3425859737 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -72,14 +72,14 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      */
     public function toArray(): array
     {
-        return $this->getItems()->map(function (NavigationItem|NavigationGroup $item): array {
+        return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
             if ($item instanceof NavigationGroup) {
-                return [
+                return [[
                     'label' => $item->getLabel(),
-                    'items' => array_map(fn (NavigationItem $item): array => [
+                    'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
                         $item->getLink() => $item->getLabel(),
-                    ], $item->getItems()),
-                ];
+                    ]),
+                ]];
             }
 
             return [
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 1325939c64d..a26363978f8 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            ['index.html' => 'Home'],
-            ['about.html' => 'About'],
-            ['contact.html' => 'Contact'],
+            'index.html' => 'Home',
+            'about.html' => 'About',
+            'contact.html' => 'Contact',
         ], $menu->toArray());
     }
 
@@ -48,11 +48,14 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            ['index.html' => 'Home'],
-            ['label' => 'About', 'items' => [
-                ['about.html' => 'About Us'],
-                ['contact.html' => 'Contact Us'],
-            ]],
+            'index.html' => 'Home',
+            [
+                'label' => 'About',
+                'items' => [
+                    'about.html' => 'About Us',
+                    'contact.html' => 'Contact Us',
+                ],
+            ],
         ], $menu->toArray());
     }
 }

From 151992d79b8552205cda2176812f5f0ce6022ae7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:55:52 +0100
Subject: [PATCH 1425/2811] Put labels first in array representation

Considering we use a label-first approach for filtering, we are placing the highest importance on the labels, so we should put them first. It also makes it more semantic that $label leads to a $link
---
 .../Features/Navigation/NavigationMenu.php        | 15 ++++++++-------
 .../framework/tests/Feature/NavigationAPITest.php | 15 +++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c3425859737..30892e915ce 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -74,16 +74,17 @@ public function toArray(): array
     {
         return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
             if ($item instanceof NavigationGroup) {
-                return [[
-                    'label' => $item->getLabel(),
-                    'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
-                        $item->getLink() => $item->getLabel(),
-                    ]),
-                ]];
+                return [
+                    $item->getLabel() => [
+                        'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
+                            $item->getLabel() => $item->getLink(),
+                        ]),
+                    ]
+                ];
             }
 
             return [
-                $item->getLink() => $item->getLabel(),
+                $item->getLabel() => $item->getLink(),
             ];
         })->all();
     }
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index a26363978f8..390ce17c843 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -29,9 +29,9 @@ public function testNavigationMenus()
         ]);
 
         $this->assertSame([
-            'index.html' => 'Home',
-            'about.html' => 'About',
-            'contact.html' => 'Contact',
+            'Home' => 'index.html',
+            'About' => 'about.html',
+            'Contact' => 'contact.html',
         ], $menu->toArray());
     }
 
@@ -48,12 +48,11 @@ public function testNavigationMenusWithGroups()
         ]);
 
         $this->assertSame([
-            'index.html' => 'Home',
-            [
-                'label' => 'About',
+            'Home' => 'index.html',
+            'About' => [
                 'items' => [
-                    'about.html' => 'About Us',
-                    'contact.html' => 'Contact Us',
+                    'About Us' => 'about.html',
+                    'Contact Us' => 'contact.html',
                 ],
             ],
         ], $menu->toArray());

From 612df231cbc3d1ade7092a04b40e3785ea7183d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:57:47 +0100
Subject: [PATCH 1426/2811] Cleanup and normalize formatting

---
 .../Framework/Features/Navigation/NavigationMenu.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 30892e915ce..e76cf5e5b46 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -76,16 +76,14 @@ public function toArray(): array
             if ($item instanceof NavigationGroup) {
                 return [
                     $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), fn (NavigationItem $item): array => [
-                            $item->getLabel() => $item->getLink(),
-                        ]),
-                    ]
+                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                            return [$item->getLabel() => $item->getLink()];
+                        }),
+                    ],
                 ];
             }
 
-            return [
-                $item->getLabel() => $item->getLink(),
-            ];
+            return [$item->getLabel() => $item->getLink()];
         })->all();
     }
 

From 8a316b3e1000d00342f32bb6662e139e18242398 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 12:59:39 +0100
Subject: [PATCH 1427/2811] Update array generics for updated structure

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index e76cf5e5b46..35e90d30013 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -68,7 +68,7 @@ public function add(NavigationItem|NavigationGroup|array $items): static
      *
      * @experimental This method is experimental and may be changed before release.
      *
-     * @return array<int, array{link?: string, label: string, items?: array<int, array{link: string, label: string}>}>
+     * @return array<string, string|array{items: array<string, string>}>
      */
     public function toArray(): array
     {

From 3af4c3b18ff016963275b16079dc19059fe84acc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:29:04 +0100
Subject: [PATCH 1428/2811] Move experimental helper to test

Don't think we need this in the public API for now
---
 .../Features/Navigation/NavigationMenu.php    | 26 +------------------
 .../tests/Feature/NavigationAPITest.php       | 22 ++++++++++++++--
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 35e90d30013..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -18,7 +18,7 @@
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
  */
-class NavigationMenu implements Arrayable
+class NavigationMenu
 {
     public const DEFAULT = 500;
     public const LAST = 999;
@@ -63,30 +63,6 @@ public function add(NavigationItem|NavigationGroup|array $items): static
         return $this;
     }
 
-    /**
-     * Get the navigation items in the menu as an array.
-     *
-     * @experimental This method is experimental and may be changed before release.
-     *
-     * @return array<string, string|array{items: array<string, string>}>
-     */
-    public function toArray(): array
-    {
-        return $this->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
-            if ($item instanceof NavigationGroup) {
-                return [
-                    $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
-                            return [$item->getLabel() => $item->getLink()];
-                        }),
-                    ],
-                ];
-            }
-
-            return [$item->getLabel() => $item->getLink()];
-        })->all();
-    }
-
     protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 390ce17c843..eb2545efaca 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Testing\MocksKernelFeatures;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -32,7 +33,7 @@ public function testNavigationMenus()
             'Home' => 'index.html',
             'About' => 'about.html',
             'Contact' => 'contact.html',
-        ], $menu->toArray());
+        ], $this->toArray($menu));
     }
 
     public function testNavigationMenusWithGroups()
@@ -55,6 +56,23 @@ public function testNavigationMenusWithGroups()
                     'Contact Us' => 'contact.html',
                 ],
             ],
-        ], $menu->toArray());
+        ], $this->toArray($menu));
+    }
+
+    protected function toArray(NavigationMenu $menu): array
+    {
+        return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {
+            if ($item instanceof NavigationGroup) {
+                return [
+                    $item->getLabel() => [
+                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                            return [$item->getLabel() => $item->getLink()];
+                        }),
+                    ],
+                ];
+            }
+
+            return [$item->getLabel() => $item->getLink()];
+        })->all();
     }
 }

From 1332d658a2b8ec51bca60bb351cb1bdee94de18a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:33:29 +0100
Subject: [PATCH 1429/2811] Update test abstract

---
 packages/framework/tests/Feature/NavigationAPITest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index eb2545efaca..379b4c970c6 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -13,7 +13,7 @@
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
- * High level tests for the Navigation API.
+ * High level tests for the Navigation API to go along with the documentation.
  */
 class NavigationAPITest extends TestCase
 {
@@ -34,6 +34,13 @@ public function testNavigationMenus()
             'About' => 'about.html',
             'Contact' => 'contact.html',
         ], $this->toArray($menu));
+
+        foreach ($menu->getItems() as $item) {
+            $this->assertInstanceOf(NavigationItem::class, $item);
+
+            $this->assertIsString($item->getLabel());
+            $this->assertIsString($item->getLink());
+        }
     }
 
     public function testNavigationMenusWithGroups()

From 974a77d83a2ca6adfc944ca07e785199c3519945 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:47:28 +0100
Subject: [PATCH 1430/2811] Begin adding code driven documentation

---
 .../tests/Feature/NavigationAPITest.php       | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 379b4c970c6..9458bff9e13 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
@@ -13,16 +14,82 @@
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 /**
- * High level tests for the Navigation API to go along with the documentation.
+ * High level tests for the Navigation API to go along with the code-driven documentation.
  */
 class NavigationAPITest extends TestCase
 {
     use MocksKernelFeatures;
 
+    public function testNavigationItems()
+    {
+        // Each navigation item is represented by a NavigationItem instance containing the needed information.
+
+        // ## Creating Navigation Items
+
+        // There are a few ways to create navigation items, depending on your needs.
+
+        // You can create instances directly by passing either a URL or Route instance to the constructor.
+        $item = new NavigationItem(Routes::get('index'), 'Home');
+        $this->assertInstanceOf(NavigationItem::class, $item);
+        $item = new NavigationItem('https://example.com', 'External Link');
+        $this->assertInstanceOf(NavigationItem::class, $item);
+
+        // You can also set the priority of the item, which determines its position in the menu.
+        $item = new NavigationItem(Routes::get('index'), 'Home', 25);
+        $this->assertSame(25, $item->getPriority());
+
+        // You can also create instances using the static create method, which can automatically fill in the label and priority from a Route.
+        $item = NavigationItem::create(Routes::get('index'));
+        $this->assertSame('Home', $item->getLabel());
+        $this->assertSame(0, $item->getPriority());
+
+        // You can also pass a custom label and priority to the create method to override the defaults.
+        $item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
+        $this->assertSame('Custom Label', $item->getLabel());
+        $this->assertSame(50, $item->getPriority());
+
+        // The create method also works with route keys.
+        $item = NavigationItem::create('index');
+        $this->assertSame('Home', $item->getLabel());
+        $this->assertEquals(NavigationItem::create('index'), NavigationItem::create(Routes::get('index')));
+
+        // You can also pass a URL to the create method.
+        $item = NavigationItem::create('https://example.com');
+        $this->assertSame('https://example.com', $item->getLink());
+
+        // Unless you pass a custom label to URL items, the label will be the URL itself.
+        $item = NavigationItem::create('https://example.com');
+        $this->assertSame('https://example.com', $item->getLabel());
+
+        // ## Navigation Item Methods
+
+        // There are a few helper methods available on NavigationItem instances.
+        $item = NavigationItem::create('index'); // Documentation ignores this line.
+
+        // Get the label of the item.
+        $this->assertSame('Home', $item->getLabel());
+
+        // Get the link of the item.
+        $this->assertSame('index.html', $item->getLink());
+
+        // You can also get the link by casting the item to a string.
+        $this->assertSame('index.html', (string) $item);
+
+        // Get the priority of the item.
+        $this->assertSame(0, $item->getPriority());
+
+        // Get the underlying Page instance of the item, if it exists. If the item is not a routed page (like direct URLs), this will return null.
+        $this->assertInstanceOf(BladePage::class, $item->getPage());
+
+        // Check if the item is active (the current page being rendered).
+        $this->assertFalse($item->isActive());
+    }
+
     public function testNavigationMenus()
     {
         $this->withPages(['index', 'about', 'contact']);
 
+        // Navigation menus are created with an array of NavigationItem instances.
         $menu = new NavigationMenu([
             new NavigationItem(Routes::get('index'), 'Home'),
             new NavigationItem(Routes::get('about'), 'About'),
@@ -35,6 +102,7 @@ public function testNavigationMenus()
             'Contact' => 'contact.html',
         ], $this->toArray($menu));
 
+        // You can get the items in the menu, which are automatically sorted by their priority.
         foreach ($menu->getItems() as $item) {
             $this->assertInstanceOf(NavigationItem::class, $item);
 
@@ -47,6 +115,7 @@ public function testNavigationMenusWithGroups()
     {
         $this->withPages(['index', 'about', 'contact']);
 
+        // You can also add navigation groups to the menu, which can contain more items.
         $menu = new NavigationMenu([
             new NavigationItem(Routes::get('index'), 'Home'),
             new NavigationGroup('About', [

From 3d9e7125d3eec0b3e6347d0f9c3619945ae3ed1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:48:54 +0100
Subject: [PATCH 1431/2811] Create navigation-api.md

---
 docs/advanced-features/navigation-api.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 docs/advanced-features/navigation-api.md

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
new file mode 100644
index 00000000000..10dc1cfda42
--- /dev/null
+++ b/docs/advanced-features/navigation-api.md
@@ -0,0 +1,7 @@
+---
+navigation:
+    label: "Navigation API"
+---
+
+# Navigation API
+

From 45c62523b4c8e25a8662e284dcc89e967d43ccc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:50:38 +0100
Subject: [PATCH 1432/2811] Add warning

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 10dc1cfda42..4f7c75ef215 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -5,3 +5,4 @@ navigation:
 
 # Navigation API
 
+>warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.

From d930787a739d0b3029325cc4aeb8d04b41d40818 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:51:47 +0100
Subject: [PATCH 1433/2811] Add abstract

---
 docs/advanced-features/navigation-api.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 4f7c75ef215..f71365d3c19 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -6,3 +6,8 @@ navigation:
 # Navigation API
 
 >warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.
+
+## Abstract
+
+This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
+However, if you are interested in creating your own custom navigation menus, you can also utilize this API - and this article will show you how.

From 356202467ff3cd05b1c23a2d3f7e625a4c936d2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 13:52:28 +0100
Subject: [PATCH 1434/2811] Document target reader

---
 docs/advanced-features/navigation-api.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f71365d3c19..a767173f3cb 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -11,3 +11,6 @@ navigation:
 
 This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
 However, if you are interested in creating your own custom navigation menus, you can also utilize this API - and this article will show you how.
+
+This article is intended for advanced users, as most users will not need to create custom navigation menus.
+For this reason, the documentation is very code-driven due to the technical nature of the API.

From adb51bf58fdbae618f6ef34e9adabe8be7c98819 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:16:54 +0100
Subject: [PATCH 1435/2811] Document overview

---
 docs/advanced-features/navigation-api.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index a767173f3cb..ef54dc15746 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -14,3 +14,13 @@ However, if you are interested in creating your own custom navigation menus, you
 
 This article is intended for advanced users, as most users will not need to create custom navigation menus.
 For this reason, the documentation is very code-driven due to the technical nature of the API.
+
+## Overview
+
+The Navigation API consists of a set of classes within the `Hyde\Framework\Features\Navigation` namespace.
+
+Together, these form an object-oriented way to create and interact with navigation menus and their items.
+
+In short, a navigation menu is an instance of the `NavigationMenu` class. Each menu contains a collection of `NavigationItem` or `NavigationGroup` classes.
+The former represents a single item in the menu, while the latter represents a group of items.
+

From c6a5cbd2c5e452aef131a85f458b4b129a719380 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:05 +0100
Subject: [PATCH 1436/2811] Document visualisation

---
 docs/advanced-features/navigation-api.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ef54dc15746..ca23fb81218 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -24,3 +24,22 @@ Together, these form an object-oriented way to create and interact with navigati
 In short, a navigation menu is an instance of the `NavigationMenu` class. Each menu contains a collection of `NavigationItem` or `NavigationGroup` classes.
 The former represents a single item in the menu, while the latter represents a group of items.
 
+### Visualisation
+
+Here is a visual representation of the structure of a navigation menu:
+
+```php
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenu {
+    protected Collection $items = [
+        new NavigationItem(destination: 'index.html', label: 'Home'),
+        new NavigationItem(destination: 'posts.html', label: 'Blog'),
+        new NavigationGroup(label: 'About', items: [
+            new NavigationItem(destination: 'about.html', label: 'About Us'),
+            new NavigationItem(destination: 'team.html', label: 'Our Team'),
+        ]),
+    ];
+}
+```
+

From 765c1df70cec9d0222049bad82debc05c9354b85 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:13 +0100
Subject: [PATCH 1437/2811] Document built in menus

---
 docs/advanced-features/navigation-api.md | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ca23fb81218..6799b4bb04b 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -43,3 +43,31 @@ class NavigationMenu {
 }
 ```
 
+### Built-in Menus
+
+HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar.
+
+These are bound into the service container as singletons and can be accessed through dependency injection.
+
+```php
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+/** @var \Hyde\Framework\Features\Navigation\MainNavigationMenu $menu */
+$menu = app('navigation.main')
+
+/** @var DocumentationSidebar $sidebar */
+$sidebar= app('navigation.sidebar')
+```
+
+You can also get them through the static `get` helpers on the menu classes themselves.
+
+```php
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+
+$menu = MainNavigationMenu::get();
+$sidebar = DocumentationSidebar::get();
+```
+
+>info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 

From e4e7b3a45f2dce7e845e257befb8ae58a0dc1cdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 25 Mar 2024 14:17:50 +0100
Subject: [PATCH 1438/2811] Test service container menus

---
 .../tests/Feature/NavigationAPITest.php       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 9458bff9e13..5446e192e02 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Arr;
@@ -12,6 +13,8 @@
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 
 /**
  * High level tests for the Navigation API to go along with the code-driven documentation.
@@ -20,6 +23,23 @@ class NavigationAPITest extends TestCase
 {
     use MocksKernelFeatures;
 
+    public function testServiceContainerMenus()
+    {
+        // The NavigationServiceProvider binds the main and sidebar navigation menus into the service container.
+
+        Hyde::boot();
+
+        // You can access the menus from the service container.
+
+        $this->assertInstanceOf(MainNavigationMenu::class, app('navigation.main'));
+        $this->assertInstanceOf(DocumentationSidebar::class, app('navigation.sidebar'));
+
+        // You can also use the facade to access the menus.
+
+        $this->assertSame(app('navigation.main'), MainNavigationMenu::get());
+        $this->assertSame(app('navigation.sidebar'), DocumentationSidebar::get());
+    }
+
     public function testNavigationItems()
     {
         // Each navigation item is represented by a NavigationItem instance containing the needed information.

From 77ca13070837f6294de253519d886129b8f2249c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 13:06:16 +0100
Subject: [PATCH 1439/2811] Improve section introduction

---
 docs/advanced-features/navigation-api.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 6799b4bb04b..397d6b466de 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -45,9 +45,8 @@ class NavigationMenu {
 
 ### Built-in Menus
 
-HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar.
-
-These are bound into the service container as singletons and can be accessed through dependency injection.
+HydePHP comes with two built-in menus: the main navigation menu and the documentation sidebar, both represented as child classes of the `NavigationMenu` class.
+They are bound into the service container as singletons and can be accessed through dependency injection.
 
 ```php
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;

From cffbdb694d71f9420daedb2cbccd141f6b1f6100 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:29:06 +0100
Subject: [PATCH 1440/2811] Create new custom menu section

---
 docs/advanced-features/navigation-api.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 397d6b466de..79bb7b9a736 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -70,3 +70,16 @@ $sidebar = DocumentationSidebar::get();
 ```
 
 >info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 
+
+## Creating Custom Menus
+
+### Overview
+
+When creating a custom menu, there are two ways to go about it:
+
+1. You can construct a NavigationMenu instance directly and add items to it. This works great for smaller menus that don't need any special logic, for example a footer menu or social media links.
+2. You can create a custom class that extends the NavigationMenu class. This is useful for larger menus that require more complex logic, or that you want to reuse in multiple places in your application or in a package.
+
+In both cases, the underlying API is the same, and you can use the helper methods and features provided by the APIs.
+
+In this section, you will first see some high level overviews of how the API can be used, then we'll dive in deeper and take a look at each class and method in detail.

From f567fcb0a64615eaaa3ae33373a5a022281849e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:44:04 +0100
Subject: [PATCH 1441/2811] Update heading

---
 docs/advanced-features/navigation-api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 79bb7b9a736..65d39675759 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -73,7 +73,7 @@ $sidebar = DocumentationSidebar::get();
 
 ## Creating Custom Menus
 
-### Overview
+### Introduction Overview
 
 When creating a custom menu, there are two ways to go about it:
 

From 504373c08267e1eb0a4e9787dd96b1f85aa1c9eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 14:53:17 +0100
Subject: [PATCH 1442/2811] Begin adding high level example

---
 docs/advanced-features/navigation-api.md      | 27 +++++++++++++++++++
 .../tests/Feature/NavigationAPITest.php       | 15 +++++++++++
 2 files changed, 42 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 65d39675759..31421354ea0 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -83,3 +83,30 @@ When creating a custom menu, there are two ways to go about it:
 In both cases, the underlying API is the same, and you can use the helper methods and features provided by the APIs.
 
 In this section, you will first see some high level overviews of how the API can be used, then we'll dive in deeper and take a look at each class and method in detail.
+
+### High Level Example
+
+Here is a high level example of how you can create a custom menu, and how to actually utilize it into something useful: A menu with social media links for a site footer.
+
+#### Step 1: Create the Menu
+
+```php
+// To create our menu, we start by constructing a new NavigationMenu instance
+$menu = new NavigationMenu();
+
+// We can then add our social media links to the menu.
+// We do this by adding NavigationItem instances to the menu.
+$menu->add([
+    // The first parameter is the URL, and the second is the label.
+    NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
+    NavigationItem::create('https://github.com/hydephp', 'GitHub'),
+    NavigationItem::create('https://hydephp.com', 'Website'),
+]);
+```
+
+#### Tips:
+ 
+- You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
+- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
+- You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
+- It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5446e192e02..5ddb5bc211a 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -155,6 +155,21 @@ public function testNavigationMenusWithGroups()
         ], $this->toArray($menu));
     }
 
+    public function testSocialMediaFooterLinkExample()
+    {
+        // To create our menu, we start by constructing a new NavigationMenu instance
+        $menu = new NavigationMenu();
+
+        // We can then add our social media links to the menu.
+        // We do this by adding NavigationItem instances to the menu.
+        $menu->add([
+            // The first parameter is the URL, and the second is the label.
+            NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
+            NavigationItem::create('https://github.com/hydephp', 'GitHub'),
+            NavigationItem::create('https://hydephp.com', 'Website'),
+        ]);
+    }
+
     protected function toArray(NavigationMenu $menu): array
     {
         return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item): array {

From 89ae76f22fe2eccbbf60e63fb58e0939025efa39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:13:26 +0100
Subject: [PATCH 1443/2811] Add more complete documentation examples

---
 docs/advanced-features/navigation-api.md      | 45 ++++++++++++++++---
 .../tests/Feature/NavigationAPITest.php       | 35 +++++++++++++++
 2 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 31421354ea0..d1cc4e87ee2 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -86,16 +86,16 @@ In this section, you will first see some high level overviews of how the API can
 
 ### High Level Example
 
-Here is a high level example of how you can create a custom menu, and how to actually utilize it into something useful: A menu with social media links for a site footer.
+To illustrate how you can create a custom menu, let's make something useful: A footer menu with social media links.
 
 #### Step 1: Create the Menu
 
+To create our menu, we start by constructing a new NavigationMenu instance.
+We can then add our social media links as NavigationItem instances to the menu.
+
 ```php
-// To create our menu, we start by constructing a new NavigationMenu instance
 $menu = new NavigationMenu();
 
-// We can then add our social media links to the menu.
-// We do this by adding NavigationItem instances to the menu.
 $menu->add([
     // The first parameter is the URL, and the second is the label.
     NavigationItem::create('https://twitter.com/hydephp', 'Twitter'),
@@ -104,8 +104,41 @@ $menu->add([
 ]);
 ```
 
-#### Tips:
- 
+#### Step 2: Display the Menu
+
+We can now iterate over the menu items to render them in our footer.
+
+```blade
+<footer>
+    <ul>
+        @foreach ($menu->getItems() as $item)
+            <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+        @endforeach
+    </ul>
+</footer>
+```
+
+This will result in the following HTML:
+
+```html
+<footer>
+    <ul>
+        <li><a href="https://twitter.com/hydephp">Twitter</a></li>
+        <li><a href="https://github.com/hydephp">GitHub</a></li>
+        <li><a href="https://hydephp.com">Website</a></li>
+    </ul>
+</footer>
+```
+
+#### Next Steps & Tips
+
+Of course, this is an incredibly simplistic example to illustrate the core concepts.
+Where the Navigation API really shines is in more complex scenarios where you want to utilize things like
+HydePHP Routes to resolve dynamic relative urls, and to use features like groups, priorities, and active states helpers to check if a menu item is the current page being viewed.
+
+The object-oriented nature of the API also makes this perfect for package developers wanting to create dynamic and reusable navigation menus that even can be further extended and customized by the end user.
+
+Here are some general tips to keep in mind when working with the Navigation API:
 - You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
 - The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5ddb5bc211a..5bb966a87a3 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Testing\MocksKernelFeatures;
+use Illuminate\Support\Facades\Blade;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
@@ -168,6 +169,27 @@ public function testSocialMediaFooterLinkExample()
             NavigationItem::create('https://github.com/hydephp', 'GitHub'),
             NavigationItem::create('https://hydephp.com', 'Website'),
         ]);
+
+        $rendered = Blade::render(/** @lang Blade */ <<<'BLADE'
+        {{-- We can now iterate over the menu items to render them in our footer. --}}
+        <footer>
+            <ul>
+                @foreach ($menu->getItems() as $item)
+                    <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+                @endforeach
+            </ul>
+        </footer>
+        BLADE, ['menu' => $menu]);
+
+        $this->assertSameIgnoringIndentation(<<<'HTML'
+        <footer>
+            <ul>
+                <li><a href="https://twitter.com/hydephp">Twitter</a></li>
+                <li><a href="https://github.com/hydephp">GitHub</a></li>
+                <li><a href="https://hydephp.com">Website</a></li>
+            </ul>
+        </footer>
+        HTML, $rendered);
     }
 
     protected function toArray(NavigationMenu $menu): array
@@ -186,4 +208,17 @@ protected function toArray(NavigationMenu $menu): array
             return [$item->getLabel() => $item->getLink()];
         })->all();
     }
+
+    protected function assertSameIgnoringIndentation(string $expected, string $actual): void
+    {
+        $this->assertSame(
+            $this->removeIndentation(trim($expected)),
+            $this->removeIndentation(trim($actual))
+        );
+    }
+
+    protected function removeIndentation(string $actual): string
+    {
+        return implode("\n", array_map('trim', explode("\n", $actual)));
+    }
 }

From cc055330f569db223e43e1ab043738281edac030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:14:33 +0100
Subject: [PATCH 1444/2811] Update abstract

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index d1cc4e87ee2..250137f1da1 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -14,6 +14,7 @@ However, if you are interested in creating your own custom navigation menus, you
 
 This article is intended for advanced users, as most users will not need to create custom navigation menus.
 For this reason, the documentation is very code-driven due to the technical nature of the API.
+We'll also be mixing in some practical examples of Blade and PHP code to illustrate how you can use the API in your own projects.
 
 ## Overview
 

From 0b9c84d2179397969466caf757e063a40e948ae7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:31:17 +0100
Subject: [PATCH 1445/2811] Update section to lead to the new documentation
 page

---
 docs/digging-deeper/navigation.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b904b37bbbd..65bac03a553 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -326,14 +326,7 @@ use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
 
 ## The Navigation API
 
-If you want to interact with the site navigation programmatically, you can do so through the new Navigation API.
-
+If you want to interact with the site navigation programmatically, or if you want to create complex custom, you can do so through the new Navigation API.
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
 
-### Overview
-
-The Navigation API consists of the following classes, allowing you to fluently interact with the navigation menus:
-
-```php
-use Hyde\Framework\Features\Navigation\NavigationMenu;
-```
+The Navigation API consists of a set of PHP classes, allowing you to fluently interact with the navigation menus. You can learn more about the API in the [Navigation API](navigation-api) documentation.

From d0e494890e10ff827dd1a221c31033ebb7d2d224 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 15:34:42 +0100
Subject: [PATCH 1446/2811] Set up documentation coverage

---
 packages/framework/tests/Feature/NavigationAPITest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 5bb966a87a3..26b444577ac 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -19,6 +19,14 @@
 
 /**
  * High level tests for the Navigation API to go along with the code-driven documentation.
+ *
+ * @see \Hyde\Framework\Features\Navigation\
+ *
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationItem
+ * @covers \Hyde\Framework\Features\Navigation\NavigationGroup
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  */
 class NavigationAPITest extends TestCase
 {

From 5d5b0df75f51cf56f407695f4df6b4388276b3b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 16:49:38 +0100
Subject: [PATCH 1447/2811] Begin class reference section

---
 docs/advanced-features/navigation-api.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 250137f1da1..9d5921bd426 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -144,3 +144,13 @@ Here are some general tips to keep in mind when working with the Navigation API:
 - The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
+
+## Class Reference
+
+Below is a reference of the classes and methods available in the Navigation API.
+
+### NavigationMenu
+
+### NavigationItem
+
+### NavigationGroup

From babd111aa406460cff29f646165b02358197463f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:03:22 +0100
Subject: [PATCH 1448/2811] Add section introductions

---
 docs/advanced-features/navigation-api.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9d5921bd426..9a17702d534 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -151,6 +151,12 @@ Below is a reference of the classes and methods available in the Navigation API.
 
 ### NavigationMenu
 
+The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
+
 ### NavigationItem
 
+The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link, label, and priority for ordering in the menu.
+
 ### NavigationGroup
+
+The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label and a collection of items. This class is often used to create submenus or dropdowns in a navigation menu.

From ad47c5acc5d18280f84f4fc3c619659095ae03a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:04:00 +0100
Subject: [PATCH 1449/2811] Clarifications and formatting

---
 docs/advanced-features/navigation-api.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9a17702d534..9c0381e4852 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -155,8 +155,9 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 ### NavigationItem
 
-The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link, label, and priority for ordering in the menu.
+The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
 ### NavigationGroup
 
-The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label and a collection of items. This class is often used to create submenus or dropdowns in a navigation menu.
+The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
+This class is often used to create submenus or dropdowns in a navigation menu.

From 9a2c03e17b30da566f239e391f2b414ce6fbb590 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:05:26 +0100
Subject: [PATCH 1450/2811] Lower heading groups

Might be less semantic, but will make formatting easier
---
 docs/advanced-features/navigation-api.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9c0381e4852..8b85976d161 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -149,15 +149,15 @@ Here are some general tips to keep in mind when working with the Navigation API:
 
 Below is a reference of the classes and methods available in the Navigation API.
 
-### NavigationMenu
+## NavigationMenu
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
-### NavigationItem
+## NavigationItem
 
 The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
-### NavigationGroup
+## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
 This class is often used to create submenus or dropdowns in a navigation menu.

From f7ae4e1aee514481422e0f7e58c6420fbda01ee7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:14:54 +0100
Subject: [PATCH 1451/2811] Start sketching out item docs

---
 docs/advanced-features/navigation-api.md | 112 +++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 8b85976d161..6cdd2eb790e 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -157,6 +157,118 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
 
+Here is the constructor signature and a quick reference of the methods available on the `NavigationItem` class, and their types. Keep on reading to see more detailed examples and explanations.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationItem;
+
+$item = new NavigationItem(Route|string $destination, string $label, int $priority = 500);
+
+$item->getLink():  string; // Returns the resolved link route or destination URL.
+$item->getLabel(): string; // Returns the label of the item.
+$item->isActive(): bool;   // Returns true if the item is the page being rendered.
+$item->getPriority(): int; // Returns the priority of the item.
+$item->getPage(): ?HydePage; // Returns the underlying Page instance, if there is one.
+```
+
+### Creating Navigation Items
+
+There are several ways to create navigation items using the `NavigationItem` class.
+
+#### Direct instantiation
+
+You can create instances directly by passing either a URL or a Route instance to the constructor. 
+
+The first parameter is the destination, the second is the label, and the third optional parameter is the priority.
+
+```php
+$item = new NavigationItem('index', 'Home');
+$item = new NavigationItem(Routes::get('index'), 'Home');
+$item = new NavigationItem('https://example.com', 'External Link');
+```
+
+#### Setting Priority
+
+You can set the priority of the item, which determines its position in the menu.
+
+```php
+$item = new NavigationItem(Routes::get('index'), 'Home', 25);
+```
+
+#### Static Creation Method
+
+You can use the static `create` method, which can automatically fill in the label and priority from a Route.
+
+```php
+$item = NavigationItem::create(Routes::get('index'));
+```
+
+You can also pass a custom label and priority to the `create` method to override the defaults.
+
+```php
+$item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
+```
+
+#### Using Route Keys and URLs
+
+The `create` method works with route keys and URLs.
+
+```php
+$item = NavigationItem::create('index');
+$item = NavigationItem::create('https://example.com');
+```
+
+Unless you pass a custom label to URL items, the label will be the URL itself.
+
+```php
+$item = NavigationItem::create('https://example.com');
+```
+
+### Navigation Item Methods
+
+### Getting Label and Link
+
+```php
+$item = NavigationItem::create('index');
+
+// Get the label of the item.
+$item->getLabel(); // Returns 'Home'
+
+// Get the link of the item.
+$item->getLink(); // Returns 'index.html'
+```
+
+You can also get the link by casting the item to a string.
+
+```php
+(string) $item; // Returns 'index.html'
+```
+
+### Getting Priority
+
+```php
+$item->getPriority(); // Returns 0
+```
+
+### Getting Page Instance
+
+You can get the underlying Page instance of the item, if it exists.
+
+```php
+$item->getPage(); // Returns instance of BladePage or null
+```
+
+### Checking Active State
+
+You can check if the item is active (i.e., the current page being rendered).
+
+```php
+$item->isActive(); // Returns false
+```
+
+This concludes the documentation for the `NavigationItem` class.
+
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 13b00bce285701eaad271500195af40427f4432c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:23:01 +0100
Subject: [PATCH 1452/2811] Remove PHPDocs from constructor

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index dd4ab94709a..7b202c7c5ea 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -26,13 +26,6 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
-    /**
-     * Create a new navigation menu item with your own properties.
-     *
-     * @param  \Hyde\Support\Models\Route|string  $destination  Route instance, route key, or external URI.
-     * @param  string  $label  The label of the navigation item.
-     * @param  int  $priority  The priority to determine the order of the navigation item.
-     */
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
         $this->destination = $destination;

From f8476918644d3244371b023d35f658c2fe479881 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:23:18 +0100
Subject: [PATCH 1453/2811] Remove outdated class documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 7b202c7c5ea..0d0a53347ff 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -14,11 +14,6 @@
 
 /**
  * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
- *
- * You have a few options to construct a navigation menu item:
- *   1. You can supply a Route directly and explicit properties to the constructor
- *   2. You can use NavigationItem::fromRoute() to use data from the route
- *   3. You can use NavigationItem::create() for an external or un-routed link
  */
 class NavigationItem implements Stringable
 {

From 4a36e293ae8be06626e3e5ad6ec5b3e7743145be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:25:55 +0100
Subject: [PATCH 1454/2811] Sort property constructors

---
 .../src/Framework/Features/Navigation/NavigationItem.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 0d0a53347ff..1d116e42c90 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,10 +23,9 @@ class NavigationItem implements Stringable
 
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
-        $this->destination = $destination;
-
         $this->label = $label;
         $this->priority = $priority;
+        $this->destination = $destination;
     }
 
     /**

From 3bcafebb468d446da53c8613e7bb64680418e2e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:32:22 +0100
Subject: [PATCH 1455/2811] Extract helper method

---
 .../Features/Navigation/NavigationItem.php    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1d116e42c90..8953f007835 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -37,16 +37,7 @@ public function __construct(Route|string $destination, string $label, int $prior
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
-        if (is_string($destination) && Routes::has($destination)) {
-            $destination = Routes::get($destination);
-        }
-
-        if ($destination instanceof Route) {
-            $label ??= $destination->getPage()->navigationMenuLabel();
-            $priority ??= $destination->getPage()->navigationMenuPriority();
-        }
-
-        return new static($destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT);
+        return new static(...self::make($destination, $label, $priority));
     }
 
     /**
@@ -96,4 +87,18 @@ public function isActive(): bool
     {
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
+
+    protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
+    {
+        if (is_string($destination) && Routes::has($destination)) {
+            $destination = Routes::get($destination);
+        }
+
+        if ($destination instanceof Route) {
+            $label ??= $destination->getPage()->navigationMenuLabel();
+            $priority ??= $destination->getPage()->navigationMenuPriority();
+        }
+
+        return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
+    }
 }

From 1b35793fdfa9b10e176b3bf54b4dc75212c7aeb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 17:41:29 +0100
Subject: [PATCH 1456/2811] Update constructor to use the same logic as the
 static create method

---
 .../src/Framework/Features/Navigation/NavigationItem.php   | 4 +---
 packages/framework/tests/Unit/NavigationItemTest.php       | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 8953f007835..d3587644624 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,9 +23,7 @@ class NavigationItem implements Stringable
 
     public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
     {
-        $this->label = $label;
-        $this->priority = $priority;
-        $this->destination = $destination;
+        [$this->destination, $this->label, $this->priority] = self::make($destination, $label, $priority);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index cb45bd6c9a9..0d5acc1bb2e 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -51,11 +51,12 @@ public function testPassingRouteInstanceToConstructorUsesRouteInstance()
         $this->assertEquals($route, (new NavigationItem($route, 'Home'))->getPage()->getRoute());
     }
 
-    public function testPassingRouteKeyToConstructorUsesDestinationAsLink()
+    public function testPassingRouteKeyToConstructorUsesDestinationAsRoute()
     {
         $item = new NavigationItem('index', 'Home');
-        $this->assertNull($item->getPage());
-        $this->assertSame('index', $item->getLink());
+        $this->assertSame(Routes::get('index')->getPage(), $item->getPage());
+        $this->assertSame('index', $item->getPage()->getRouteKey());
+        $this->assertSame('index.html', $item->getLink());
     }
 
     public function testPassingUrlToConstructorSetsRouteToNull()

From b3c87c2a3a719ed9be82c407cb7b9fc7a735c464 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:14:08 +0100
Subject: [PATCH 1457/2811] Update and normalize class documentation and
 constructors

---
 .../Features/Navigation/NavigationItem.php    | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index d3587644624..786011c8420 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -13,7 +13,9 @@
 use function is_string;
 
 /**
- * Abstraction for a navigation menu item. Used by the MainNavigationMenu and DocumentationSidebar classes.
+ * Abstraction for a navigation menu item containing useful information like the destination, label, and priority.
+ *
+ * It is used by the MainNavigationMenu and DocumentationSidebar classes.
  */
 class NavigationItem implements Stringable
 {
@@ -21,7 +23,14 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
-    public function __construct(Route|string $destination, string $label, int $priority = NavigationMenu::DEFAULT)
+    /**
+     * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
+     *
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     */
+    public function __construct(Route|string $destination, ?string $label = null, ?int $priority = null)
     {
         [$this->destination, $this->label, $this->priority] = self::make($destination, $label, $priority);
     }
@@ -29,9 +38,9 @@ public function __construct(Route|string $destination, string $label, int $prior
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *
-     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or external URI.
-     * @param  string|null  $label  Leave blank to use the label of the route's corresponding page, if there is one tied to the route.
-     * @param  int|null  $priority  Leave blank to use the priority of the route's corresponding page, if there is one tied to the route.
+     * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
      */
     public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
     {
@@ -39,7 +48,7 @@ public static function create(Route|string $destination, ?string $label = null,
     }
 
     /**
-     * Resolve a link to the navigation item.
+     * Resolve a link to the navigation item. See `getLink()` for more information.
      */
     public function __toString(): string
     {
@@ -47,7 +56,10 @@ public function __toString(): string
     }
 
     /**
-     * Resolve the destination link of the navigation item.
+     * Resolve the destination link of the navigation item. This can then be used in the `href` attribute of an anchor tag.
+     *
+     * If the destination is a Route, it will be resolved using the Route's link.
+     * Otherwise, it will be returned as is for external links using URLs.
      */
     public function getLink(): string
     {
@@ -88,11 +100,13 @@ public function isActive(): bool
 
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
+        // Automatically resolve the destination if it's a route key.
         if (is_string($destination) && Routes::has($destination)) {
             $destination = Routes::get($destination);
         }
 
         if ($destination instanceof Route) {
+            // Try to fill in missing properties from the route's connected page.
             $label ??= $destination->getPage()->navigationMenuLabel();
             $priority ??= $destination->getPage()->navigationMenuPriority();
         }

From 78ff7d2a7e7c84355be266a2ab16c6f99d90d848 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:16:55 +0100
Subject: [PATCH 1458/2811] Annotate array return generics

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 786011c8420..c7d01de2d15 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -98,6 +98,7 @@ public function isActive(): bool
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 
+    /** @return array{Route|string, string, int} */
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
         // Automatically resolve the destination if it's a route key.

From 26cd0bfff66ff2e8253b026f4961a95088926c70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:17:14 +0100
Subject: [PATCH 1459/2811] Use fully qualified class name in type annotation

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index c7d01de2d15..befda4b80e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -98,7 +98,7 @@ public function isActive(): bool
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 
-    /** @return array{Route|string, string, int} */
+    /** @return array{\Hyde\Support\Models\Route|string, string, int} */
     protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
     {
         // Automatically resolve the destination if it's a route key.

From 15b8b65890301b89024b216c18be1bdf2fffcb9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 18:22:46 +0100
Subject: [PATCH 1460/2811] Test construct with null label

---
 .../tests/Unit/NavigationItemTest.php         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 0d5acc1bb2e..19f4f22f0c1 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -219,6 +219,26 @@ public function testCreateWithNullLabel()
         }
     }
 
+    public function testConstructWithNullLabel()
+    {
+        $this->assertSame('foo', (new NavigationItem('foo'))->getLabel());
+
+        $links = [
+            'www.example.com',
+            'https://example.com',
+            'https://example.com/',
+            'https://example.com/foo',
+            'https://example.com/foo/',
+            'https://example.com/foo/bar',
+            'https://example.com/foo/bar.html',
+            'https://example.com/foo/bar.png',
+        ];
+
+        foreach ($links as $link) {
+            $this->assertSame($link, (new NavigationItem($link))->getLabel());
+        }
+    }
+
     public function testPassingRouteKeyToStaticConstructorUsesRouteInstance()
     {
         $route = Routes::get('index');

From 377a2ba0f4ebdd046bdb42b4f441105833ff78b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:17:44 +0100
Subject: [PATCH 1461/2811] Create new documentation for simplified API

---
 docs/advanced-features/navigation-api.md      | 119 ++++--------------
 .../tests/Feature/NavigationAPITest.php       |  62 ++++-----
 2 files changed, 55 insertions(+), 126 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 6cdd2eb790e..7f6d3e0c008 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -155,120 +155,45 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 ## NavigationItem
 
-The `NavigationItem` class represents a single item in a navigation menu. It contains information such as the destination link or route, a label, and priority for ordering in the menu.
-
-Here is the constructor signature and a quick reference of the methods available on the `NavigationItem` class, and their types. Keep on reading to see more detailed examples and explanations.
-
-```php
-use Hyde\Framework\Features\Navigation\NavigationItem;
-
-$item = new NavigationItem(Route|string $destination, string $label, int $priority = 500);
-
-$item->getLink():  string; // Returns the resolved link route or destination URL.
-$item->getLabel(): string; // Returns the label of the item.
-$item->isActive(): bool;   // Returns true if the item is the page being rendered.
-$item->getPriority(): int; // Returns the priority of the item.
-$item->getPage(): ?HydePage; // Returns the underlying Page instance, if there is one.
-```
+The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
 ### Creating Navigation Items
 
-There are several ways to create navigation items using the `NavigationItem` class.
-
-#### Direct instantiation
-
-You can create instances directly by passing either a URL or a Route instance to the constructor. 
-
-The first parameter is the destination, the second is the label, and the third optional parameter is the priority.
-
-```php
-$item = new NavigationItem('index', 'Home');
-$item = new NavigationItem(Routes::get('index'), 'Home');
-$item = new NavigationItem('https://example.com', 'External Link');
-```
-
-#### Setting Priority
+There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
-You can set the priority of the item, which determines its position in the menu.
+The constructors take three parameters: the destination, the label, and the optional priority.
+The destination can be a `Route` instance, a route key string, or an external URL.
 
 ```php
-$item = new NavigationItem(Routes::get('index'), 'Home', 25);
-```
-
-#### Static Creation Method
-
-You can use the static `create` method, which can automatically fill in the label and priority from a Route.
-
-```php
-$item = NavigationItem::create(Routes::get('index'));
-```
-
-You can also pass a custom label and priority to the `create` method to override the defaults.
-
-```php
-$item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
-```
-
-#### Using Route Keys and URLs
-
-The `create` method works with route keys and URLs.
-
-```php
-$item = NavigationItem::create('index');
-$item = NavigationItem::create('https://example.com');
-```
-
-Unless you pass a custom label to URL items, the label will be the URL itself.
-
-```php
-$item = NavigationItem::create('https://example.com');
-```
-
-### Navigation Item Methods
-
-### Getting Label and Link
-
-```php
-$item = NavigationItem::create('index');
-
-// Get the label of the item.
-$item->getLabel(); // Returns 'Home'
-
-// Get the link of the item.
-$item->getLink(); // Returns 'index.html'
-```
-
-You can also get the link by casting the item to a string.
+use Hyde\Framework\Features\Navigation\NavigationItem;
 
-```php
-(string) $item; // Returns 'index.html'
+$item = new NavigationItem($destination, $label, $priority);
+$item = NavigationItem::create($destination, $label, $priority);
 ```
 
-### Getting Priority
-
-```php
-$item->getPriority(); // Returns 0
-```
+#### Using Routes
 
-### Getting Page Instance
+Using the HydePHP routing system is the recommended way to create navigation items leading to pages within your project,
+as they will automatically have links resolved to the correct URL, and Hyde can check if the items are active.
+Additionally, Hyde will use the page data as the label and priority defaults unless you override them.
 
-You can get the underlying Page instance of the item, if it exists.
+Create routed navigation items by providing either a `Route` instance or a route key string as the destination.
 
 ```php
-$item->getPage(); // Returns instance of BladePage or null
-```
-
-### Checking Active State
+// Using a Route instance will automatically fill in the label and priority from the route's connected page.
+$item = new NavigationItem(Routes::get('index'));
+// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
 
-You can check if the item is active (i.e., the current page being rendered).
+// Using a route key provides the same functionality as using a Route instance.
+// Make sure the route exists otherwise it will be treated as a link.
+$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
 
-```php
-$item->isActive(); // Returns false
+// Setting the label and/or priorities will override the page's data.
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
-This concludes the documentation for the `NavigationItem` class.
-
-
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 26b444577ac..31f866b3c43 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -51,44 +51,37 @@ public function testServiceContainerMenus()
 
     public function testNavigationItems()
     {
-        // Each navigation item is represented by a NavigationItem instance containing the needed information.
+        // The NavigationItem class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
         // ## Creating Navigation Items
 
-        // There are a few ways to create navigation items, depending on your needs.
+        // There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+        // Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
-        // You can create instances directly by passing either a URL or Route instance to the constructor.
-        $item = new NavigationItem(Routes::get('index'), 'Home');
-        $this->assertInstanceOf(NavigationItem::class, $item);
-        $item = new NavigationItem('https://example.com', 'External Link');
-        $this->assertInstanceOf(NavigationItem::class, $item);
+        // The constructors take three parameters: the destination, the label, and the optional priority.
+        // The destination can be a Route instance, a route key string, or an external URL.
 
-        // You can also set the priority of the item, which determines its position in the menu.
-        $item = new NavigationItem(Routes::get('index'), 'Home', 25);
-        $this->assertSame(25, $item->getPriority());
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
 
-        // You can also create instances using the static create method, which can automatically fill in the label and priority from a Route.
-        $item = NavigationItem::create(Routes::get('index'));
-        $this->assertSame('Home', $item->getLabel());
-        $this->assertSame(0, $item->getPriority());
+        // Using a route key provides the same functionality as using a Route instance.
+        // Make sure the route exists otherwise it will be treated as a link.
+        $item = new NavigationItem('index');
+        $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
-        // You can also pass a custom label and priority to the create method to override the defaults.
-        $item = NavigationItem::create(Routes::get('index'), 'Custom Label', 50);
-        $this->assertSame('Custom Label', $item->getLabel());
-        $this->assertSame(50, $item->getPriority());
-
-        // The create method also works with route keys.
-        $item = NavigationItem::create('index');
-        $this->assertSame('Home', $item->getLabel());
-        $this->assertEquals(NavigationItem::create('index'), NavigationItem::create(Routes::get('index')));
+        // Setting the label and/or priorities will override the page's data.
+        $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+        $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);
 
-        // You can also pass a URL to the create method.
-        $item = NavigationItem::create('https://example.com');
-        $this->assertSame('https://example.com', $item->getLink());
+        // You can also pass an external URL as the destination.
+        $item = new NavigationItem('https://example.com', 'External Link', 10);
+        $this->assertData(['destination' => 'https://example.com', 'label' => 'External Link', 'priority' => 10], $item);
 
-        // Unless you pass a custom label to URL items, the label will be the URL itself.
-        $item = NavigationItem::create('https://example.com');
-        $this->assertSame('https://example.com', $item->getLabel());
+        // If you do not set a label for links, the label will default to the URL.
+        // And if uf you do not set a priority, it will default to 500.
+        $item = new NavigationItem('https://example.com');
+        $this->assertData(['destination' => 'https://example.com', 'label' => 'https://example.com', 'priority' => 500], $item);
 
         // ## Navigation Item Methods
 
@@ -229,4 +222,15 @@ protected function removeIndentation(string $actual): string
     {
         return implode("\n", array_map('trim', explode("\n", $actual)));
     }
+
+    protected function assertData(array $expected, NavigationItem $item): void
+    {
+        $actual = [
+            'destination' => $item->getLink(),
+            'label' => $item->getLabel(),
+            'priority' => $item->getPriority(),
+        ];
+
+        $this->assertSame($expected, $actual);
+    }
 }

From 2c11b05761a4d2b5c8ef252d402a26cdd0c8264a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:20:35 +0100
Subject: [PATCH 1462/2811] Swap order of examples

---
 docs/advanced-features/navigation-api.md            | 13 ++++++-------
 .../framework/tests/Feature/NavigationAPITest.php   |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 7f6d3e0c008..fc6fe2aea61 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,16 +182,15 @@ Create routed navigation items by providing either a `Route` instance or a route
 
 ```php
 // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-$item = new NavigationItem(Routes::get('index'));
-// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
-
-// Using a route key provides the same functionality as using a Route instance.
+// Using a route key provides the same functionality as using a Route instance, trading a bit of type safety for convenience.
 // Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
+$item = new NavigationItem('index');
+
+//
+$item = new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override the page's data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
-// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 100);
 ```
 
 ## NavigationGroup
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 31f866b3c43..191a9c2156e 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -61,15 +61,15 @@ public function testNavigationItems()
         // The constructors take three parameters: the destination, the label, and the optional priority.
         // The destination can be a Route instance, a route key string, or an external URL.
 
-        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-        $item = new NavigationItem(Routes::get('index'));
-        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
-
         // Using a route key provides the same functionality as using a Route instance.
         // Make sure the route exists otherwise it will be treated as a link.
         $item = new NavigationItem('index');
         $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
+
         // Setting the label and/or priorities will override the page's data.
         $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
         $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);

From 26baea19a4ad60ab6b992dc0c881e3b2edf0864a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:20:38 +0100
Subject: [PATCH 1463/2811] Revert "Swap order of examples"

This reverts commit 2c11b05761a4d2b5c8ef252d402a26cdd0c8264a.
---
 docs/advanced-features/navigation-api.md            | 13 +++++++------
 .../framework/tests/Feature/NavigationAPITest.php   |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index fc6fe2aea61..7f6d3e0c008 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,15 +182,16 @@ Create routed navigation items by providing either a `Route` instance or a route
 
 ```php
 // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-// Using a route key provides the same functionality as using a Route instance, trading a bit of type safety for convenience.
-// Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index');
-
-//
 $item = new NavigationItem(Routes::get('index'));
+// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
+
+// Using a route key provides the same functionality as using a Route instance.
+// Make sure the route exists otherwise it will be treated as a link.
+$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
 
 // Setting the label and/or priorities will override the page's data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 100);
+$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
 ## NavigationGroup
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 191a9c2156e..31f866b3c43 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -61,15 +61,15 @@ public function testNavigationItems()
         // The constructors take three parameters: the destination, the label, and the optional priority.
         // The destination can be a Route instance, a route key string, or an external URL.
 
+        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
+        $item = new NavigationItem(Routes::get('index'));
+        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
+
         // Using a route key provides the same functionality as using a Route instance.
         // Make sure the route exists otherwise it will be treated as a link.
         $item = new NavigationItem('index');
         $this->assertEquals(new NavigationItem(Routes::get('index')), $item);
 
-        // Using a Route instance will automatically fill in the label and priority from the route's connected page.
-        $item = new NavigationItem(Routes::get('index'));
-        $this->assertData(['destination' => 'index.html', 'label' => 'Home', 'priority' => 0], $item);
-
         // Setting the label and/or priorities will override the page's data.
         $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
         $this->assertData(['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10], $item);

From 39ea38d5453683fe099ebdaa607d44c83faf1e0d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:24:14 +0100
Subject: [PATCH 1464/2811] Clean up examples

---
 docs/advanced-features/navigation-api.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 7f6d3e0c008..e7bcd67740c 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -178,22 +178,22 @@ Using the HydePHP routing system is the recommended way to create navigation ite
 as they will automatically have links resolved to the correct URL, and Hyde can check if the items are active.
 Additionally, Hyde will use the page data as the label and priority defaults unless you override them.
 
-Create routed navigation items by providing either a `Route` instance or a route key string as the destination.
+You can create routed navigation items by providing either a `Route` instance or a route key string as the destination.
 
 ```php
-// Using a Route instance will automatically fill in the label and priority from the route's connected page.
-$item = new NavigationItem(Routes::get('index'));
-// ['destination' => 'index.html', 'label' => 'Home', 'priority' => 0]
+// Using a route key string.
+$item = new NavigationItem('index');
 
-// Using a route key provides the same functionality as using a Route instance.
-// Make sure the route exists otherwise it will be treated as a link.
-$item = new NavigationItem('index'); // Exactly the same as above, but without type safety.
+// Using the Routes facade to get a Route instance.
+$item = new NavigationItem(Routes::get('index'));
 
-// Setting the label and/or priorities will override the page's data.
+// Setting the label and/or priorities will override inferred data.
 $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
-// ['destination' => 'index.html', 'label' => 'Custom Label', 'priority' => 10]
 ```
 
+Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
+whereas providing an invalid route key to the `Routes` facade will throw an exception. It's up to you which one you prefer.
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 4df7c701848bf11c83b41b36a9400d610aeb6a6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:25:12 +0100
Subject: [PATCH 1465/2811] Fix typo in code comment

---
 packages/framework/tests/Feature/NavigationAPITest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 31f866b3c43..0f087bf8b82 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -79,7 +79,7 @@ public function testNavigationItems()
         $this->assertData(['destination' => 'https://example.com', 'label' => 'External Link', 'priority' => 10], $item);
 
         // If you do not set a label for links, the label will default to the URL.
-        // And if uf you do not set a priority, it will default to 500.
+        // And if you do not set a priority, it will default to 500.
         $item = new NavigationItem('https://example.com');
         $this->assertData(['destination' => 'https://example.com', 'label' => 'https://example.com', 'priority' => 500], $item);
 

From 0c29b9aedcf5837147e7888c8980058aae260272 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:30:58 +0100
Subject: [PATCH 1466/2811] Document using external URLs

---
 docs/advanced-features/navigation-api.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index e7bcd67740c..ac6137c51ea 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -194,6 +194,22 @@ $item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
 whereas providing an invalid route key to the `Routes` facade will throw an exception. It's up to you which one you prefer.
 
+#### Using External URLs
+
+You can also create navigation items that link to external URLs by providing a full URL as the destination.
+
+If you do not set a label for links, the label will default to the URL, and if you do not set a priority, it will default to `500`.
+
+```php
+$item = new NavigationItem('https://example.com');
+$item = new NavigationItem('https://example.com', 'External Link', 10);
+```
+
+While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,
+they are excellent for any time you want an absolute link to an external site or resource.
+
+Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From aea7e3aa3715bcf183a542c308616990d4c149a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:40:35 +0100
Subject: [PATCH 1467/2811] Document examples more

---
 docs/advanced-features/navigation-api.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ac6137c51ea..2893d6d2f6d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -201,7 +201,10 @@ You can also create navigation items that link to external URLs by providing a f
 If you do not set a label for links, the label will default to the URL, and if you do not set a priority, it will default to `500`.
 
 ```php
+// This will lead directly to the link, and use it as the label with a priority of 500.
 $item = new NavigationItem('https://example.com');
+
+// You can also set a custom label and priority to override the defaults.
 $item = new NavigationItem('https://example.com', 'External Link', 10);
 ```
 

From 80b2b97f7b441a470339ecf3a2144e15a975c440 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:43:01 +0100
Subject: [PATCH 1468/2811] Test item sorting

---
 .../tests/Feature/NavigationAPITest.php       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index 0f087bf8b82..ec5e9e7aa07 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -157,6 +157,37 @@ public function testNavigationMenusWithGroups()
         ], $this->toArray($menu));
     }
 
+    public function testItemSorting()
+    {
+        // Test items without priorities are returned in the order they were added.
+
+        $menu = new NavigationMenu([
+            new NavigationItem('foo', 'foo'),
+            new NavigationItem('bar', 'bar'),
+            new NavigationItem('baz', 'baz'),
+        ]);
+
+        $this->assertSame([
+            'foo' => 'foo',
+            'bar' => 'bar',
+            'baz' => 'baz',
+        ], $this->toArray($menu));
+
+        // Test items with priorities are sorted by priority.
+
+        $menu = new NavigationMenu([
+            new NavigationItem('foo', 'foo', 10),
+            new NavigationItem('bar', 'bar', 5),
+            new NavigationItem('baz', 'baz', 15),
+        ]);
+
+        $this->assertSame([
+            'bar' => 'bar',
+            'foo' => 'foo',
+            'baz' => 'baz',
+        ], $this->toArray($menu));
+    }
+
     public function testSocialMediaFooterLinkExample()
     {
         // To create our menu, we start by constructing a new NavigationMenu instance

From b542d4b15f9b498200b8e4801578fb8f24b69802 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:50:12 +0100
Subject: [PATCH 1469/2811] Style array key order

---
 packages/framework/tests/Feature/NavigationAPITest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index ec5e9e7aa07..b51483e03f1 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -177,8 +177,8 @@ public function testItemSorting()
 
         $menu = new NavigationMenu([
             new NavigationItem('foo', 'foo', 10),
-            new NavigationItem('bar', 'bar', 5),
             new NavigationItem('baz', 'baz', 15),
+            new NavigationItem('bar', 'bar', 5),
         ]);
 
         $this->assertSame([

From 790c975e7f725b56f8af6179ab11c2a94e44f6ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 19:51:27 +0100
Subject: [PATCH 1470/2811] Clean up examples

---
 docs/advanced-features/navigation-api.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 2893d6d2f6d..941a0738808 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -182,13 +182,13 @@ You can create routed navigation items by providing either a `Route` instance or
 
 ```php
 // Using a route key string.
-$item = new NavigationItem('index');
+new NavigationItem('index');
 
 // Using the Routes facade to get a Route instance.
-$item = new NavigationItem(Routes::get('index'));
+new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override inferred data.
-$item = new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+new NavigationItem(Routes::get('index'), 'Custom Label', 10);
 ```
 
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
@@ -202,10 +202,10 @@ If you do not set a label for links, the label will default to the URL, and if y
 
 ```php
 // This will lead directly to the link, and use it as the label with a priority of 500.
-$item = new NavigationItem('https://example.com');
+new NavigationItem('https://example.com');
 
 // You can also set a custom label and priority to override the defaults.
-$item = new NavigationItem('https://example.com', 'External Link', 10);
+new NavigationItem('https://example.com', 'External Link', 10);
 ```
 
 While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,

From 894425bb71ff1d21b268da7059b0fb26e6856cbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:00:38 +0100
Subject: [PATCH 1471/2811] Style examples

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 941a0738808..087a0a970ae 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -188,7 +188,7 @@ new NavigationItem('index');
 new NavigationItem(Routes::get('index'));
 
 // Setting the label and/or priorities will override inferred data.
-new NavigationItem(Routes::get('index'), 'Custom Label', 10);
+new NavigationItem(Routes::get('index'), 'Custom Label', 25);
 ```
 
 Using a route key is more concise, but will not provide type safety as it will be treated as a link if the route does not exist,
@@ -205,7 +205,7 @@ If you do not set a label for links, the label will default to the URL, and if y
 new NavigationItem('https://example.com');
 
 // You can also set a custom label and priority to override the defaults.
-new NavigationItem('https://example.com', 'External Link', 10);
+new NavigationItem('https://example.com', 'External Link', 25);
 ```
 
 While it is discouraged to use external URLs for internal pages, as Hyde won't be able to resolve relative links or check active states,

From 57e660880041d98f627a9a59e79864682ae4ccf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:01:03 +0100
Subject: [PATCH 1472/2811] Format Markdown

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 087a0a970ae..c48a7bf968d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -70,7 +70,7 @@ $menu = MainNavigationMenu::get();
 $sidebar = DocumentationSidebar::get();
 ```
 
->info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.) 
+>info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.)
 
 ## Creating Custom Menus
 
@@ -141,7 +141,7 @@ The object-oriented nature of the API also makes this perfect for package develo
 
 Here are some general tips to keep in mind when working with the Navigation API:
 - You can use the `add` method to add single items or arrays of items. You can also pass an array of items directly to the menu constructor.
-- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances. 
+- The navigation menu items is stored in a Laravel Collection, and is type safe to support both `NavigationItem` and `NavigationGroup` instances.
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
 

From 49f5b1f96a742f265721960a786d7343ed87c147 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:02:01 +0100
Subject: [PATCH 1473/2811] Normalize Markdown

---
 docs/advanced-features/navigation-api.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index c48a7bf968d..ff0d504393a 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -7,6 +7,7 @@ navigation:
 
 >warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.
 
+
 ## Abstract
 
 This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
@@ -16,6 +17,7 @@ This article is intended for advanced users, as most users will not need to crea
 For this reason, the documentation is very code-driven due to the technical nature of the API.
 We'll also be mixing in some practical examples of Blade and PHP code to illustrate how you can use the API in your own projects.
 
+
 ## Overview
 
 The Navigation API consists of a set of classes within the `Hyde\Framework\Features\Navigation` namespace.
@@ -72,6 +74,7 @@ $sidebar = DocumentationSidebar::get();
 
 >info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.)
 
+
 ## Creating Custom Menus
 
 ### Introduction Overview
@@ -145,14 +148,17 @@ Here are some general tips to keep in mind when working with the Navigation API:
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
 
+
 ## Class Reference
 
 Below is a reference of the classes and methods available in the Navigation API.
 
+
 ## NavigationMenu
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
+
 ## NavigationItem
 
 The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
@@ -213,6 +219,7 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 36eba078d710ebbfd23ec85de9e0a94e18a6e564 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:31:14 +0100
Subject: [PATCH 1474/2811] Add quick references

---
 docs/advanced-features/navigation-api.md | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index ff0d504393a..af7be74fa05 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -163,6 +163,37 @@ The `NavigationMenu` class represents a navigation menu. It contains a collectio
 
 The `NavigationItem` class is an abstraction for a navigation menu item containing useful information like the destination, label, and priority.
 
+### Quick Reference
+
+Here is a quick reference of the methods available on the NavigationItem class:
+
+```php
+// Create a new NavigationItem instance.
+$item = NavigationItem::create($destination, $label, $priority): NavigationItem;
+
+// Get the link of the item.
+$item->getLink(): string;
+
+// Get the label of the item.
+$item->getLabel(): string;
+
+// Get the priority of the item.
+$item->getPriority(): int;
+
+// Check if the item is active. (Only works when the destination is a route)
+$item->isActive(): bool; 
+```
+
+### Blade Example
+
+Here is an example of how you can put it all together in a Blade template:
+
+```blade
+<a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
+    {{ $item->getLabel() }}
+</a>
+```
+
 ### Creating Navigation Items
 
 There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.

From a5b3e86ab2858a9e65d104b5151dd04f2b37b243 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:32:24 +0100
Subject: [PATCH 1475/2811] Add example context

---
 docs/advanced-features/navigation-api.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index af7be74fa05..db274feafbe 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -194,6 +194,8 @@ Here is an example of how you can put it all together in a Blade template:
 </a>
 ```
 
+This will output an anchor tag with the correct link and label, and if the item is active, it will add an `active` class to the tag.
+
 ### Creating Navigation Items
 
 There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.

From 7204ba9e67848db59abb8d1c36400326e280fba8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 26 Mar 2024 20:33:22 +0100
Subject: [PATCH 1476/2811] Format method documentation

---
 .../src/Framework/Features/Navigation/NavigationItem.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index befda4b80e9..43d2cf5312b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -56,7 +56,9 @@ public function __toString(): string
     }
 
     /**
-     * Resolve the destination link of the navigation item. This can then be used in the `href` attribute of an anchor tag.
+     * Resolve the destination link of the navigation item.
+     *
+     * This can then be used in the `href` attribute of an anchor tag.
      *
      * If the destination is a Route, it will be resolved using the Route's link.
      * Otherwise, it will be returned as is for external links using URLs.

From c9824a9844f8e97c2215402e80d7c388219a510b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:45:48 +0100
Subject: [PATCH 1477/2811] Add method documentation

---
 docs/advanced-features/navigation-api.md | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index db274feafbe..0e269e9ae07 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -252,6 +252,54 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
+### Method Reference
+
+#### Accessing the resolved links `getLink`
+
+The `getLink` method is designed to return a link that can be used in the `href` attribute of an anchor tag.
+
+If the destination is a route, the link will be resolved to the correct URL, using relative paths if possible. It will also respect the pretty URL setting.
+
+```php
+$item = new NavigationItem(Routes::get('index'));
+$item->getLink(); // Outputs 'index.html' 
+
+$item = new NavigationItem('https://example.com');
+$item->getLink(); // Outputs 'https://example.com'
+```
+
+**Tip:** The item instances automatically turns into the resolved link when cast to a string. Perfect for your Blade templates!
+
+```blade
+<a href="{{ $item }}">{{ $item->getLabel() }}</a>
+```
+
+#### Accessing the label `getLabel`
+
+The `getLabel` method returns the label of the item. This is the text that will be displayed in the navigation menu.
+
+```php
+$item = new NavigationItem('index', 'Home');
+$item->getLabel(); // Outputs 'Home'
+```
+
+#### Accessing the priority `getPriority`
+
+The `getPriority` method returns the priority of the item. This is a number that determines the order in which the items are displayed in the menu, where lower numbers come first.
+
+```php
+$item = new NavigationItem('index', 'Home', 25);
+$item->getPriority(); // Outputs 25
+```
+
+#### Checking if the item is active `isActive`
+
+The `isActive` method checks if the item is active (by comparing it to the Hyde page being compiled at the moment). This is useful for highlighting the current page in the navigation menu.
+
+```php
+$item = new NavigationItem('index');
+$item->isActive(); // Outputs true if the item is the current page, otherwise false.
+```
 
 ## NavigationGroup
 

From cbd584976473c0926162f6a334774ee3aa9980c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:46:47 +0100
Subject: [PATCH 1478/2811] Add commented Copilot idea

---
 docs/advanced-features/navigation-api.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 0e269e9ae07..f7a2079e4af 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -301,6 +301,27 @@ $item = new NavigationItem('index');
 $item->isActive(); // Outputs true if the item is the current page, otherwise false.
 ```
 
+<!--
+
+Generated by Copilot, kinda cool, maybe something to implement?
+
+### Advanced Usage
+
+#### Customizing the Active State
+
+By default, the `isActive` method will check if the item's destination matches the current page being compiled.
+
+However, you can also provide a custom callback to the method to determine if the item is active.
+
+```php
+$item = new NavigationItem('index');
+$item->isActive(fn($item) => $item->getLink() === 'index.html');
+```
+
+This is useful if you want to check for a specific query parameter, or if you want to check if the item is active based on a more complex condition.
+-->
+
+
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.

From 44cb27192b113a5de5a3aadfe9adca4b69d4d8d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 10:46:54 +0100
Subject: [PATCH 1479/2811] Formatting

---
 docs/advanced-features/navigation-api.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f7a2079e4af..48b4e4a6ae1 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -302,7 +302,6 @@ $item->isActive(); // Outputs true if the item is the current page, otherwise fa
 ```
 
 <!--
-
 Generated by Copilot, kinda cool, maybe something to implement?
 
 ### Advanced Usage

From 0191d4493837c6b2c9f379c3b08229551706d278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:08:37 +0100
Subject: [PATCH 1480/2811] Document alternate syntax

---
 docs/advanced-features/navigation-api.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 48b4e4a6ae1..68b6dac9615 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -170,6 +170,7 @@ Here is a quick reference of the methods available on the NavigationItem class:
 ```php
 // Create a new NavigationItem instance.
 $item = NavigationItem::create($destination, $label, $priority): NavigationItem;
+$item = new NavigationItem($destination, $label, $priority); // Same as above.
 
 // Get the link of the item.
 $item->getLink(): string;

From 7149976af24ff3c17d1f1aa3c7305ecf35548e77 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:12:51 +0100
Subject: [PATCH 1481/2811] Document import

---
 docs/advanced-features/navigation-api.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 68b6dac9615..0a6c12eae1d 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -168,6 +168,8 @@ The `NavigationItem` class is an abstraction for a navigation menu item containi
 Here is a quick reference of the methods available on the NavigationItem class:
 
 ```php
+use Hyde\Framework\Features\Navigation\NavigationItem;
+
 // Create a new NavigationItem instance.
 $item = NavigationItem::create($destination, $label, $priority): NavigationItem;
 $item = new NavigationItem($destination, $label, $priority); // Same as above.

From 892b89083f68a7174488d26b8e12ab3dfbaf376e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:12:57 +0100
Subject: [PATCH 1482/2811] Document setup

---
 docs/advanced-features/navigation-api.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 0a6c12eae1d..f93970d7186 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -192,6 +192,10 @@ $item->isActive(): bool;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
+@php
+    $item = new NavigationItem('index.html', 'Home');
+@endphp
+
 <a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
     {{ $item->getLabel() }}
 </a>

From 3948eb8a63d32fd6cc3c3ce374454143d929b4ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:17:31 +0100
Subject: [PATCH 1483/2811] Add initial menu documentation

---
 docs/advanced-features/navigation-api.md | 80 ++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index f93970d7186..a91eb14784c 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -158,6 +158,86 @@ Below is a reference of the classes and methods available in the Navigation API.
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
 
+### Quick Reference
+
+Here is a quick reference of the methods available on the NavigationMenu class:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+
+// Create a new NavigationMenu instance, optionally providing an array of items.
+$menu = new NavigationMenu($items = []);
+
+// Add a single item or an array of items to the menu.
+$menu->add(new NavigationItem()): $this;
+$menu->add([new NavigationItem()]): $this;
+
+// Get all items in the menu as a sorted Collection.
+$menu->getItems(): Collection;
+```
+
+### Blade Example
+
+Here is an example of how you can put it all together in a Blade template:
+
+```blade
+@php
+    $menu = new NavigationMenu([
+        new NavigationItem('index.html', 'Home'),
+        new NavigationItem('posts.html', 'Blog'),
+    ]);
+@endphp
+
+<ul>
+    @foreach ($menu->getItems() as $item)
+        <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
+    @endforeach
+</ul>
+```
+
+This will output an unordered list with the correct links and labels for each item in the menu.
+
+### Creating Navigation Menus
+
+You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+
+$menu = new NavigationMenu([
+    new NavigationItem('index.html', 'Home'),
+    new NavigationItem('posts.html', 'Blog'),
+    new NavigationGroup('About', [
+        new NavigationItem('about.html', 'About Us'),
+        new NavigationItem('team.html', 'Our Team'),
+    ]),
+]);
+```
+
+### Adding Items to the Menu
+
+You can also add items to the menu after it has been created by using the `add` method.
+
+The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
+
+```php
+$menu->add([
+    new NavigationItem('privacy.html', 'Privacy Policy'),
+    new NavigationItem('terms.html', 'Terms of Service'),
+])->add(new NavigationItem('contact.html', 'Contact Us'));
+```
+
+### Accessing Items in the Menu
+
+You can access all items in the menu by calling the `getItems` method, which will return a Collection of all items in the menu.
+
+```php
+$items = $menu->getItems();
+```
+
+The items will automatically be sorted by their priority, with lower numbers coming first, defaulting go the order they were added if no priority is set.
 
 ## NavigationItem
 

From a822c42e8d2b2f44a4c9dcee40df013a0bf39e97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:17:47 +0100
Subject: [PATCH 1484/2811] Revert "Document setup"

This reverts commit 892b89083f68a7174488d26b8e12ab3dfbaf376e.
---
 docs/advanced-features/navigation-api.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index a91eb14784c..84a8427a575 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -272,10 +272,6 @@ $item->isActive(): bool;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
-@php
-    $item = new NavigationItem('index.html', 'Home');
-@endphp
-
 <a href="{{ $item->getLink() }}" @class(['active' => $item->isActive()])>
     {{ $item->getLabel() }}
 </a>

From 13cb289869794a79788df06b2981aa3347cb8f30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:21:45 +0100
Subject: [PATCH 1485/2811] Clean up documentation

---
 docs/advanced-features/navigation-api.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 84a8427a575..4b194e5f624 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -169,11 +169,11 @@ use Hyde\Framework\Features\Navigation\NavigationMenu;
 $menu = new NavigationMenu($items = []);
 
 // Add a single item or an array of items to the menu.
-$menu->add(new NavigationItem()): $this;
-$menu->add([new NavigationItem()]): $this;
+$menu->add(new NavigationItem());
+$menu->add([new NavigationItem()]);
 
 // Get all items in the menu as a sorted Collection.
-$menu->getItems(): Collection;
+$menu->getItems(): Collection<NavigationItem|NavigationGroup>
 ```
 
 ### Blade Example
@@ -181,13 +181,6 @@ $menu->getItems(): Collection;
 Here is an example of how you can put it all together in a Blade template:
 
 ```blade
-@php
-    $menu = new NavigationMenu([
-        new NavigationItem('index.html', 'Home'),
-        new NavigationItem('posts.html', 'Blog'),
-    ]);
-@endphp
-
 <ul>
     @foreach ($menu->getItems() as $item)
         <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>

From 8a5ceb34908db31be9b1b704b43d0dc8dac6b4c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:21:50 +0100
Subject: [PATCH 1486/2811] Remove redundant example

---
 docs/advanced-features/navigation-api.md | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 4b194e5f624..713413617cf 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -176,20 +176,6 @@ $menu->add([new NavigationItem()]);
 $menu->getItems(): Collection<NavigationItem|NavigationGroup>
 ```
 
-### Blade Example
-
-Here is an example of how you can put it all together in a Blade template:
-
-```blade
-<ul>
-    @foreach ($menu->getItems() as $item)
-        <li><a href="{{ $item->getLink() }}">{{ $item->getLabel() }}</a></li>
-    @endforeach
-</ul>
-```
-
-This will output an unordered list with the correct links and labels for each item in the menu.
-
 ### Creating Navigation Menus
 
 You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.

From f46b2de2b992b648280f97bdd4641070693058ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:26:46 +0100
Subject: [PATCH 1487/2811] Split out examples

---
 docs/advanced-features/navigation-api.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 713413617cf..e2b824226c6 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -178,7 +178,15 @@ $menu->getItems(): Collection<NavigationItem|NavigationGroup>
 
 ### Creating Navigation Menus
 
-You can create a new NavigationMenu instance by calling the constructor and optionally providing an array or Collection of NavigationItem and/or NavigationGroup instances.
+You can create a new NavigationMenu instance by simply calling the constructor, optionally providing an array of items.
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+
+$menu = new NavigationMenu($items = []);
+```
+
+Here is how to provide an array or Collection of NavigationItem and/or NavigationGroup instances directly to the constructor.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -202,10 +210,12 @@ You can also add items to the menu after it has been created by using the `add`
 The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
 
 ```php
-$menu->add([
-    new NavigationItem('privacy.html', 'Privacy Policy'),
-    new NavigationItem('terms.html', 'Terms of Service'),
-])->add(new NavigationItem('contact.html', 'Contact Us'));
+$menu = (new NavigationMenu())
+    ->add(new NavigationItem('contact.html', 'Contact Us'))
+    ->add([
+        new NavigationItem('privacy.html', 'Privacy Policy'),
+        new NavigationItem('terms.html', 'Terms of Service'),
+    ]);
 ```
 
 ### Accessing Items in the Menu

From 619d7ee0c5bc77d9645cd278d2f9141851cc5990 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:47:22 +0100
Subject: [PATCH 1488/2811] Merge lines

---
 docs/advanced-features/navigation-api.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index e2b824226c6..81dbc8f1f33 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -205,9 +205,7 @@ $menu = new NavigationMenu([
 
 ### Adding Items to the Menu
 
-You can also add items to the menu after it has been created by using the `add` method.
-
-The `add` method can take a single item or an array of items, and will return the menu instance to allow for method chaining.
+You can also add items to the menu after it has been created by using the `add` method which can take a single item or an array of items, and can be fluently chained.
 
 ```php
 $menu = (new NavigationMenu())

From d696a1b40764fe363b3931a356a6cdf39a2f7197 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:50:35 +0100
Subject: [PATCH 1489/2811] Clean up heading levels

---
 docs/advanced-features/navigation-api.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 81dbc8f1f33..44b7c3bee24 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -322,9 +322,7 @@ they are excellent for any time you want an absolute link to an external site or
 
 Note that Hyde will not validate or modify the URL, so you are responsible for ensuring it's correct.
 
-### Method Reference
-
-#### Accessing the resolved links `getLink`
+### Accessing the resolved links
 
 The `getLink` method is designed to return a link that can be used in the `href` attribute of an anchor tag.
 
@@ -344,7 +342,7 @@ $item->getLink(); // Outputs 'https://example.com'
 <a href="{{ $item }}">{{ $item->getLabel() }}</a>
 ```
 
-#### Accessing the label `getLabel`
+### Accessing the label
 
 The `getLabel` method returns the label of the item. This is the text that will be displayed in the navigation menu.
 
@@ -353,7 +351,7 @@ $item = new NavigationItem('index', 'Home');
 $item->getLabel(); // Outputs 'Home'
 ```
 
-#### Accessing the priority `getPriority`
+### Accessing the priority
 
 The `getPriority` method returns the priority of the item. This is a number that determines the order in which the items are displayed in the menu, where lower numbers come first.
 
@@ -362,7 +360,7 @@ $item = new NavigationItem('index', 'Home', 25);
 $item->getPriority(); // Outputs 25
 ```
 
-#### Checking if the item is active `isActive`
+### Checking if the item is active
 
 The `isActive` method checks if the item is active (by comparing it to the Hyde page being compiled at the moment). This is useful for highlighting the current page in the navigation menu.
 

From 6021f7b1c61010a79fa51778a671d7983f0fbe81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:58:54 +0100
Subject: [PATCH 1490/2811] Fix typo

---
 docs/advanced-features/navigation-api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 44b7c3bee24..d7b24103a56 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -224,7 +224,7 @@ You can access all items in the menu by calling the `getItems` method, which wil
 $items = $menu->getItems();
 ```
 
-The items will automatically be sorted by their priority, with lower numbers coming first, defaulting go the order they were added if no priority is set.
+The items will automatically be sorted by their priority, with lower numbers coming first, defaulting to the order they were added if no priority is set.
 
 ## NavigationItem
 

From 83b1fbc008ab021493c40ef822248c522a2b0273 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 11:59:51 +0100
Subject: [PATCH 1491/2811] Format class names

---
 docs/advanced-features/navigation-api.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index d7b24103a56..b3aedd5f7f4 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -186,7 +186,7 @@ use Hyde\Framework\Features\Navigation\NavigationMenu;
 $menu = new NavigationMenu($items = []);
 ```
 
-Here is how to provide an array or Collection of NavigationItem and/or NavigationGroup instances directly to the constructor.
+Here is how to provide an array or Collection of `NavigationItem` and/or `NavigationGroup` instances directly to the constructor.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationMenu;
@@ -218,7 +218,7 @@ $menu = (new NavigationMenu())
 
 ### Accessing Items in the Menu
 
-You can access all items in the menu by calling the `getItems` method, which will return a Collection of all items in the menu.
+You can access all items in the menu by calling the `getItems` method, which will return a `Collection` of all items in the menu.
 
 ```php
 $items = $menu->getItems();
@@ -232,7 +232,7 @@ The `NavigationItem` class is an abstraction for a navigation menu item containi
 
 ### Quick Reference
 
-Here is a quick reference of the methods available on the NavigationItem class:
+Here is a quick reference of the methods available on the `NavigationItem` class:
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -268,7 +268,7 @@ This will output an anchor tag with the correct link and label, and if the item
 
 ### Creating Navigation Items
 
-There are two syntaxes for creating NavigationItem instances, you can use a standard constructor or the static create method.
+There are two syntaxes for creating `NavigationItem` instances, you can use a standard constructor or the static create method.
 Both options provide the exact same signature and functionality, so it's just a matter of preference which one you use.
 
 The constructors take three parameters: the destination, the label, and the optional priority.

From 7d616033fc14369a54427705ef61e0797cfd9581 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 17:21:39 +0100
Subject: [PATCH 1492/2811] Begin new section

---
 docs/advanced-features/navigation-api.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index b3aedd5f7f4..5f6360dd2cf 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -393,3 +393,20 @@ This is useful if you want to check for a specific query parameter, or if you wa
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
 This class is often used to create submenus or dropdowns in a navigation menu.
+
+### Quick Reference
+
+Here is a quick reference of the methods available on the `NavigationGroup` class:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+
+// Create a new NavigationGroup instance.
+$group = new NavigationGroup($label, $items = [], $priority = 500);
+
+// Add a single item or an array of items to the group.
+$group->add(new NavigationItem());
+
+// Get the label of the group.
+$group->getLabel(): string;
+```

From 41fb7cca9f8bf12fbeeeaff01753f1999d557313 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 18:50:11 +0100
Subject: [PATCH 1493/2811] Change internal group items to be collection

To normalize with the navigation menu types
---
 .../Framework/Features/Navigation/NavigationGroup.php  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index ca6e696da2b..a915eb28bf5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Support\Str;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
 use function min;
@@ -16,13 +17,14 @@
  */
 class NavigationGroup
 {
-    /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    protected array $items = [];
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    protected Collection $items;
     protected string $label;
     protected int $priority;
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
+        $this->items = new Collection();
         $this->label = $label;
         $this->priority = $priority;
 
@@ -57,7 +59,7 @@ public function getPriority(): int
     /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): array
     {
-        return $this->items;
+        return $this->items->all();
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
@@ -72,7 +74,7 @@ public function add(NavigationItem|array $items): static
 
     protected function addItem(NavigationItem $item): void
     {
-        $this->items[] = $item;
+        $this->items->push($item);
     }
 
     protected function containsOnlyDocumentationPages(): bool

From bfa64bfc13af66b5b672efee36683fe5683cbf30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 27 Mar 2024 19:38:32 +0100
Subject: [PATCH 1494/2811] Return the items as the collection

---
 .../Features/Navigation/NavigationGroup.php     |  6 +++---
 .../AutomaticNavigationConfigurationsTest.php   |  2 +-
 .../tests/Feature/NavigationAPITest.php         |  2 +-
 .../tests/Unit/NavigationGroupTest.php          | 17 +++++++++--------
 .../framework/tests/Unit/NavigationItemTest.php |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index a915eb28bf5..74eefde767a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -56,10 +56,10 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /** @return array<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    public function getItems(): array
+    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
+    public function getItems(): Collection
     {
-        return $this->items->all();
+        return $this->items;
     }
 
     /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 0f5404ee4ef..5ae702cfad8 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1318,7 +1318,7 @@ public function __construct(TestCase $test, $sidebar = false)
     public function state(): array
     {
         return $this->items->map(function (NavigationItem|NavigationGroup $item): TestNavigationItem {
-            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems() : []);
+            return new TestNavigationItem($item->getLabel(), $item->getPriority(), $item instanceof NavigationGroup ? $item->getItems()->all() : []);
         })->toArray();
     }
 
diff --git a/packages/framework/tests/Feature/NavigationAPITest.php b/packages/framework/tests/Feature/NavigationAPITest.php
index b51483e03f1..f396837b0e9 100644
--- a/packages/framework/tests/Feature/NavigationAPITest.php
+++ b/packages/framework/tests/Feature/NavigationAPITest.php
@@ -230,7 +230,7 @@ protected function toArray(NavigationMenu $menu): array
             if ($item instanceof NavigationGroup) {
                 return [
                     $item->getLabel() => [
-                        'items' => Arr::mapWithKeys($item->getItems(), function (NavigationItem $item): array {
+                        'items' => Arr::mapWithKeys($item->getItems()->all(), function (NavigationItem $item): array {
                             return [$item->getLabel() => $item->getLink()];
                         }),
                     ],
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 378a1d7fe52..ad2bf74aebf 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -45,8 +45,8 @@ public function testCanConstructWithChildren()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
+        $this->assertCount(2, $item->getItems()->all());
+        $this->assertSame($children, $item->getItems()->all());
     }
 
     public function testCanConstructWithChildrenWithoutRoute()
@@ -54,8 +54,8 @@ public function testCanConstructWithChildrenWithoutRoute()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertCount(2, $item->getItems());
-        $this->assertSame($children, $item->getItems());
+        $this->assertCount(2, $item->getItems()->all());
+        $this->assertSame($children, $item->getItems()->all());
     }
 
     public function testCreate()
@@ -71,12 +71,13 @@ public function testGetItems()
         $children = $this->createNavigationItems();
         $item = new NavigationGroup('Foo', $children);
 
-        $this->assertSame($children, $item->getItems());
+        $this->assertSame($children, $item->getItems()->all());
+        $this->assertEquals(collect($children), $item->getItems());
     }
 
     public function testGetItemsWithNoItems()
     {
-        $this->assertEmpty((new NavigationGroup('Foo'))->getItems());
+        $this->assertEmpty((new NavigationGroup('Foo'))->getItems()->all());
     }
 
     public function testCanAddItemToDropdown()
@@ -84,7 +85,7 @@ public function testCanAddItemToDropdown()
         $group = new NavigationGroup('Foo');
         $child = new NavigationItem(new Route(new MarkdownPage()), 'Bar');
 
-        $this->assertSame([$child], $group->add($child)->getItems());
+        $this->assertSame([$child], $group->add($child)->getItems()->all());
     }
 
     public function testAddChildMethodReturnsSelf()
@@ -100,7 +101,7 @@ public function testCanAddMultipleItemsToDropdown()
         $group = new NavigationGroup('Foo');
         $items = $this->createNavigationItems();
 
-        $this->assertSame($items, $group->add($items)->getItems());
+        $this->assertSame($items, $group->add($items)->getItems()->all());
     }
 
     public function testAddChildrenMethodReturnsSelf()
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 19f4f22f0c1..e0a669adf9a 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -279,7 +279,7 @@ public function testDropdownFacade()
         $item = NavigationGroup::create('foo');
 
         $this->assertSame('foo', $item->getLabel());
-        $this->assertSame([], $item->getItems());
+        $this->assertSame([], $item->getItems()->all());
         $this->assertSame(999, $item->getPriority());
     }
 
@@ -290,7 +290,7 @@ public function testDropdownFacadeWithChildren()
         ];
 
         $item = NavigationGroup::create('foo', $children);
-        $this->assertSame($children, $item->getItems());
+        $this->assertSame($children, $item->getItems()->all());
         $this->assertSame(999, $item->getPriority());
     }
 

From 8b2daf0531c2a0738f4a95bf8508e89783b7a704 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 10:54:39 +0100
Subject: [PATCH 1495/2811] Support nesting navigation groups

While the built-in views does not support it (and the generators won't use it), the group class itself now supports containing groups as it's children, allowing developers to utilise the system to create more complex navigation menus.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php | 6 +++---
 packages/framework/tests/Unit/NavigationGroupTest.php     | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 74eefde767a..2f811b17835 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -62,8 +62,8 @@ public function getItems(): Collection
         return $this->items;
     }
 
-    /** @param  \Hyde\Framework\Features\Navigation\NavigationItem|array<\Hyde\Framework\Features\Navigation\NavigationItem>  $items */
-    public function add(NavigationItem|array $items): static
+    /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
+    public function add(NavigationItem|NavigationGroup|array $items): static
     {
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
@@ -72,7 +72,7 @@ public function add(NavigationItem|array $items): static
         return $this;
     }
 
-    protected function addItem(NavigationItem $item): void
+    protected function addItem(NavigationItem|NavigationGroup $item): void
     {
         $this->items->push($item);
     }
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index ad2bf74aebf..3df154561c4 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -104,6 +104,14 @@ public function testCanAddMultipleItemsToDropdown()
         $this->assertSame($items, $group->add($items)->getItems()->all());
     }
 
+    public function testCanAddGroupsToDropdown()
+    {
+        $group = new NavigationGroup('Foo');
+        $child = new NavigationGroup('Bar');
+
+        $this->assertSame([$child], $group->add($child)->getItems()->all());
+    }
+
     public function testAddChildrenMethodReturnsSelf()
     {
         $group = new NavigationGroup('Foo');

From 62d6930ab3e87d43245efc735c3eba413e5c51c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 14:49:41 +0100
Subject: [PATCH 1496/2811] Sort grouped navigation items on retrieval

---
 .../Features/Navigation/NavigationGroup.php   |  2 +-
 .../tests/Unit/NavigationGroupTest.php        | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 2f811b17835..7f537768899 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -59,7 +59,7 @@ public function getPriority(): int
     /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     public function getItems(): Collection
     {
-        return $this->items;
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
     }
 
     /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
diff --git a/packages/framework/tests/Unit/NavigationGroupTest.php b/packages/framework/tests/Unit/NavigationGroupTest.php
index 3df154561c4..a9ad9646633 100644
--- a/packages/framework/tests/Unit/NavigationGroupTest.php
+++ b/packages/framework/tests/Unit/NavigationGroupTest.php
@@ -119,6 +119,28 @@ public function testAddChildrenMethodReturnsSelf()
         $this->assertSame($group, $group->add([]));
     }
 
+    public function testItemsOrderingDefaultsToAddOrder()
+    {
+        $group = new NavigationGroup('Group', [
+            new NavigationItem(new Route(new MarkdownPage()), 'Foo'),
+            new NavigationItem(new Route(new MarkdownPage()), 'Bar'),
+            new NavigationItem(new Route(new MarkdownPage()), 'Baz'),
+        ]);
+
+        $this->assertSame(['Foo', 'Bar', 'Baz'], $group->getItems()->map(fn (NavigationItem $item) => $item->getLabel())->all());
+    }
+
+    public function testItemsAreSortedByPriority()
+    {
+        $group = new NavigationGroup('Group', [
+            new NavigationItem(new Route(new MarkdownPage()), 'Foo', 3),
+            new NavigationItem(new Route(new MarkdownPage()), 'Bar', 2),
+            new NavigationItem(new Route(new MarkdownPage()), 'Baz', 1),
+        ]);
+
+        $this->assertSame(['Baz', 'Bar', 'Foo'], $group->getItems()->map(fn (NavigationItem $item) => $item->getLabel())->all());
+    }
+
     public function testGetPriorityUsesDefaultPriority()
     {
         $this->assertSame(999, (new NavigationGroup('Foo'))->getPriority());

From fa70254b5663330848a25f9ed535ce2558c054c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:03 +0100
Subject: [PATCH 1497/2811] Create HasNavigationItems.php

---
 .../Features/Navigation/HasNavigationItems.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
new file mode 100644
index 00000000000..20881ed54ef
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+trait HasNavigationItems
+{
+    //
+}

From 6b7cc4a8c5fb54e7b867269daddc948f744f32bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:19 +0100
Subject: [PATCH 1498/2811] Use HasNavigationItems

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 ++
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 7f537768899..5e36a061682 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -17,6 +17,8 @@
  */
 class NavigationGroup
 {
+    use HasNavigationItems;
+
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
     protected Collection $items;
     protected string $label;
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7329b6bfbe9..787fb765cdf 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,6 +20,8 @@
  */
 class NavigationMenu
 {
+    use HasNavigationItems;
+
     public const DEFAULT = 500;
     public const LAST = 999;
 

From e91503b701cc23bfe51e2c4ce9328a7a40d70ef0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:54:49 +0100
Subject: [PATCH 1499/2811] Document trait abstract

---
 .../Framework/Features/Navigation/HasNavigationItems.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 20881ed54ef..5b06e925196 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,6 +4,12 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * Contains shared logic for classes that have navigation items.
+ *
+ * @see \Hyde\Framework\Features\Navigation\NavigationMenu
+ * @see \Hyde\Framework\Features\Navigation\NavigationGroup
+ */
 trait HasNavigationItems
 {
     //

From bccde3de5116f316904cf9422246131339676bf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 17:56:23 +0100
Subject: [PATCH 1500/2811] Move shared logic to trait

---
 .../Navigation/HasNavigationItems.php         | 41 ++++++++++++++++++-
 .../Features/Navigation/NavigationGroup.php   | 24 -----------
 .../Features/Navigation/NavigationMenu.php    | 39 ------------------
 3 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 5b06e925196..74baffa70ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+
 /**
  * Contains shared logic for classes that have navigation items.
  *
@@ -12,5 +15,41 @@
  */
 trait HasNavigationItems
 {
-    //
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    protected Collection $items;
+
+    /**
+     * Get the navigation items in the menu.
+     *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     */
+    public function getItems(): Collection
+    {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
+    }
+
+    /**
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
+     */
+    public function add(NavigationItem|NavigationGroup|array $items): static
+    {
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
+
+    protected function addItem(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->push($item);
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 5e36a061682..4017e44d0c4 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
@@ -19,8 +18,6 @@ class NavigationGroup
 {
     use HasNavigationItems;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    protected Collection $items;
     protected string $label;
     protected int $priority;
 
@@ -58,27 +55,6 @@ public function getPriority(): int
         return $this->priority;
     }
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem> */
-    public function getItems(): Collection
-    {
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /** @param \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
-
     protected function containsOnlyDocumentationPages(): bool
     {
         return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 787fb765cdf..08f194a502a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -25,48 +24,10 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
-    protected Collection $items;
-
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
         $this->add(evaluate_arrayable($items));
     }
-
-    /**
-     * Get the navigation items in the menu.
-     *
-     * Items are automatically sorted by their priority, falling back to the order they were added.
-     *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
-     */
-    public function getItems(): Collection
-    {
-        // The reason we sort them here is that navigation items can be added from different sources,
-        // so any sorting we do in generator actions will only be partial. This way, we can ensure
-        // that the items are always freshly sorted by their priorities when they are retrieved.
-
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /**
-     * Add one or more navigation items to the navigation menu.
-     *
-     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
-     */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
 }

From dbc237962e94fa310bc558986bd11dcc744b8076 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:53:32 +0100
Subject: [PATCH 1501/2811] Revert "Use HasNavigationItems"

This reverts commit 6b7cc4a8c5fb54e7b867269daddc948f744f32bc.
---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 --
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 4017e44d0c4..29a9012db67 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -16,8 +16,6 @@
  */
 class NavigationGroup
 {
-    use HasNavigationItems;
-
     protected string $label;
     protected int $priority;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 08f194a502a..9b15d74c950 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -19,8 +19,6 @@
  */
 class NavigationMenu
 {
-    use HasNavigationItems;
-
     public const DEFAULT = 500;
     public const LAST = 999;
 

From cfe97849e5682e9bf06f536e250bfafc0c4b73a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:54:11 +0100
Subject: [PATCH 1502/2811] Merge trait back into menu class

This partially reverts commit bccde3de5116f316904cf9422246131339676bf4.
---
 .../Navigation/HasNavigationItems.php         | 41 +------------------
 .../Features/Navigation/NavigationMenu.php    | 39 ++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
index 74baffa70ab..5b06e925196 100644
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
@@ -4,9 +4,6 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-
 /**
  * Contains shared logic for classes that have navigation items.
  *
@@ -15,41 +12,5 @@
  */
 trait HasNavigationItems
 {
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
-    protected Collection $items;
-
-    /**
-     * Get the navigation items in the menu.
-     *
-     * Items are automatically sorted by their priority, falling back to the order they were added.
-     *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
-     */
-    public function getItems(): Collection
-    {
-        // The reason we sort them here is that navigation items can be added from different sources,
-        // so any sorting we do in generator actions will only be partial. This way, we can ensure
-        // that the items are always freshly sorted by their priorities when they are retrieved.
-
-        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
-    }
-
-    /**
-     * Add one or more navigation items to the navigation menu.
-     *
-     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
-     */
-    public function add(NavigationItem|NavigationGroup|array $items): static
-    {
-        foreach (Arr::wrap($items) as $item) {
-            $this->addItem($item);
-        }
-
-        return $this;
-    }
-
-    protected function addItem(NavigationItem|NavigationGroup $item): void
-    {
-        $this->items->push($item);
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 9b15d74c950..7329b6bfbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -22,10 +23,48 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    protected Collection $items;
+
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
         $this->add(evaluate_arrayable($items));
     }
+
+    /**
+     * Get the navigation items in the menu.
+     *
+     * Items are automatically sorted by their priority, falling back to the order they were added.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     */
+    public function getItems(): Collection
+    {
+        // The reason we sort them here is that navigation items can be added from different sources,
+        // so any sorting we do in generator actions will only be partial. This way, we can ensure
+        // that the items are always freshly sorted by their priorities when they are retrieved.
+
+        return $this->items->sortBy(fn (NavigationItem|NavigationGroup $item) => $item->getPriority())->values();
+    }
+
+    /**
+     * Add one or more navigation items to the navigation menu.
+     *
+     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
+     */
+    public function add(NavigationItem|NavigationGroup|array $items): static
+    {
+        foreach (Arr::wrap($items) as $item) {
+            $this->addItem($item);
+        }
+
+        return $this;
+    }
+
+    protected function addItem(NavigationItem|NavigationGroup $item): void
+    {
+        $this->items->push($item);
+    }
 }

From 841d1bfaae9366e1f77b2443733a25972f448f6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:54:58 +0100
Subject: [PATCH 1503/2811] Revert "Create HasNavigationItems.php"

This reverts commit fa70254b5663330848a25f9ed535ce2558c054c2.
---
 .../Features/Navigation/HasNavigationItems.php   | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php

diff --git a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php b/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
deleted file mode 100644
index 5b06e925196..00000000000
--- a/packages/framework/src/Framework/Features/Navigation/HasNavigationItems.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-/**
- * Contains shared logic for classes that have navigation items.
- *
- * @see \Hyde\Framework\Features\Navigation\NavigationMenu
- * @see \Hyde\Framework\Features\Navigation\NavigationGroup
- */
-trait HasNavigationItems
-{
-    //
-}

From b412f3429857900b02f3e558bb8ea2d12372726d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:55:38 +0100
Subject: [PATCH 1504/2811] Update navigation group to extend menu class

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 29a9012db67..b17ecdb0404 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -14,18 +14,17 @@
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
  */
-class NavigationGroup
+class NavigationGroup extends NavigationMenu
 {
     protected string $label;
     protected int $priority;
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
-        $this->items = new Collection();
         $this->label = $label;
         $this->priority = $priority;
 
-        $this->add($items);
+        parent::__construct($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static

From 8461e60d247b8ad28ba4003f12d6a81754cc422f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 28 Mar 2024 19:55:52 +0100
Subject: [PATCH 1505/2811] Move up parent constructor call

---
 .../src/Framework/Features/Navigation/NavigationGroup.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index b17ecdb0404..c32afc519ae 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -21,10 +21,10 @@ class NavigationGroup extends NavigationMenu
 
     public function __construct(string $label, array $items = [], int $priority = NavigationMenu::LAST)
     {
+        parent::__construct($items);
+
         $this->label = $label;
         $this->priority = $priority;
-
-        parent::__construct($items);
     }
 
     public static function create(string $label, array $items = [], int $priority = NavigationMenu::LAST): static

From cc803baaec4a1c1963aa2e132ce80b6de3580879 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 28 Mar 2024 18:56:03 +0000
Subject: [PATCH 1506/2811] Remove unused import

---
 .../src/Framework/Features/Navigation/NavigationGroup.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index c32afc519ae..aacbd30b952 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Illuminate\Support\Str;
-use Illuminate\Support\Collection;
 use Hyde\Pages\DocumentationPage;
 
 use function min;

From b1f5867d3de4ca59e3749d3bfb1367176799e8e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 15:32:51 +0100
Subject: [PATCH 1507/2811] Document the navigation group class

---
 docs/advanced-features/navigation-api.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 5f6360dd2cf..9dcc815ce78 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -392,7 +392,10 @@ This is useful if you want to check for a specific query parameter, or if you wa
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
-This class is often used to create submenus or dropdowns in a navigation menu.
+This class is often used to create submenus or dropdowns in a navigation menu. 
+
+The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality, 
+while also having shared methods with the `NavigationItem` class to render the groups in a Blade view.
 
 ### Quick Reference
 
@@ -406,7 +409,25 @@ $group = new NavigationGroup($label, $items = [], $priority = 500);
 
 // Add a single item or an array of items to the group.
 $group->add(new NavigationItem());
+$group->add([new NavigationItem()]);
+
+// Get all items in the group as a Collection sorted by priority.
+$group->getItems(): Collection<NavigationItem|NavigationGroup>
 
 // Get the label of the group.
 $group->getLabel(): string;
+
+// Get the priority of the group.
+$group->getPriority(): int;
+
+// Get the group key, which is a normalized kebab-case version of the label.
+$group->getGroupKey(): string;
 ```
+
+As the `NavigationGroup` class extends the `NavigationMenu` class, please see the `NavigationMenu` section for detailed information of the methods available.
+
+### Usage Scenarios
+
+HydePHP uses the `NavigationGroup` class to create dropdowns in the main navigation menu and the category groups in the documentation sidebar.
+
+In your own custom menus, you can use this class for the same types of functionality, and you can even nest groups within groups to create complex navigation structures.

From 604264203b5f369e88e8b96b3ed8669aac6d3aa2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 16:35:11 +0100
Subject: [PATCH 1508/2811] Unwrap collect calls for already collected items

---
 .../src/Framework/Features/Navigation/NavigationGroup.php    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index aacbd30b952..9c472b9366a 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\DocumentationPage;
 
 use function min;
-use function collect;
 
 /**
  * Abstraction for a grouped navigation menu item, like a dropdown or a sidebar group.
@@ -45,7 +44,7 @@ public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
             // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, collect($this->getItems())->min(fn (NavigationItem $item): int => $item->getPriority()));
+            return min($this->priority, $this->getItems()->min(fn (NavigationItem $item): int => $item->getPriority()));
         }
 
         return $this->priority;
@@ -53,7 +52,7 @@ public function getPriority(): int
 
     protected function containsOnlyDocumentationPages(): bool
     {
-        return count($this->getItems()) && collect($this->getItems())->every(function (NavigationItem $item): bool {
+        return count($this->getItems()) && $this->getItems()->every(function (NavigationItem $item): bool {
             return $item->getPage() instanceof DocumentationPage;
         });
     }

From 89c48900a9b3d2d5b68e715ded6d0783d339a8a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 29 Mar 2024 19:23:33 +0100
Subject: [PATCH 1509/2811] Fix formatting

---
 docs/advanced-features/navigation-api.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9dcc815ce78..9c5fcad14d2 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -392,9 +392,9 @@ This is useful if you want to check for a specific query parameter, or if you wa
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
-This class is often used to create submenus or dropdowns in a navigation menu. 
+This class is often used to create submenus or dropdowns in a navigation menu.
 
-The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality, 
+The `NavigationGroup` class extends the `NavigationMenu` class, and thus inherits the same base methods and functionality,
 while also having shared methods with the `NavigationItem` class to render the groups in a Blade view.
 
 ### Quick Reference

From 75de73070e65bc780db7f49d4a623c193efedcc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 16:34:33 +0200
Subject: [PATCH 1510/2811] Update navigation documentation for v2 rewrite

---
 docs/digging-deeper/navigation.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 65bac03a553..155b07b9cab 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -297,36 +297,33 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 ## Digging Deeper into the internals
 
-While not required to know, you may find it interesting to learn more about how the navigation is handled internally.
-The best way to learn about this is to look at the source code, so here is a high-level overview with details on where to look in the source code.
+While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,
+but you can find more detailed information in the [Navigation API](navigation-api) documentation.
 
-The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class.
-Both extend the same `BaseNavigationMenu` class:
+The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class. Both extend the same base `NavigationMenu` class.
 
 ```php
-// TODO: Update these examples
-
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\BaseNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
 ```
 
-Within the `BaseNavigationMenu` class, you will find the main logic for how the menus are generated,
+Within the base `NavigationMenu` class, you will find the main logic for how the menus are generated,
 while the child implementations contain the extra logic tailored for their specific use cases.
 
-All the navigation menus store the menu items in their `$items` array containing instances of the `NavigationItem` class.
+All the navigation menus store the menu items in their `$items` collection containing instances of the `NavigationItem` class.
 
 The `NavigationItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
-Dropdowns are represented by `DropdownNavigationItem` instances, which extend the `NavigationItem` class and contain an array of additional `NavigationItem` instances.
+Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain a collection of additional `NavigationItem` instances.
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\DropdownNavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 ```
 
 ## The Navigation API
 
-If you want to interact with the site navigation programmatically, or if you want to create complex custom, you can do so through the new Navigation API.
+If you want to interact with the site navigation programmatically, or if you want to create complex custom menus, you can do so through the new Navigation API.
 For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
 
 The Navigation API consists of a set of PHP classes, allowing you to fluently interact with the navigation menus. You can learn more about the API in the [Navigation API](navigation-api) documentation.

From 01291420df325c987ac9732d902b5df112e02833 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 17:12:18 +0200
Subject: [PATCH 1511/2811] Create documentation note

---
 docs/digging-deeper/navigation.md                            | 5 +++++
 .../Features/Navigation/NavigationMenuGenerator.php          | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 155b07b9cab..ff515caf30b 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -294,6 +294,11 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 >info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
 
+#### Dropdown menu notes
+
+Here are some things to keep in mind when using dropdown menus, regardless of the configuration:
+- Dropdowns take priority over standard items. So if you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
+  - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
 
 ## Digging Deeper into the internals
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index c0e11aa5a75..d1476b87ac3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -158,9 +158,6 @@ protected function getOrCreateGroupItem(string $groupName): NavigationGroup
             // so here we create a new instance to replace the base one, this
             // does mean we lose the destination as we can't link to them.
 
-            // Todo: Add note in documentation about this behavior
-            // Example file structure: _pages/foo.md, _pages/foo/bar.md, _pages/foo/baz.md, here the link to foo will be lost.
-
             $item = new NavigationGroup($group->getLabel(), [], $group->getPriority());
 
             $this->items->put($groupKey, $item);

From cc2756e9c4a2c1dbb38be8bdbd696dff335152e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 31 Mar 2024 16:00:57 +0200
Subject: [PATCH 1512/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 60 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3c8def52a9b..90bac911835 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,15 +11,14 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
-- Added a new `NavigationItem::getLink()` method contain the previous `NavigationItem::getDestination()` logic, to return the link URL.
 
 ### Changed
+- **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
+- Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
+- Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
+- Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
-- Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
-- Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
-- Breaking: The `NavigationItem` class now always stores the destination as a `Route` instance.
-- Breaking: The `NavigationItem::getDestination()` method now returns its `Route` instance.
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -45,6 +44,32 @@ Please see the "Breaking changes & upgrade guide" section below for more informa
 
 Please read through this section to ensure your site upgrades smoothly.
 
+## High impact
+
+### Navigation system rewrite
+
+The navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations, see more down below.
+
+For most users, the only impact will be that configuration files need to be updated to use the new configuration format. Due to the internal changes,
+it's also possible that menu items will be in a slightly different order than before, depending on your setup. Please verify that your site's menus
+look as expected after upgrading, and adjust the configuration files if necessary, before deploying to production.
+
+### Navigation and sidebar configuration changes
+
+The navigation and sidebar configuration files have been updated to use the new Navigation API.
+This means that you will need to update your configuration files to use the new format.
+
+The easiest way to upgrade is to publish updated configuration files (`hyde.php` and `docs.php`) and copy over your customizations.
+
+The following configuration entries have been updated:
+
+-  Changed configuration option `docs.sidebar_order` to `docs.sidebar.order` in https://github.com/hydephp/develop/pull/1583
+-  Upgrade path: Move the `sidebar_order` option's array in the `config/docs.php` file into the `sidebar` array in the same file.
+
+-  Changed configuration option `docs.table_of_contents` to `docs.sidebar.table_of_contents` in https://github.com/hydephp/develop/pull/1584
+-  Upgrade path: Move the `table_of_contents` option's array in the `config/docs.php` file into the `sidebar` array in the same file.
+
+
 ## General impact
 
 ### Documentation search page changes
@@ -53,20 +78,29 @@ The documentation search page and search index have been changed to be generated
 
 The main impact noticeable to most users by this is the implicit changes, like the pages showing up in the dashboard and route list command.
 
-In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do, 
+In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do,
 want to adapt your code to interact with the new `InMemoryPage`, which is generated in the `HydeCoreExtension` class.
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
 
 ## Low impact
 
-### Navigation item changes
+### Navigation internal changes
 
-The `NavigationItem::getDestination()` method now returns its `Route` instance. This allows for deferring the route evaluation.
+The navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations.
 
-If you have previously used this method directly and expected a string to be returned, you may need to adapt your code to handle the new return type.
+If you have previously in your custom code done any of the following, or similar, you will need to adapt your code to use the new Navigation API:
+- Created custom navigation menus or Blade components
+- Extended or called the navigation related classes directly
+- Customized the navigation system in any way beyond the standard configuration
 
-If you want to retain the previous state where a string is always returned, you can use the new `NavigationItem::getLink()` method instead, which will resolve the route immediately.
+
+#### Upgrade guide
+
+Due to the scope of the rewrite, the easiest and fastest way to upgrade your code is to recreate it using the new Navigation API.
+
+- For a full comparison of the changes, you may see the PR that introduced the new API: https://github.com/hydephp/develop/pull/1568/files
+- For information on how to use the new Navigation API, see the documentation: https://hydephp.com/docs/2.x/navigation-api
 
 ### HTML ID changes
 
@@ -85,14 +119,14 @@ If you have used any of the following selectors in custom code you wrote yoursel
 As the new documentation search implementation brings changes to their code API you may need to adapt your code
 according to the information below in case you wrote custom code that interacted with these parts of the codebase.
 
-- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
+- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class,
   you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,
   as the search pages are now added to the kernel page and route collection. (https://github.com/hydephp/develop/pull/1498)
 
 - If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
-  that page will no longer be built when using the specific `build:search` command. It will, of course, 
+  that page will no longer be built when using the specific `build:search` command. It will, of course,
   be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
- 
+
 - In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
   you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
   https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced

From 1985260adbd32683e7a8d9cc31f5d4bdd2368327 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 1 Apr 2024 15:13:44 +0200
Subject: [PATCH 1513/2811] Add features property to the kernel

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 8d5195b2de7..a2ff17497da 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -58,6 +58,7 @@ class HydeKernel implements SerializableContract
     protected string $outputDirectory = '_site';
     protected string $mediaDirectory = '_media';
 
+    protected Features $features;
     protected Filesystem $filesystem;
     protected Hyperlinks $hyperlinks;
 

From 374dfb15631315227a9b757a1c1655867ea683f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 1 Apr 2024 15:16:40 +0200
Subject: [PATCH 1514/2811] Construct features on kernel construct

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index a2ff17497da..4039ca5b9d3 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -74,6 +74,7 @@ class HydeKernel implements SerializableContract
     public function __construct(?string $basePath = null)
     {
         $this->setBasePath($basePath ?? getcwd());
+        $this->features = new Features;
         $this->filesystem = new Filesystem($this);
         $this->hyperlinks = new Hyperlinks($this);
 

From 30f30c6c0a265f44e7d6066645b087fcd7e29432 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 15:39:31 +0200
Subject: [PATCH 1515/2811] Update features accessor to return kernel instance

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 4039ca5b9d3..2bd92358664 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -88,7 +88,7 @@ public static function version(): string
 
     public function features(): Features
     {
-        return new Features;
+        return $this->features;
     }
 
     public function hasFeature(string $feature): bool

From 9bf80c63f5a076012681b9bf278c82a9ce465fae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 17:26:13 +0200
Subject: [PATCH 1516/2811] Test features class is bound as singleton

---
 packages/framework/tests/Feature/HydeKernelTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index d692b601273..3de43152541 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -542,6 +542,13 @@ public function testIsBootedMethodOnTheFacade()
         Hyde::kernel()->boot();
         $this->assertTrue(Hyde::isBooted());
     }
+
+    public function testFeaturesClassIsBoundAsSingleton()
+    {
+        $kernel = new HydeKernel();
+
+        $this->assertSame($kernel->features(), $kernel->features());
+    }
 }
 
 class CallableClass

From 937e4dbeab6da4dfe81ca77279f50e8d3e7ba820 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 17:32:13 +0200
Subject: [PATCH 1517/2811] Add array for the features that are enabled

---
 packages/framework/src/Facades/Features.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 0a201cf8b22..4b707178cc3 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -36,6 +36,13 @@ class Features implements SerializableContract
     use Serializable;
     use MockableFeatures;
 
+    /**
+     * The features that are enabled.
+     *
+     * @var array<string>
+     */
+    protected array $enabled = [];
+
     /**
      * Determine if the given specified is enabled.
      */

From 70392b9185cc8936c86ee0bde22107ea6ff4e178 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 17:46:12 +0200
Subject: [PATCH 1518/2811] Sketch out features construct to boot method

---
 packages/framework/src/Facades/Features.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 4b707178cc3..3aeb29370dc 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,6 +43,11 @@ class Features implements SerializableContract
      */
     protected array $enabled = [];
 
+    public function __construct()
+    {
+        $this->enabled = $this->boot();
+    }
+
     /**
      * Determine if the given specified is enabled.
      */
@@ -206,4 +211,9 @@ protected static function getDefaultOptions(): array
             static::torchlight(),
         ];
     }
+
+    protected function boot(): array
+    {
+        return []; // @todo Implement boot method
+    }
 }

From 9365d12ba64122877c731bfb2b49061242459424 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 17:54:56 +0200
Subject: [PATCH 1519/2811] Construct features on kernel boot

We need to do this later in the process, and not each time we create a kernel, as that is done way before the configuration is loaded. And a later construct adds less complexity than exposing a boot method on an initially empty features instance.
---
 .../framework/src/Foundation/Concerns/BootsHydeKernel.php    | 2 ++
 packages/framework/src/Foundation/HydeKernel.php             | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php b/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
index c680133cc9f..5ab718a1fd8 100644
--- a/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
+++ b/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Facades\Features;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -42,6 +43,7 @@ public function boot(): void
 
         $this->booting = true;
 
+        $this->features = new Features;
         $this->files = FileCollection::init($this);
         $this->pages = PageCollection::init($this);
         $this->routes = RouteCollection::init($this);
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 2bd92358664..5fb29d83770 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -74,7 +74,7 @@ class HydeKernel implements SerializableContract
     public function __construct(?string $basePath = null)
     {
         $this->setBasePath($basePath ?? getcwd());
-        $this->features = new Features;
+
         $this->filesystem = new Filesystem($this);
         $this->hyperlinks = new Hyperlinks($this);
 
@@ -88,6 +88,9 @@ public static function version(): string
 
     public function features(): Features
     {
+        /** @experimental May cause side effects */
+        $this->needsToBeBooted();
+
         return $this->features;
     }
 

From a5080cdc3b351d157b809015af2f33c316902a2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 17:58:14 +0200
Subject: [PATCH 1520/2811] Implement features boot method

---
 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 3aeb29370dc..94739d73a58 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -214,6 +214,6 @@ protected static function getDefaultOptions(): array
 
     protected function boot(): array
     {
-        return []; // @todo Implement boot method
+        return Config::getArray('hyde.features', static::getDefaultOptions());
     }
 }

From 1f661e900bbf4145b8296ef60cb3459ae9f89934 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 18:49:32 +0200
Subject: [PATCH 1521/2811] Use only user's explicitly added features in array

---
 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 94739d73a58..b9b8aa3637b 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -214,6 +214,6 @@ protected static function getDefaultOptions(): array
 
     protected function boot(): array
     {
-        return Config::getArray('hyde.features', static::getDefaultOptions());
+        return Config::getArray('hyde.features', []);
     }
 }

From 18395b1da6d7f629f480e835002aa75e06546ef0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 18:49:44 +0200
Subject: [PATCH 1522/2811] Revert "Use only user's explicitly added features
 in array"

This reverts commit 1f661e900bbf4145b8296ef60cb3459ae9f89934.
---
 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 b9b8aa3637b..94739d73a58 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -214,6 +214,6 @@ protected static function getDefaultOptions(): array
 
     protected function boot(): array
     {
-        return Config::getArray('hyde.features', []);
+        return Config::getArray('hyde.features', static::getDefaultOptions());
     }
 }

From e50e3b154af95ee72c671f5a379697b4af2fa113 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 21:40:49 +0200
Subject: [PATCH 1523/2811] Add enabled array getter

---
 packages/framework/src/Facades/Features.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 94739d73a58..39c77fb908f 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -48,6 +48,11 @@ public function __construct()
         $this->enabled = $this->boot();
     }
 
+    public function getEnabled(): array
+    {
+        return $this->enabled;
+    }
+
     /**
      * Determine if the given specified is enabled.
      */

From 2b3154311afde5097b1c7a16b14d710b9a0d152a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 2 Apr 2024 21:40:56 +0200
Subject: [PATCH 1524/2811] Mark new getter as experimental

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 39c77fb908f..39fd747ce6b 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -48,6 +48,7 @@ public function __construct()
         $this->enabled = $this->boot();
     }
 
+    /** @experimental This method may change before its release. */
     public function getEnabled(): array
     {
         return $this->enabled;

From 5e56db83f30bbfdf143751d2bada88410e296984 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 10:45:57 +0200
Subject: [PATCH 1525/2811] Test the features settings

---
 .../Feature/ConfigurableFeaturesTest.php      | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 897236a50da..d81d1b46c9a 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -124,4 +124,74 @@ public function testMultipleFeaturesCanBeMocked()
         $this->assertFalse(Features::rss());
         $this->assertFalse(Features::hasDarkmode());
     }
+
+    public function testGetEnabledUsesDefaultOptionsByDefault()
+    {
+        $features = new Features();
+
+        $default = $this->defaultOptions();
+
+        $this->assertSame($default, $features->getEnabled());
+    }
+
+    public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
+    {
+        config(['hyde' => []]);
+
+        $features = new Features();
+
+        $default = $this->defaultOptions();
+
+        $this->assertSame($default, $features->getEnabled());
+    }
+
+    public function testGetEnabledUsesConfiguredOptions()
+    {
+        $config = [
+            Features::htmlPages(),
+            Features::markdownPosts(),
+            Features::bladePages(),
+        ];
+
+        config(['hyde.features' => $config]);
+
+        $features = new Features();
+        $this->assertSame($config, $features->getEnabled());
+    }
+
+    public function testCannotUseArbitraryValuesInEnabledOptions()
+    {
+        $this->markTestSkipped('Todo: Implement if it is worth the complexity.');
+
+        $config = [
+            Features::htmlPages(),
+            Features::markdownPosts(),
+            Features::bladePages(),
+            'foo',
+        ];
+
+        config(['hyde.features' => $config]);
+
+        $features = new Features();
+        $this->assertSame(array_slice($config, 0, 3), $features->getEnabled());
+    }
+
+    protected function defaultOptions(): array
+    {
+        return [
+            // Page Modules
+            Features::htmlPages(),
+            Features::markdownPosts(),
+            Features::bladePages(),
+            Features::markdownPages(),
+            Features::documentationPages(),
+
+            // Frontend Features
+            Features::darkmode(),
+            Features::documentationSearch(),
+
+            // Integrations
+            Features::torchlight(),
+        ];
+    }
 }

From 419b23714a03918a81607602ca40fcfa25adc74a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:35:32 +0200
Subject: [PATCH 1526/2811] Expose boot method as public internal

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 39fd747ce6b..5889f0a2385 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -218,7 +218,8 @@ protected static function getDefaultOptions(): array
         ];
     }
 
-    protected function boot(): array
+    /** @internal Reboot the features from configuration. */
+    public function boot(): array
     {
         return Config::getArray('hyde.features', static::getDefaultOptions());
     }

From bfa9f49bad424ad5452464e99da0f5ae306c1998 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:36:41 +0200
Subject: [PATCH 1527/2811] Change boot method to write property from method

---
 packages/framework/src/Facades/Features.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 5889f0a2385..0cc421c3042 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -45,7 +45,7 @@ class Features implements SerializableContract
 
     public function __construct()
     {
-        $this->enabled = $this->boot();
+        $this->boot();
     }
 
     /** @experimental This method may change before its release. */
@@ -219,8 +219,8 @@ protected static function getDefaultOptions(): array
     }
 
     /** @internal Reboot the features from configuration. */
-    public function boot(): array
+    public function boot(): void
     {
-        return Config::getArray('hyde.features', static::getDefaultOptions());
+        $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
     }
 }

From 33ff559b9b9bdc86bc5cbce98f7e9049649d07e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:37:08 +0200
Subject: [PATCH 1528/2811] Reboot features after changing config

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index bd5168d390e..6114281437f 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,6 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
+        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -34,6 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
+        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -85,6 +87,8 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
+        Hyde::features()->boot();
+
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',

From b8632481524e977bcdba4ea1b7bd25165a3de26d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:37:41 +0200
Subject: [PATCH 1529/2811] Reboot entire kernel instead of just features

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 6114281437f..e8931f3f129 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
-        Hyde::features()->boot();
+        Hyde::boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -35,7 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
-        Hyde::features()->boot();
+        Hyde::boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -87,7 +87,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::features()->boot();
+        Hyde::boot();
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From d2731b2c721970920f816837a768e8382cb45cb9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:38:07 +0200
Subject: [PATCH 1530/2811] Revert "Expose boot method as public internal"

This reverts commit a72546c5426a3dec3b0b7c4c6f91968986e81665.
---
 packages/framework/src/Facades/Features.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 0cc421c3042..041131c7281 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -218,8 +218,7 @@ protected static function getDefaultOptions(): array
         ];
     }
 
-    /** @internal Reboot the features from configuration. */
-    public function boot(): void
+    protected function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
     }

From dd040663e057d524100121f2b7c16fad91df9385 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 3 Apr 2024 11:31:37 +0200
Subject: [PATCH 1531/2811] Resolve features from kernel container

---
 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 041131c7281..d9262e142f0 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -60,7 +60,7 @@ public function getEnabled(): array
     public static function enabled(string $feature): bool
     {
         return static::resolveMockedInstance($feature) ?? in_array(
-            $feature, Config::getArray('hyde.features', static::getDefaultOptions())
+            $feature, Hyde::features()->getEnabled()
         );
     }
 

From b33fa12bb04f3ca183c52c83ad18791dc46dc8fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 4 Apr 2024 15:33:54 +0200
Subject: [PATCH 1532/2811] Reboot the kernel

---
 packages/framework/tests/Feature/HydeExtensionFeatureTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
index 6ed83dd5793..b7cbfc6e0ba 100644
--- a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
+++ b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
@@ -104,6 +104,7 @@ public function testCustomRegisteredPagesAreDiscoveredByTheFileCollectionClass()
 
         $this->directory('foo');
         $this->file('foo/bar.txt');
+        $this->kernel->boot();
 
         $this->assertArrayHasKey('foo/bar.txt', Files::all());
         $this->assertEquals(new SourceFile('foo/bar.txt', TestPageClass::class), Files::get('foo/bar.txt'));

From dd29e412472f1117a36fe1b033bffe5f034c4b69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:02:07 +0200
Subject: [PATCH 1533/2811] Remove features autobooting causing side effects

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 5fb29d83770..913f5df6e0a 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -88,9 +88,6 @@ public static function version(): string
 
     public function features(): Features
     {
-        /** @experimental May cause side effects */
-        $this->needsToBeBooted();
-
         return $this->features;
     }
 

From 6e97d3bf82b193c75f0f00e12a85f329f3957ff8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:03:40 +0200
Subject: [PATCH 1534/2811] Instantiate features in kernel constructor

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 913f5df6e0a..7dbdd31349b 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -77,6 +77,7 @@ public function __construct(?string $basePath = null)
 
         $this->filesystem = new Filesystem($this);
         $this->hyperlinks = new Hyperlinks($this);
+        $this->features = new Features;
 
         $this->registerExtension(HydeCoreExtension::class);
     }

From c29aa76c60bea067ab81cc7ccf56df3f35674df8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:12:53 +0200
Subject: [PATCH 1535/2811] Automatically mock config in unit tests

A config instance is required to construct the kernel
---
 packages/testing/src/UnitTestCase.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index cb0b4a48a43..9e63ed3506c 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -36,6 +36,11 @@ public static function setUpBeforeClass(): void
 
     protected static function setupKernel(): void
     {
+        // If a config is not bound we bind it
+        if (! app()->bound('config')) {
+            self::mockConfig();
+        }
+
         HydeKernel::setInstance(new HydeKernel());
         self::$hasSetUpKernel = true;
     }

From 6e12eee5e03a69c953886fe5f52400f0b77f0226 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:13:45 +0200
Subject: [PATCH 1536/2811] Revert "Automatically mock config in unit tests"

This reverts commit c29aa76c60bea067ab81cc7ccf56df3f35674df8.
---
 packages/testing/src/UnitTestCase.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index 9e63ed3506c..cb0b4a48a43 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -36,11 +36,6 @@ public static function setUpBeforeClass(): void
 
     protected static function setupKernel(): void
     {
-        // If a config is not bound we bind it
-        if (! app()->bound('config')) {
-            self::mockConfig();
-        }
-
         HydeKernel::setInstance(new HydeKernel());
         self::$hasSetUpKernel = true;
     }

From 4c420a5a371ac621c34b3e3d61ae4a4fb101d4bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:14:53 +0200
Subject: [PATCH 1537/2811] Move deferred booting to features class

---
 packages/framework/src/Facades/Features.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index d9262e142f0..942c881549a 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,14 +43,13 @@ class Features implements SerializableContract
      */
     protected array $enabled = [];
 
-    public function __construct()
-    {
-        $this->boot();
-    }
-
     /** @experimental This method may change before its release. */
     public function getEnabled(): array
     {
+        if ($this->enabled === []) {
+            $this->boot();
+        }
+
         return $this->enabled;
     }
 

From d752361f6942e7d28030192a6c6dcd7c410d016b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:23:04 +0200
Subject: [PATCH 1538/2811] Create helper method to ensure features is booted
 when accessing it

---
 packages/framework/src/Facades/Features.php      | 14 +++++++++++---
 packages/framework/src/Foundation/HydeKernel.php |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 942c881549a..1d70fd248f0 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -46,9 +46,7 @@ class Features implements SerializableContract
     /** @experimental This method may change before its release. */
     public function getEnabled(): array
     {
-        if ($this->enabled === []) {
-            $this->boot();
-        }
+        $this->booted();
 
         return $this->enabled;
     }
@@ -221,4 +219,14 @@ protected function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
     }
+
+    /** @internal */
+    public function booted(): static
+    {
+        if ($this->enabled === []) {
+            $this->boot();
+        }
+
+        return $this;
+    }
 }
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 7dbdd31349b..ab50bce93fc 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -89,7 +89,7 @@ public static function version(): string
 
     public function features(): Features
     {
-        return $this->features;
+        return $this->features->booted();
     }
 
     public function hasFeature(string $feature): bool

From 92c1b56067fbd5cb15dbb813d02c59cb5c3774fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:26:07 +0200
Subject: [PATCH 1539/2811] Remove old todo

For some reason assert same does still not work but that's fine
---
 packages/framework/tests/Feature/HydeKernelTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 3de43152541..56b9c99e1b4 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -273,7 +273,6 @@ public function testPathToRelativeHelperReturnsRelativePathForGivenPath()
 
     public function testToArrayMethod()
     {
-        // AssertSame cannot be used as features is reinstantiated on each call
         $this->assertEquals([
             'basePath' => Hyde::getBasePath(),
             'sourceRoot' => Hyde::getSourceRoot(),

From 114c0a6b92123905ca0d7fe2975ddf4c605a572a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:28:38 +0200
Subject: [PATCH 1540/2811] Revert "Reboot entire kernel instead of just
 features"

This reverts commit b8632481524e977bcdba4ea1b7bd25165a3de26d.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index e8931f3f129..6114281437f 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
-        Hyde::boot();
+        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -35,7 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
-        Hyde::boot();
+        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -87,7 +87,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::boot();
+        Hyde::features()->boot();
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From 485edc27df8f0eb543f11ea7c593ecdf78e481da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:28:42 +0200
Subject: [PATCH 1541/2811] Revert "Reboot features after changing config"

This reverts commit 33ff559b9b9bdc86bc5cbce98f7e9049649d07e2.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 6114281437f..bd5168d390e 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,7 +27,6 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
-        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -35,7 +34,6 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
-        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -87,8 +85,6 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::features()->boot();
-
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',

From 2156da126f8f4bd196defc5b98330ebe50c62b5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:30:10 +0200
Subject: [PATCH 1542/2811] Revert "Revert "Reboot features after changing
 config""

This reverts commit 485edc27df8f0eb543f11ea7c593ecdf78e481da.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index bd5168d390e..6114281437f 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,6 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
+        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -34,6 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
+        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -85,6 +87,8 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
+        Hyde::features()->boot();
+
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',

From 7b0b346883c8060c2e2c48f7cb724e89081c9207 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:30:12 +0200
Subject: [PATCH 1543/2811] Revert "Revert "Reboot entire kernel instead of
 just features""

This reverts commit 114c0a6b92123905ca0d7fe2975ddf4c605a572a.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 6114281437f..e8931f3f129 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
-        Hyde::features()->boot();
+        Hyde::boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -35,7 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
-        Hyde::features()->boot();
+        Hyde::boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -87,7 +87,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::features()->boot();
+        Hyde::boot();
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From 8430d87297a53d71c86e142a1a488aa77103d80b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:30:51 +0200
Subject: [PATCH 1544/2811] Revert "Construct features on kernel boot"

This reverts commit 9365d12ba64122877c731bfb2b49061242459424.
---
 packages/framework/src/Foundation/Concerns/BootsHydeKernel.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php b/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
index 5ab718a1fd8..c680133cc9f 100644
--- a/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
+++ b/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation\Concerns;
 
-use Hyde\Facades\Features;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -43,7 +42,6 @@ public function boot(): void
 
         $this->booting = true;
 
-        $this->features = new Features;
         $this->files = FileCollection::init($this);
         $this->pages = PageCollection::init($this);
         $this->routes = RouteCollection::init($this);

From 1783cae9a0766113f10d2efc26ec6084768bf449 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:31:22 +0200
Subject: [PATCH 1545/2811] Revert "Remove old todo"

This reverts commit 92c1b56067fbd5cb15dbb813d02c59cb5c3774fd.
---
 packages/framework/tests/Feature/HydeKernelTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 56b9c99e1b4..3de43152541 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -273,6 +273,7 @@ public function testPathToRelativeHelperReturnsRelativePathForGivenPath()
 
     public function testToArrayMethod()
     {
+        // AssertSame cannot be used as features is reinstantiated on each call
         $this->assertEquals([
             'basePath' => Hyde::getBasePath(),
             'sourceRoot' => Hyde::getSourceRoot(),

From ccbd683167cb830d5d9e4ff60f61b275678482e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:31:37 +0200
Subject: [PATCH 1546/2811] Assert same can now be used

---
 packages/framework/tests/Feature/HydeKernelTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 3de43152541..95cfd7fa999 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -273,8 +273,7 @@ public function testPathToRelativeHelperReturnsRelativePathForGivenPath()
 
     public function testToArrayMethod()
     {
-        // AssertSame cannot be used as features is reinstantiated on each call
-        $this->assertEquals([
+        $this->assertSame([
             'basePath' => Hyde::getBasePath(),
             'sourceRoot' => Hyde::getSourceRoot(),
             'outputDirectory' => Hyde::getOutputDirectory(),

From 06151d955e44b9ef0205b602c1ebb58cf80dfe17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:34:29 +0200
Subject: [PATCH 1547/2811] Revert "Revert "Revert "Reboot entire kernel
 instead of just features"""

This reverts commit 7b0b346883c8060c2e2c48f7cb724e89081c9207.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index e8931f3f129..6114281437f 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     public function testHasDarkmode()
     {
         Config::set('hyde.features', []);
-        Hyde::boot();
+        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
 
@@ -35,7 +35,7 @@ public function testHasDarkmode()
             Features::darkmode(),
         ]);
 
-        Hyde::boot();
+        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
@@ -87,7 +87,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::boot();
+        Hyde::features()->boot();
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From 9c085be395933e589363de55c2460fbfc22efe8f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:34:46 +0200
Subject: [PATCH 1548/2811] Revert "Revert "Expose boot method as public
 internal""

This reverts commit d2731b2c721970920f816837a768e8382cb45cb9.
---
 packages/framework/src/Facades/Features.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 1d70fd248f0..9e7b7a58af8 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -215,7 +215,8 @@ protected static function getDefaultOptions(): array
         ];
     }
 
-    protected function boot(): void
+    /** @internal Reboot the features from configuration. */
+    public function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
     }

From 9bd4ce0488f97df0ef50485c41255acc79316353 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:35:55 +0200
Subject: [PATCH 1549/2811] Deprecate helper methods needing rename

---
 packages/framework/src/Facades/Features.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 9e7b7a58af8..e869817b3f5 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -162,7 +162,11 @@ public static function torchlight(): string
     // in the config file, require preconditions to be met.
     // ====================================================
 
-    /** Can a sitemap be generated? */
+    /**
+     * @deprecated Rename to `hasSitemap`?
+     *
+     * Can a sitemap be generated?
+     */
     public static function sitemap(): bool
     {
         return static::resolveMockedInstance('sitemap') ?? Hyde::hasSiteUrl()
@@ -170,7 +174,11 @@ public static function sitemap(): bool
             && extension_loaded('simplexml');
     }
 
-    /** Can an RSS feed be generated? */
+    /**
+     * @deprecated Rename to `hasRss`?
+     *
+     * Can an RSS feed be generated?
+     */
     public static function rss(): bool
     {
         return static::resolveMockedInstance('rss') ?? Hyde::hasSiteUrl()

From 88044983c45f0830f71404515b6bfb8a55803651 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 10:37:29 +0200
Subject: [PATCH 1550/2811] Handle booted state using boolean property

---
 packages/framework/src/Facades/Features.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index e869817b3f5..472a7e069ad 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,6 +43,8 @@ class Features implements SerializableContract
      */
     protected array $enabled = [];
 
+    protected bool $booted = false;
+
     /** @experimental This method may change before its release. */
     public function getEnabled(): array
     {
@@ -227,12 +229,14 @@ protected static function getDefaultOptions(): array
     public function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
+
+        $this->booted = true;
     }
 
     /** @internal */
     public function booted(): static
     {
-        if ($this->enabled === []) {
+        if (! $this->booted) {
             $this->boot();
         }
 

From c320c6d4333f0b8ba14bde13a4c7c580163a6349 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 16:40:11 +0200
Subject: [PATCH 1551/2811] Construct features on demand

---
 packages/framework/src/Facades/Features.php     | 17 +++++------------
 .../framework/src/Foundation/HydeKernel.php     |  3 +--
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 472a7e069ad..dcda87b4dd1 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -45,11 +45,14 @@ class Features implements SerializableContract
 
     protected bool $booted = false;
 
+    public function __construct()
+    {
+        $this->boot();
+    }
+
     /** @experimental This method may change before its release. */
     public function getEnabled(): array
     {
-        $this->booted();
-
         return $this->enabled;
     }
 
@@ -232,14 +235,4 @@ public function boot(): void
 
         $this->booted = true;
     }
-
-    /** @internal */
-    public function booted(): static
-    {
-        if (! $this->booted) {
-            $this->boot();
-        }
-
-        return $this;
-    }
 }
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index ab50bce93fc..264406561b5 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -77,7 +77,6 @@ public function __construct(?string $basePath = null)
 
         $this->filesystem = new Filesystem($this);
         $this->hyperlinks = new Hyperlinks($this);
-        $this->features = new Features;
 
         $this->registerExtension(HydeCoreExtension::class);
     }
@@ -89,7 +88,7 @@ public static function version(): string
 
     public function features(): Features
     {
-        return $this->features->booted();
+        return $this->features ??= new Features();
     }
 
     public function hasFeature(string $feature): bool

From fa46d40c58a7e06dabde8b0f17de6f82874bf4cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 16:47:04 +0200
Subject: [PATCH 1552/2811] Refactor test to solve the right problems

We don't need to boot features when the real problem is doing it in the wrong order
---
 .../tests/Feature/DarkmodeFeatureTest.php       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 6114281437f..0e8a72f95bf 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
  * @covers \Hyde\Facades\Features::darkmode
@@ -24,31 +24,32 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    public function testHasDarkmode()
+    public function testHasDarkmodeIsFalseWhenNotSet()
     {
         Config::set('hyde.features', []);
-        Hyde::features()->boot();
 
         $this->assertFalse(Features::hasDarkmode());
+    }
 
+    public function testHasDarkmodeIsTrueWhenSet()
+    {
         Config::set('hyde.features', [
             Features::darkmode(),
         ]);
 
-        Hyde::features()->boot();
         $this->assertTrue(Features::hasDarkmode());
     }
 
     public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     {
-        Hyde::boot();
-
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
             Features::darkmode(),
         ]);
 
+        app()->instance('navigation.main', new MainNavigationMenu());
+
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',
@@ -80,14 +81,12 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
 
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
-        Hyde::boot();
-
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
         ]);
 
-        Hyde::features()->boot();
+        app()->instance('navigation.main', new MainNavigationMenu());
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From 3ec67c60a3dac322ec54bb8b7f01dc7ba9e5cd17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 16:55:33 +0200
Subject: [PATCH 1553/2811] Revert "Revert "Revert "Expose boot method as
 public internal"""

This reverts commit 9c085be395933e589363de55c2460fbfc22efe8f.
---
 packages/framework/src/Facades/Features.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index dcda87b4dd1..c5f9fa03446 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -228,8 +228,7 @@ protected static function getDefaultOptions(): array
         ];
     }
 
-    /** @internal Reboot the features from configuration. */
-    public function boot(): void
+    protected function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
 

From 9a4ccde9aa09a62223e7fa75c2a4402a2a1e1dae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 16:57:05 +0200
Subject: [PATCH 1554/2811] Revert "Handle booted state using boolean property"

This reverts commit 88044983c45f0830f71404515b6bfb8a55803651.
---
 packages/framework/src/Facades/Features.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index c5f9fa03446..42e87e701ef 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,8 +43,6 @@ class Features implements SerializableContract
      */
     protected array $enabled = [];
 
-    protected bool $booted = false;
-
     public function __construct()
     {
         $this->boot();
@@ -231,7 +229,5 @@ protected static function getDefaultOptions(): array
     protected function boot(): void
     {
         $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
-
-        $this->booted = true;
     }
 }

From 3aeab66dddbe6020a10a410cc1a8e1458dde2db3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 16:58:37 +0200
Subject: [PATCH 1555/2811] Deprecate legacy methods in internal trait

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 02cee0f71aa..726c57a17a3 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -30,11 +30,13 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
         static::$mockedInstances[$feature] = $enabled;
     }
 
+    /** @deprecated Will not be needed after refactor */
     public static function resolveMockedInstance(string $feature): ?bool
     {
         return static::$mockedInstances[$feature] ?? null;
     }
 
+    /** @deprecated Will not be needed after refactor */
     public static function clearMockedInstances(): void
     {
         static::$mockedInstances = [];

From 999bdfc7f606b8a8b77125236e6927475b74230f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 17:02:29 +0200
Subject: [PATCH 1556/2811] Protect internal method only used from its own
 scope

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 726c57a17a3..c141d90ec2f 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -31,7 +31,7 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
     }
 
     /** @deprecated Will not be needed after refactor */
-    public static function resolveMockedInstance(string $feature): ?bool
+    protected static function resolveMockedInstance(string $feature): ?bool
     {
         return static::$mockedInstances[$feature] ?? null;
     }

From 79deaf4bf77eabd8a8de2e0042d606a444d431a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 17:45:14 +0200
Subject: [PATCH 1557/2811] Deprecate legacy internal array

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

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index c141d90ec2f..b933d7c684b 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -15,6 +15,7 @@
  */
 trait MockableFeatures
 {
+    /** @deprecated */
     protected static array $mockedInstances = [];
 
     public static function mock(string|array $feature, ?bool $enabled = null): void

From 64d823f7d62d40756439f27f222cd549de9148fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 18:10:18 +0200
Subject: [PATCH 1558/2811] New object oriented features class handling

---
 packages/framework/src/Facades/Features.php   | 37 ++++++++++---
 .../Concerns/Internal/MockableFeatures.php    | 10 +++-
 .../Feature/ConfigurableFeaturesTest.php      | 53 +++++++++----------
 3 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 42e87e701ef..6c30df3d91b 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -39,9 +39,9 @@ class Features implements SerializableContract
     /**
      * The features that are enabled.
      *
-     * @var array<string>
+     * @var array<string, bool>
      */
-    protected array $enabled = [];
+    protected array $features = [];
 
     public function __construct()
     {
@@ -49,9 +49,9 @@ public function __construct()
     }
 
     /** @experimental This method may change before its release. */
-    public function getEnabled(): array
+    public function getFeatures(): array
     {
-        return $this->enabled;
+        return $this->features;
     }
 
     /**
@@ -59,9 +59,7 @@ public function getEnabled(): array
      */
     public static function enabled(string $feature): bool
     {
-        return static::resolveMockedInstance($feature) ?? in_array(
-            $feature, Hyde::features()->getEnabled()
-        );
+        return Hyde::features()->getFeatures()[$feature] ?? false;
     }
 
     // ================================================
@@ -207,6 +205,7 @@ public function toArray(): array
             ])->toArray();
     }
 
+    /** @return array<string> */
     protected static function getDefaultOptions(): array
     {
         return [
@@ -228,6 +227,28 @@ protected static function getDefaultOptions(): array
 
     protected function boot(): void
     {
-        $this->enabled = Config::getArray('hyde.features', static::getDefaultOptions());
+        $options = static::getDefaultOptions();
+
+        $enabled = [];
+
+        // Set all default features to false
+        foreach ($options as $feature) {
+            $enabled[$feature] = false;
+        }
+
+        // Set all features to true if they are enabled in the config file
+        foreach ($this->getConfiguredFeatures() as $feature) {
+            if (in_array($feature, $options)) {
+                $enabled[$feature] = true;
+            }
+        }
+
+        $this->features = $enabled;
+    }
+
+    /** @return array<string> */
+    protected function getConfiguredFeatures(): array
+    {
+        return 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 b933d7c684b..25b8fb74955 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
+use Hyde\Hyde;
+
 use function is_array;
 
 /**
@@ -17,6 +19,7 @@ trait MockableFeatures
 {
     /** @deprecated */
     protected static array $mockedInstances = [];
+    protected array $mocks = [];
 
     public static function mock(string|array $feature, ?bool $enabled = null): void
     {
@@ -28,13 +31,18 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
             return;
         }
 
+        $instance = Hyde::features();
+        $instance->features[$feature] = $enabled;
+
         static::$mockedInstances[$feature] = $enabled;
     }
 
     /** @deprecated Will not be needed after refactor */
     protected static function resolveMockedInstance(string $feature): ?bool
     {
-        return static::$mockedInstances[$feature] ?? null;
+        $instance = Hyde::features();
+
+        return $instance->features[$feature] ?? null;
     }
 
     /** @deprecated Will not be needed after refactor */
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index d81d1b46c9a..d56a11150bf 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -16,10 +16,9 @@ class ConfigurableFeaturesTest extends TestCase
     public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
     {
         Config::set('hyde.features', []);
-        // Foreach method in Features class that begins with "has"
+
         foreach (get_class_methods(Features::class) as $method) {
             if (str_starts_with($method, 'has')) {
-                // Call method and assert false
                 $this->assertFalse(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
             }
         }
@@ -27,18 +26,11 @@ public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
 
     public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
     {
-        $features = [];
         foreach (get_class_methods(Features::class) as $method) {
-            if (! str_starts_with($method, 'has') && $method !== 'enabled') {
-                $features[] = '\Hyde\Framework\Helpers\Features::'.$method.'()';
+            if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight') {
+                $this->assertTrue(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
             }
         }
-
-        Config::set('hyde.features', $features);
-
-        foreach ($features as $feature) {
-            $this->assertTrue(Features::enabled($feature), 'Method '.$feature.' should return true when feature is enabled');
-        }
     }
 
     public function testCanGenerateSitemapHelperReturnsTrueIfHydeHasBaseUrl()
@@ -131,7 +123,7 @@ public function testGetEnabledUsesDefaultOptionsByDefault()
 
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, $features->getEnabled());
+        $this->assertSame($default, $features->getFeatures());
     }
 
     public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
@@ -142,7 +134,7 @@ public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
 
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, $features->getEnabled());
+        $this->assertSame($default, $features->getFeatures());
     }
 
     public function testGetEnabledUsesConfiguredOptions()
@@ -152,11 +144,21 @@ public function testGetEnabledUsesConfiguredOptions()
             Features::markdownPosts(),
             Features::bladePages(),
         ];
+        $expected = [
+            Features::htmlPages() => true,
+            Features::markdownPosts() => true,
+            Features::bladePages() => true,
+            'markdown-pages' => false,
+            'documentation-pages' => false,
+            'darkmode' => false,
+            'documentation-search' => false,
+            'torchlight' => false,
+        ];
 
         config(['hyde.features' => $config]);
 
         $features = new Features();
-        $this->assertSame($config, $features->getEnabled());
+        $this->assertSame($expected, $features->getFeatures());
     }
 
     public function testCannotUseArbitraryValuesInEnabledOptions()
@@ -173,25 +175,20 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
         config(['hyde.features' => $config]);
 
         $features = new Features();
-        $this->assertSame(array_slice($config, 0, 3), $features->getEnabled());
+        $this->assertSame(array_slice($config, 0, 3), $features->getFeatures());
     }
 
     protected function defaultOptions(): array
     {
         return [
-            // Page Modules
-            Features::htmlPages(),
-            Features::markdownPosts(),
-            Features::bladePages(),
-            Features::markdownPages(),
-            Features::documentationPages(),
-
-            // Frontend Features
-            Features::darkmode(),
-            Features::documentationSearch(),
-
-            // Integrations
-            Features::torchlight(),
+            'html-pages' => true,
+            'markdown-posts' => true,
+            'blade-pages' => true,
+            'markdown-pages' => true,
+            'documentation-pages' => true,
+            'darkmode' => true,
+            'documentation-search' => true,
+            'torchlight' => true,
         ];
     }
 }

From d8af38c0fecd8a275c756bb16878450e46270cff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:05:35 +0200
Subject: [PATCH 1559/2811] Reenable accidentally implemented test

---
 .../tests/Feature/ConfigurableFeaturesTest.php      | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index d56a11150bf..f46820024da 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -163,8 +163,6 @@ public function testGetEnabledUsesConfiguredOptions()
 
     public function testCannotUseArbitraryValuesInEnabledOptions()
     {
-        $this->markTestSkipped('Todo: Implement if it is worth the complexity.');
-
         $config = [
             Features::htmlPages(),
             Features::markdownPosts(),
@@ -175,7 +173,16 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
         config(['hyde.features' => $config]);
 
         $features = new Features();
-        $this->assertSame(array_slice($config, 0, 3), $features->getFeatures());
+        $this->assertSame([
+            'html-pages' => true,
+            'markdown-posts' => true,
+            'blade-pages' => true,
+            'markdown-pages' => false,
+            'documentation-pages' => false,
+            'darkmode' => false,
+            'documentation-search' => false,
+            'torchlight' => false,
+        ], $features->getFeatures());
     }
 
     protected function defaultOptions(): array

From 9b0f0199c6b206962f9cabef9dc52d67f564d9af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:40:41 +0200
Subject: [PATCH 1560/2811] Remove legacy static mock container

---
 .../Framework/Concerns/Internal/MockableFeatures.php   | 10 ----------
 packages/testing/src/TestCase.php                      |  3 ---
 2 files changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 25b8fb74955..09711254078 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -17,8 +17,6 @@
  */
 trait MockableFeatures
 {
-    /** @deprecated */
-    protected static array $mockedInstances = [];
     protected array $mocks = [];
 
     public static function mock(string|array $feature, ?bool $enabled = null): void
@@ -33,8 +31,6 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
 
         $instance = Hyde::features();
         $instance->features[$feature] = $enabled;
-
-        static::$mockedInstances[$feature] = $enabled;
     }
 
     /** @deprecated Will not be needed after refactor */
@@ -44,10 +40,4 @@ protected static function resolveMockedInstance(string $feature): ?bool
 
         return $instance->features[$feature] ?? null;
     }
-
-    /** @deprecated Will not be needed after refactor */
-    public static function clearMockedInstances(): void
-    {
-        static::$mockedInstances = [];
-    }
 }
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 9926306fb9d..aede20a5b2d 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -7,7 +7,6 @@
 use function config;
 use function file_get_contents;
 
-use Hyde\Facades\Features;
 use Hyde\Hyde;
 
 use function Hyde\normalize_newlines;
@@ -46,8 +45,6 @@ protected function tearDown(): void
             Component::forgetFactory();
         }
 
-        Features::clearMockedInstances();
-
         parent::tearDown();
     }
 

From 096ab032ef366c146b29e74f4c31c0957efdb0bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:41:53 +0200
Subject: [PATCH 1561/2811] Remove unused instance mock container

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php        | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 09711254078..c3d4ef24bcb 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -17,8 +17,6 @@
  */
 trait MockableFeatures
 {
-    protected array $mocks = [];
-
     public static function mock(string|array $feature, ?bool $enabled = null): void
     {
         if (is_array($feature)) {

From bd2ae0fb47c366bfeb9e81477e32a0147064a0c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:43:18 +0200
Subject: [PATCH 1562/2811] Inline local variables

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index c3d4ef24bcb..3a8abca6499 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -27,15 +27,12 @@ public static function mock(string|array $feature, ?bool $enabled = null): void
             return;
         }
 
-        $instance = Hyde::features();
-        $instance->features[$feature] = $enabled;
+        Hyde::features()->features[$feature] = $enabled;
     }
 
     /** @deprecated Will not be needed after refactor */
     protected static function resolveMockedInstance(string $feature): ?bool
     {
-        $instance = Hyde::features();
-
-        return $instance->features[$feature] ?? null;
+        return Hyde::features()->features[$feature] ?? null;
     }
 }

From f9c8181407ec1091659c43a33a50a7546721250d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:44:07 +0200
Subject: [PATCH 1563/2811] Annotate array generics

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

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 3a8abca6499..66502ef3995 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -17,6 +17,7 @@
  */
 trait MockableFeatures
 {
+    /** @param string|array<string, bool> $feature */
     public static function mock(string|array $feature, ?bool $enabled = null): void
     {
         if (is_array($feature)) {

From 4b77510843bd8bbff8a93b2fd22b12d147bdaa18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:44:29 +0200
Subject: [PATCH 1564/2811] Simplify mock helper types

---
 .../src/Framework/Concerns/Internal/MockableFeatures.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 66502ef3995..3dabb325ab9 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -18,7 +18,7 @@
 trait MockableFeatures
 {
     /** @param string|array<string, bool> $feature */
-    public static function mock(string|array $feature, ?bool $enabled = null): void
+    public static function mock(string|array $feature, bool $enabled = true): void
     {
         if (is_array($feature)) {
             foreach ($feature as $key => $value) {

From 148758a70f46389923e25b5bc3d89021462b6174 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 19:46:22 +0200
Subject: [PATCH 1565/2811] Replace recursive call with wrapped array loop

---
 .../Framework/Concerns/Internal/MockableFeatures.php   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index 3dabb325ab9..bbcb892cfe9 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -20,15 +20,11 @@ trait MockableFeatures
     /** @param string|array<string, bool> $feature */
     public static function mock(string|array $feature, bool $enabled = true): void
     {
-        if (is_array($feature)) {
-            foreach ($feature as $key => $value) {
-                static::mock($key, $value);
-            }
+        $features = is_array($feature) ? $feature : [$feature => $enabled];
 
-            return;
+        foreach ($features as $feature => $enabled) {
+            Hyde::features()->features[$feature] = $enabled;
         }
-
-        Hyde::features()->features[$feature] = $enabled;
     }
 
     /** @deprecated Will not be needed after refactor */

From 76a5fb01ccc2a0eaa8d70f08d3c14536bf6220d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 20:00:21 +0200
Subject: [PATCH 1566/2811] Simplify to array method to use features instance

---
 packages/framework/src/Facades/Features.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 6c30df3d91b..f43bf03e556 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -10,14 +10,9 @@
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 use Hyde\Framework\Concerns\Internal\MockableFeatures;
-use Illuminate\Support\Str;
 
-use function get_class_methods;
 use function extension_loaded;
-use function str_starts_with;
 use function in_array;
-use function collect;
-use function substr;
 use function count;
 use function app;
 
@@ -198,11 +193,7 @@ public static function rss(): bool
      */
     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}(),
-            ])->toArray();
+        return $this->features;
     }
 
     /** @return array<string> */

From e40e7ae06e42df1df4711a12a760119ff0d00443 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 20:00:53 +0200
Subject: [PATCH 1567/2811] Rename `Features::sitemap()` method to
 `Features::hasSitemap()`

---
 packages/framework/src/Facades/Features.php               | 4 +---
 .../src/Framework/Features/Metadata/GlobalMetadataBag.php | 2 +-
 .../framework/src/Framework/Services/BuildTaskService.php | 2 +-
 .../framework/tests/Feature/ConfigurableFeaturesTest.php  | 8 ++++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index f43bf03e556..fd29dbcd209 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -159,11 +159,9 @@ public static function torchlight(): string
     // ====================================================
 
     /**
-     * @deprecated Rename to `hasSitemap`?
-     *
      * Can a sitemap be generated?
      */
-    public static function sitemap(): bool
+    public static function hasSitemap(): bool
     {
         return static::resolveMockedInstance('sitemap') ?? Hyde::hasSiteUrl()
             && Config::getBool('hyde.generate_sitemap', true)
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index f96688c2445..7501be2b234 100644
--- a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -28,7 +28,7 @@ public static function make(): static
             $metadata->add($item);
         }
 
-        if (Features::sitemap()) {
+        if (Features::hasSitemap()) {
             $metadata->add(Meta::link('sitemap', Hyde::url('sitemap.xml'), [
                 'type' => 'application/xml', 'title' => 'Sitemap',
             ]));
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index 78176329d89..66526db0f06 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -156,7 +156,7 @@ private function canGenerateManifest(): bool
 
     private function canGenerateSitemap(): bool
     {
-        return Features::sitemap();
+        return Features::hasSitemap();
     }
 
     private function canGenerateFeed(): bool
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index f46820024da..664eb4dc7ba 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -18,7 +18,7 @@ public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
         Config::set('hyde.features', []);
 
         foreach (get_class_methods(Features::class) as $method) {
-            if (str_starts_with($method, 'has')) {
+            if (str_starts_with($method, 'has') && $method !== 'hasSitemap') {
                 $this->assertFalse(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
             }
         }
@@ -36,20 +36,20 @@ public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
     public function testCanGenerateSitemapHelperReturnsTrueIfHydeHasBaseUrl()
     {
         config(['hyde.url' => 'foo']);
-        $this->assertTrue(Features::sitemap());
+        $this->assertTrue(Features::hasSitemap());
     }
 
     public function testCanGenerateSitemapHelperReturnsFalseIfHydeDoesNotHaveBaseUrl()
     {
         config(['hyde.url' => '']);
-        $this->assertFalse(Features::sitemap());
+        $this->assertFalse(Features::hasSitemap());
     }
 
     public function testCanGenerateSitemapHelperReturnsFalseIfSitemapsAreDisabledInConfig()
     {
         config(['hyde.url' => 'foo']);
         config(['hyde.generate_sitemap' => false]);
-        $this->assertFalse(Features::sitemap());
+        $this->assertFalse(Features::hasSitemap());
     }
 
     public function testToArrayMethodReturnsMethodArray()

From ad47207839ea986a21220b49e864eb0ba38a4f5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Apr 2024 21:18:38 +0200
Subject: [PATCH 1568/2811] Rename `Features::rss()` method to
 `Features::hasRss()`

---
 packages/framework/src/Facades/Features.php            |  4 +---
 .../Framework/Features/Metadata/GlobalMetadataBag.php  |  2 +-
 .../src/Framework/Services/BuildTaskService.php        |  2 +-
 .../tests/Feature/ConfigurableFeaturesTest.php         | 10 +++++-----
 .../tests/Feature/Services/RssFeedServiceTest.php      |  6 +++---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index fd29dbcd209..8bc7c1994b1 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -169,11 +169,9 @@ public static function hasSitemap(): bool
     }
 
     /**
-     * @deprecated Rename to `hasRss`?
-     *
      * Can an RSS feed be generated?
      */
-    public static function rss(): bool
+    public static function hasRss(): bool
     {
         return static::resolveMockedInstance('rss') ?? Hyde::hasSiteUrl()
             && static::hasMarkdownPosts()
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index 7501be2b234..b0a2886fbb6 100644
--- a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -34,7 +34,7 @@ public static function make(): static
             ]));
         }
 
-        if (Features::rss()) {
+        if (Features::hasRss()) {
             $metadata->add(Meta::link('alternate', Hyde::url(RssFeedGenerator::getFilename()), [
                 'type' => 'application/rss+xml', 'title' => RssFeedGenerator::getDescription(),
             ]));
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index 66526db0f06..d71d646f7a0 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -161,6 +161,6 @@ private function canGenerateSitemap(): bool
 
     private function canGenerateFeed(): bool
     {
-        return Features::rss();
+        return Features::hasRss();
     }
 }
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 664eb4dc7ba..20980d5380d 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -27,7 +27,7 @@ public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
     public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
     {
         foreach (get_class_methods(Features::class) as $method) {
-            if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight') {
+            if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight' && $method !== 'hasRss') {
                 $this->assertTrue(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
             }
         }
@@ -92,10 +92,10 @@ public function testFeaturesCanBeMocked()
     public function testDynamicFeaturesCanBeMocked()
     {
         Features::mock('rss', true);
-        $this->assertTrue(Features::rss());
+        $this->assertTrue(Features::hasRss());
 
         Features::mock('rss', false);
-        $this->assertFalse(Features::rss());
+        $this->assertFalse(Features::hasRss());
     }
 
     public function testMultipleFeaturesCanBeMocked()
@@ -105,7 +105,7 @@ public function testMultipleFeaturesCanBeMocked()
             'darkmode' => true,
         ]);
 
-        $this->assertTrue(Features::rss());
+        $this->assertTrue(Features::hasRss());
         $this->assertTrue(Features::hasDarkmode());
 
         Features::mock([
@@ -113,7 +113,7 @@ public function testMultipleFeaturesCanBeMocked()
             'darkmode' => false,
         ]);
 
-        $this->assertFalse(Features::rss());
+        $this->assertFalse(Features::hasRss());
         $this->assertFalse(Features::hasDarkmode());
     }
 
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index 475fb7705d9..94f6bc0698e 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -136,20 +136,20 @@ public function testCanGenerateFeedHelperReturnsTrueIfHydeHasBaseUrl()
     {
         config(['hyde.url' => 'foo']);
         $this->file('_posts/foo.md');
-        $this->assertTrue(Features::rss());
+        $this->assertTrue(Features::hasRss());
     }
 
     public function testCanGenerateFeedHelperReturnsFalseIfHydeDoesNotHaveBaseUrl()
     {
         config(['hyde.url' => '']);
         $this->file('_posts/foo.md');
-        $this->assertFalse(Features::rss());
+        $this->assertFalse(Features::hasRss());
     }
 
     public function testCanGenerateFeedHelperReturnsFalseIfFeedsAreDisabledInConfig()
     {
         config(['hyde.url' => 'foo']);
         config(['hyde.rss.enabled' => false]);
-        $this->assertFalse(Features::rss());
+        $this->assertFalse(Features::hasRss());
     }
 }

From 5565deff43c1750c0d17d2ce2261eab864fa9638 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:22:18 +0200
Subject: [PATCH 1569/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 90bac911835..6c97a25f26c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -83,6 +83,17 @@ want to adapt your code to interact with the new `InMemoryPage`, which is genera
 
 For more information, see https://github.com/hydephp/develop/pull/1498.
 
+## Medium impact
+
+### Features class method renames
+
+The following methods in the `Features` class have been renamed to follow a more consistent naming convention:
+
+- `Features::sitemap()` has been renamed to `Features::hasSitemap()`
+- `Features::rss()` has been renamed to `Features::hasRss()`
+
+Note that this class was previously marked as internal in v1, but the change is logged here in case it was used in configuration files or custom code.
+
 ## Low impact
 
 ### Navigation internal changes

From 66c84cede52a88b2c50257863fc91b4269321a0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:24:08 +0200
Subject: [PATCH 1570/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6c97a25f26c..fca93a49971 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,6 +11,7 @@ This serves two purposes:
 
 ### Added
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.

From 954b7c54702f5ef9e94b2018e56c35a4a09fae3c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:25:55 +0200
Subject: [PATCH 1571/2811] Remove legacy internal mocking helpers

This means that dynamic features can no longer be mocked, but since we are actually not using this anywhere as far as I can tell we don't need the complexity for it.
---
 packages/framework/src/Facades/Features.php     |  4 ++--
 .../Concerns/Internal/MockableFeatures.php      |  6 ------
 .../tests/Feature/ConfigurableFeaturesTest.php  | 17 ++++-------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 8bc7c1994b1..09d26146330 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -163,7 +163,7 @@ public static function torchlight(): string
      */
     public static function hasSitemap(): bool
     {
-        return static::resolveMockedInstance('sitemap') ?? Hyde::hasSiteUrl()
+        return Hyde::hasSiteUrl()
             && Config::getBool('hyde.generate_sitemap', true)
             && extension_loaded('simplexml');
     }
@@ -173,7 +173,7 @@ public static function hasSitemap(): bool
      */
     public static function hasRss(): bool
     {
-        return static::resolveMockedInstance('rss') ?? Hyde::hasSiteUrl()
+        return Hyde::hasSiteUrl()
             && static::hasMarkdownPosts()
             && Config::getBool('hyde.rss.enabled', true)
             && extension_loaded('simplexml')
diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
index bbcb892cfe9..c41baa11878 100644
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
@@ -26,10 +26,4 @@ public static function mock(string|array $feature, bool $enabled = true): void
             Hyde::features()->features[$feature] = $enabled;
         }
     }
-
-    /** @deprecated Will not be needed after refactor */
-    protected static function resolveMockedInstance(string $feature): ?bool
-    {
-        return Hyde::features()->features[$feature] ?? null;
-    }
 }
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 20980d5380d..86ddc83028c 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -89,31 +89,22 @@ public function testFeaturesCanBeMocked()
         $this->assertFalse(Features::hasDarkmode());
     }
 
-    public function testDynamicFeaturesCanBeMocked()
-    {
-        Features::mock('rss', true);
-        $this->assertTrue(Features::hasRss());
-
-        Features::mock('rss', false);
-        $this->assertFalse(Features::hasRss());
-    }
-
     public function testMultipleFeaturesCanBeMocked()
     {
         Features::mock([
-            'rss' => true,
+            'blade-pages' => true,
             'darkmode' => true,
         ]);
 
-        $this->assertTrue(Features::hasRss());
+        $this->assertTrue(Features::hasBladePages());
         $this->assertTrue(Features::hasDarkmode());
 
         Features::mock([
-            'rss' => false,
+            'blade-pages' => false,
             'darkmode' => false,
         ]);
 
-        $this->assertFalse(Features::hasRss());
+        $this->assertFalse(Features::hasBladePages());
         $this->assertFalse(Features::hasDarkmode());
     }
 

From 863eebf89c388fe71abba670233ddbb1ba2180a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:46:27 +0200
Subject: [PATCH 1572/2811] Add todo

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 09d26146330..9191fbf6c2b 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -51,6 +51,8 @@ public function getFeatures(): array
 
     /**
      * Determine if the given specified is enabled.
+     *
+     * @todo Rename to has() and add new enabled method to get just the enabled options array, and another called options/status/similar to get all options with their status.
      */
     public static function enabled(string $feature): bool
     {

From f93c2071501aad6861b07b4b4020a0e65fe13152 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:47:11 +0200
Subject: [PATCH 1573/2811] Fix wrong assertion message

---
 packages/framework/tests/Feature/ConfigurableFeaturesTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 86ddc83028c..ef35fc06071 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -28,7 +28,7 @@ public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
     {
         foreach (get_class_methods(Features::class) as $method) {
             if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight' && $method !== 'hasRss') {
-                $this->assertTrue(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
+                $this->assertTrue(Features::$method(), 'Method '.$method.' should return true when feature is enabled');
             }
         }
     }

From 97ac539936bafdd229a691e3c98754f992c58638 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:48:12 +0200
Subject: [PATCH 1574/2811] Extract testing helpers

---
 .../tests/Feature/ConfigurableFeaturesTest.php     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index ef35fc06071..23b519cdddb 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -19,7 +19,7 @@ public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
 
         foreach (get_class_methods(Features::class) as $method) {
             if (str_starts_with($method, 'has') && $method !== 'hasSitemap') {
-                $this->assertFalse(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
+                $this->expectMethodReturnsFalse($method);
             }
         }
     }
@@ -28,7 +28,7 @@ public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
     {
         foreach (get_class_methods(Features::class) as $method) {
             if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight' && $method !== 'hasRss') {
-                $this->assertTrue(Features::$method(), 'Method '.$method.' should return true when feature is enabled');
+                $this->expectMethodReturnsTrue($method);
             }
         }
     }
@@ -189,4 +189,14 @@ protected function defaultOptions(): array
             'torchlight' => true,
         ];
     }
+
+    protected function expectMethodReturnsFalse(string $method): void
+    {
+        $this->assertFalse(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
+    }
+
+    protected function expectMethodReturnsTrue(string $method): void
+    {
+        $this->assertTrue(Features::$method(), 'Method '.$method.' should return true when feature is enabled');
+    }
 }

From c2679319df8da5e6929a5cb861f262616f8dc0b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:49:08 +0200
Subject: [PATCH 1575/2811] Convert concatenation to better formatted string
 interpolation

---
 packages/framework/tests/Feature/ConfigurableFeaturesTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 23b519cdddb..102173b3acc 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -192,11 +192,11 @@ protected function defaultOptions(): array
 
     protected function expectMethodReturnsFalse(string $method): void
     {
-        $this->assertFalse(Features::$method(), 'Method '.$method.' should return false when feature is not enabled');
+        $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
     }
 
     protected function expectMethodReturnsTrue(string $method): void
     {
-        $this->assertTrue(Features::$method(), 'Method '.$method.' should return true when feature is enabled');
+        $this->assertTrue(Features::$method(), "Method '$method' should return true when feature is enabled");
     }
 }

From 6f25606fbb315ce7142aac2b6b37acc5cab8470a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 12:59:14 +0200
Subject: [PATCH 1576/2811] Split out unintuitive loop to standalone tests

---
 .../Feature/ConfigurableFeaturesTest.php      | 88 ++++++++++++++++---
 1 file changed, 75 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 102173b3acc..f61156363b7 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -13,24 +13,84 @@
  */
 class ConfigurableFeaturesTest extends TestCase
 {
-    public function testHasFeatureReturnsFalseWhenFeatureIsNotEnabled()
+    public function testHasHtmlPagesReturnsFalseWhenFeatureIsNotEnabled()
     {
-        Config::set('hyde.features', []);
+        $this->expectMethodReturnsFalse('hasHtmlPages');
+    }
 
-        foreach (get_class_methods(Features::class) as $method) {
-            if (str_starts_with($method, 'has') && $method !== 'hasSitemap') {
-                $this->expectMethodReturnsFalse($method);
-            }
-        }
+    public function testHasBladePagesReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasBladePages');
     }
 
-    public function testHasFeatureReturnsTrueWhenFeatureIsEnabled()
+    public function testHasMarkdownPagesReturnsFalseWhenFeatureIsNotEnabled()
     {
-        foreach (get_class_methods(Features::class) as $method) {
-            if (str_starts_with($method, 'has') && $method !== 'hasDocumentationSearch' && $method !== 'hasTorchlight' && $method !== 'hasRss') {
-                $this->expectMethodReturnsTrue($method);
-            }
-        }
+        $this->expectMethodReturnsFalse('hasMarkdownPages');
+    }
+
+    public function testHasMarkdownPostsReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasMarkdownPosts');
+    }
+
+    public function testHasDocumentationPagesReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasDocumentationPages');
+    }
+
+    public function testHasDocumentationSearchReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasDocumentationSearch');
+    }
+
+    public function testHasDarkmodeReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasDarkmode');
+    }
+
+    public function testHasTorchlightReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasTorchlight');
+    }
+
+    public function testHasRssReturnsFalseWhenFeatureIsNotEnabled()
+    {
+        $this->expectMethodReturnsFalse('hasRss');
+    }
+
+    public function testHasHtmlPagesReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasHtmlPages');
+    }
+
+    public function testHasBladePagesReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasBladePages');
+    }
+
+    public function testHasMarkdownPagesReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasMarkdownPages');
+    }
+
+    public function testHasMarkdownPostsReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasMarkdownPosts');
+    }
+
+    public function testHasDocumentationPagesReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasDocumentationPages');
+    }
+
+    public function testHasDarkmodeReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasDarkmode');
+    }
+
+    public function testHasSitemapReturnsTrueWhenFeatureIsEnabled()
+    {
+        $this->expectMethodReturnsTrue('hasSitemap');
     }
 
     public function testCanGenerateSitemapHelperReturnsTrueIfHydeHasBaseUrl()
@@ -192,6 +252,8 @@ protected function defaultOptions(): array
 
     protected function expectMethodReturnsFalse(string $method): void
     {
+        Config::set('hyde.features', []);
+
         $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
     }
 

From 56850ce660be77707525a4ebd689ad5b28c18c7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 13:15:05 +0200
Subject: [PATCH 1577/2811] Rename `Features::enabled()` method to
 `Features::has()`

---
 RELEASE_NOTES.md                              |  1 +
 packages/framework/src/Facades/Features.php   | 21 +++++++++----------
 .../framework/src/Foundation/HydeKernel.php   |  2 +-
 .../Framework/Services/ValidationService.php  |  2 +-
 .../tests/Feature/HydeKernelTest.php          |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index fca93a49971..9291bf16b26 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -90,6 +90,7 @@ For more information, see https://github.com/hydephp/develop/pull/1498.
 
 The following methods in the `Features` class have been renamed to follow a more consistent naming convention:
 
+- `Features::enabled()` has been renamed to `Features::has()`
 - `Features::sitemap()` has been renamed to `Features::hasSitemap()`
 - `Features::rss()` has been renamed to `Features::hasRss()`
 
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 9191fbf6c2b..b1ba9f4d705 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -22,6 +22,7 @@
  * @internal Until this class is split into a service/manager class, it should not be used outside of Hyde as the API is subject to change.
  *
  * @todo Split facade logic to service/manager class. (Initial and mock data could be set with boot/set methods)
+ * @todo Add new enabled method to get just the enabled options array, and another called options/status/similar to get all options with their status.
  * Based entirely on Laravel Jetstream (License MIT)
  *
  * @see https://jetstream.laravel.com/
@@ -51,10 +52,8 @@ public function getFeatures(): array
 
     /**
      * Determine if the given specified is enabled.
-     *
-     * @todo Rename to has() and add new enabled method to get just the enabled options array, and another called options/status/similar to get all options with their status.
      */
-    public static function enabled(string $feature): bool
+    public static function has(string $feature): bool
     {
         return Hyde::features()->getFeatures()[$feature] ?? false;
     }
@@ -65,39 +64,39 @@ public static function enabled(string $feature): bool
 
     public static function hasHtmlPages(): bool
     {
-        return static::enabled(static::htmlPages());
+        return static::has(static::htmlPages());
     }
 
     public static function hasBladePages(): bool
     {
-        return static::enabled(static::bladePages());
+        return static::has(static::bladePages());
     }
 
     public static function hasMarkdownPages(): bool
     {
-        return static::enabled(static::markdownPages());
+        return static::has(static::markdownPages());
     }
 
     public static function hasMarkdownPosts(): bool
     {
-        return static::enabled(static::markdownPosts());
+        return static::has(static::markdownPosts());
     }
 
     public static function hasDocumentationPages(): bool
     {
-        return static::enabled(static::documentationPages());
+        return static::has(static::documentationPages());
     }
 
     public static function hasDocumentationSearch(): bool
     {
-        return static::enabled(static::documentationSearch())
+        return static::has(static::documentationSearch())
             && static::hasDocumentationPages()
             && count(DocumentationPage::files()) > 0;
     }
 
     public static function hasDarkmode(): bool
     {
-        return static::enabled(static::darkmode());
+        return static::has(static::darkmode());
     }
 
     /**
@@ -106,7 +105,7 @@ public static function hasDarkmode(): bool
      */
     public static function hasTorchlight(): bool
     {
-        return static::enabled(static::torchlight())
+        return static::has(static::torchlight())
             && (Config::getNullableString('torchlight.token') !== null)
             && (app('env') !== 'testing');
     }
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 264406561b5..a3494286e10 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -93,7 +93,7 @@ public function features(): Features
 
     public function hasFeature(string $feature): bool
     {
-        return Features::enabled($feature);
+        return Features::has($feature);
     }
 
     /** @inheritDoc */
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index da7c0fa7db0..fc62734ce59 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -121,7 +121,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::has(Features::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/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 95cfd7fa999..b7beb1b07be 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -76,7 +76,7 @@ public function testFeaturesHelperReturnsNewFeaturesInstance()
 
     public function testHasFeatureHelperCallsMethodOnFeaturesClass()
     {
-        $this->assertSame(Features::enabled('foo'), Hyde::hasFeature('foo'));
+        $this->assertSame(Features::has('foo'), Hyde::hasFeature('foo'));
     }
 
     public function testCurrentPageHelperReturnsCurrentPageName()

From c2148f306f3e18fce9d964f433f60843c9963452 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:01:50 +0200
Subject: [PATCH 1578/2811] Add new enabled method

---
 packages/framework/src/Facades/Features.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index b1ba9f4d705..b4b9f5449b4 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -11,6 +11,8 @@
 use Hyde\Support\Contracts\SerializableContract;
 use Hyde\Framework\Concerns\Internal\MockableFeatures;
 
+use function array_keys;
+use function array_filter;
 use function extension_loaded;
 use function in_array;
 use function count;
@@ -58,6 +60,11 @@ public static function has(string $feature): bool
         return Hyde::features()->getFeatures()[$feature] ?? false;
     }
 
+    public static function enabled(): array
+    {
+        return array_keys(array_filter(Hyde::features()->getFeatures()));
+    }
+
     // ================================================
     // Determine if a given feature is enabled.
     // ================================================

From ced81d02cff6a54fc89ea8e903df1402b28b8649 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:02:07 +0200
Subject: [PATCH 1579/2811] Check enabled state using new helper

---
 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 b4b9f5449b4..623cacdec8b 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -57,7 +57,7 @@ public function getFeatures(): array
      */
     public static function has(string $feature): bool
     {
-        return Hyde::features()->getFeatures()[$feature] ?? false;
+        return in_array($feature, static::enabled());
     }
 
     public static function enabled(): array

From f83878daf8bcfc424491916afba75dd4fe19a0ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:02:17 +0200
Subject: [PATCH 1580/2811] Assert using simpler helper

---
 .../tests/Feature/ConfigurableFeaturesTest.php      | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index f61156363b7..417268b9f8a 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -225,15 +225,10 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
 
         $features = new Features();
         $this->assertSame([
-            'html-pages' => true,
-            'markdown-posts' => true,
-            'blade-pages' => true,
-            'markdown-pages' => false,
-            'documentation-pages' => false,
-            'darkmode' => false,
-            'documentation-search' => false,
-            'torchlight' => false,
-        ], $features->getFeatures());
+            'html-pages',
+            'markdown-posts',
+            'blade-pages',
+        ], $features->enabled());
     }
 
     protected function defaultOptions(): array

From d3ccec34c397ff23d98e89624a4a1de90188360c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:15:49 +0200
Subject: [PATCH 1581/2811] Annotate method description and generics

---
 packages/framework/src/Facades/Features.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 623cacdec8b..222817aeecd 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -60,6 +60,11 @@ public static function has(string $feature): bool
         return in_array($feature, static::enabled());
     }
 
+    /**
+     * Get all enabled features.
+     *
+     * @return array<string>
+     */
     public static function enabled(): array
     {
         return array_keys(array_filter(Hyde::features()->getFeatures()));

From 3589da1c39da00977e26efcf101aff596358bb73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:17:26 +0200
Subject: [PATCH 1582/2811] Move up method in class

---
 packages/framework/src/Facades/Features.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 222817aeecd..761d9bf132d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -99,6 +99,11 @@ public static function hasDocumentationPages(): bool
         return static::has(static::documentationPages());
     }
 
+    public static function hasDarkmode(): bool
+    {
+        return static::has(static::darkmode());
+    }
+
     public static function hasDocumentationSearch(): bool
     {
         return static::has(static::documentationSearch())
@@ -106,11 +111,6 @@ public static function hasDocumentationSearch(): bool
             && count(DocumentationPage::files()) > 0;
     }
 
-    public static function hasDarkmode(): bool
-    {
-        return static::has(static::darkmode());
-    }
-
     /**
      * Torchlight is by default enabled automatically when an API token
      * is set in the .env file but is disabled when running tests.

From 6d4097c5e3f4429b8212a09b51fd107f9136623b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:19:21 +0200
Subject: [PATCH 1583/2811] Move down methods in class

---
 packages/framework/src/Facades/Features.php | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 761d9bf132d..6fcfe3e8f90 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -104,24 +104,6 @@ public static function hasDarkmode(): bool
         return static::has(static::darkmode());
     }
 
-    public static function hasDocumentationSearch(): bool
-    {
-        return static::has(static::documentationSearch())
-            && static::hasDocumentationPages()
-            && count(DocumentationPage::files()) > 0;
-    }
-
-    /**
-     * Torchlight is by default enabled automatically when an API token
-     * is set in the .env file but is disabled when running tests.
-     */
-    public static function hasTorchlight(): bool
-    {
-        return static::has(static::torchlight())
-            && (Config::getNullableString('torchlight.token') !== null)
-            && (app('env') !== 'testing');
-    }
-
     // =================================================
     // Configure features to be used in the config file.
     // =================================================
@@ -193,6 +175,24 @@ public static function hasRss(): bool
             && count(MarkdownPost::files()) > 0;
     }
 
+    /**
+     * Torchlight is by default enabled automatically when an API token
+     * is set in the .env file but is disabled when running tests.
+     */
+    public static function hasTorchlight(): bool
+    {
+        return static::has(static::torchlight())
+            && (Config::getNullableString('torchlight.token') !== null)
+            && (app('env') !== 'testing');
+    }
+
+    public static function hasDocumentationSearch(): bool
+    {
+        return static::has(static::documentationSearch())
+            && static::hasDocumentationPages()
+            && count(DocumentationPage::files()) > 0;
+    }
+
     /**
      * Get an array representation of the features and their status.
      *

From 35dc20fe9989eaa1f743ab3cabef58bf9e44356c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:21:27 +0200
Subject: [PATCH 1584/2811] Move up method blocks in class

---
 packages/framework/src/Facades/Features.php | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 6fcfe3e8f90..305a0b16faa 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -70,40 +70,6 @@ public static function enabled(): array
         return array_keys(array_filter(Hyde::features()->getFeatures()));
     }
 
-    // ================================================
-    // Determine if a given feature is enabled.
-    // ================================================
-
-    public static function hasHtmlPages(): bool
-    {
-        return static::has(static::htmlPages());
-    }
-
-    public static function hasBladePages(): bool
-    {
-        return static::has(static::bladePages());
-    }
-
-    public static function hasMarkdownPages(): bool
-    {
-        return static::has(static::markdownPages());
-    }
-
-    public static function hasMarkdownPosts(): bool
-    {
-        return static::has(static::markdownPosts());
-    }
-
-    public static function hasDocumentationPages(): bool
-    {
-        return static::has(static::documentationPages());
-    }
-
-    public static function hasDarkmode(): bool
-    {
-        return static::has(static::darkmode());
-    }
-
     // =================================================
     // Configure features to be used in the config file.
     // =================================================
@@ -148,6 +114,40 @@ public static function torchlight(): string
         return 'torchlight';
     }
 
+    // ================================================
+    // Determine if a given feature is enabled.
+    // ================================================
+
+    public static function hasHtmlPages(): bool
+    {
+        return static::has(static::htmlPages());
+    }
+
+    public static function hasBladePages(): bool
+    {
+        return static::has(static::bladePages());
+    }
+
+    public static function hasMarkdownPages(): bool
+    {
+        return static::has(static::markdownPages());
+    }
+
+    public static function hasMarkdownPosts(): bool
+    {
+        return static::has(static::markdownPosts());
+    }
+
+    public static function hasDocumentationPages(): bool
+    {
+        return static::has(static::documentationPages());
+    }
+
+    public static function hasDarkmode(): bool
+    {
+        return static::has(static::darkmode());
+    }
+
     // ====================================================
     // Dynamic features that in addition to being enabled
     // in the config file, require preconditions to be met.

From 72d17a0050056f63ae74fb1a7575d9f20c270f7e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:22:32 +0200
Subject: [PATCH 1585/2811] Change boot method data flow

---
 packages/framework/src/Facades/Features.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 305a0b16faa..7e0f5e57464 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,7 +43,7 @@ class Features implements SerializableContract
 
     public function __construct()
     {
-        $this->boot();
+        $this->features = $this->boot();
     }
 
     /** @experimental This method may change before its release. */
@@ -225,7 +225,7 @@ protected static function getDefaultOptions(): array
         ];
     }
 
-    protected function boot(): void
+    protected function boot(): array
     {
         $options = static::getDefaultOptions();
 
@@ -243,7 +243,7 @@ protected function boot(): void
             }
         }
 
-        $this->features = $enabled;
+        return $enabled;
     }
 
     /** @return array<string> */

From efba943e572d329d00406f9e57a044d796da072d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:27:28 +0200
Subject: [PATCH 1586/2811] Refactor features getter to be static

---
 packages/framework/src/Facades/Features.php      | 16 ++++++++++------
 .../tests/Feature/ConfigurableFeaturesTest.php   | 11 +++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 7e0f5e57464..69c1c873007 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -46,12 +46,6 @@ public function __construct()
         $this->features = $this->boot();
     }
 
-    /** @experimental This method may change before its release. */
-    public function getFeatures(): array
-    {
-        return $this->features;
-    }
-
     /**
      * Determine if the given specified is enabled.
      */
@@ -70,6 +64,16 @@ public static function enabled(): array
         return array_keys(array_filter(Hyde::features()->getFeatures()));
     }
 
+    /**
+     * Get all features and their status.
+     *
+     * @return array<string, bool>
+     */
+    public static function getFeatures(): array
+    {
+        return Hyde::features()->toArray();
+    }
+
     // =================================================
     // Configure features to be used in the config file.
     // =================================================
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 417268b9f8a..b3201ae3a6f 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -170,22 +170,18 @@ public function testMultipleFeaturesCanBeMocked()
 
     public function testGetEnabledUsesDefaultOptionsByDefault()
     {
-        $features = new Features();
-
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, $features->getFeatures());
+        $this->assertSame($default, Features::getFeatures());
     }
 
     public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
     {
         config(['hyde' => []]);
 
-        $features = new Features();
-
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, $features->getFeatures());
+        $this->assertSame($default, Features::getFeatures());
     }
 
     public function testGetEnabledUsesConfiguredOptions()
@@ -208,8 +204,7 @@ public function testGetEnabledUsesConfiguredOptions()
 
         config(['hyde.features' => $config]);
 
-        $features = new Features();
-        $this->assertSame($expected, $features->getFeatures());
+        $this->assertSame($expected, Features::getFeatures());
     }
 
     public function testCannotUseArbitraryValuesInEnabledOptions()

From 3ba47273486b1ea1b2b4af502c44c5bc44f6f529 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:41:58 +0200
Subject: [PATCH 1587/2811] Inline internal mockable features class

---
 packages/framework/src/Facades/Features.php   | 17 +++++++++--
 .../Concerns/Internal/MockableFeatures.php    | 29 -------------------
 2 files changed, 15 insertions(+), 31 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 69c1c873007..b24800678b4 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -9,8 +9,8 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
-use Hyde\Framework\Concerns\Internal\MockableFeatures;
 
+use function is_array;
 use function array_keys;
 use function array_filter;
 use function extension_loaded;
@@ -32,7 +32,6 @@
 class Features implements SerializableContract
 {
     use Serializable;
-    use MockableFeatures;
 
     /**
      * The features that are enabled.
@@ -255,4 +254,18 @@ protected function getConfiguredFeatures(): array
     {
         return Config::getArray('hyde.features', static::getDefaultOptions());
     }
+
+    /**
+     * @internal This method is not covered by the backward compatibility promise.
+     *
+     * @param  string|array<string, bool>  $feature
+     */
+    public static function mock(string|array $feature, bool $enabled = true): void
+    {
+        $features = is_array($feature) ? $feature : [$feature => $enabled];
+
+        foreach ($features as $feature => $enabled) {
+            Hyde::features()->features[$feature] = $enabled;
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php b/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
deleted file mode 100644
index c41baa11878..00000000000
--- a/packages/framework/src/Framework/Concerns/Internal/MockableFeatures.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Concerns\Internal;
-
-use Hyde\Hyde;
-
-use function is_array;
-
-/**
- * Allows the Features class to be mocked.
- *
- * @internal This trait is not covered by the backward compatibility promise.
- *
- * @see \Hyde\Facades\Features
- */
-trait MockableFeatures
-{
-    /** @param string|array<string, bool> $feature */
-    public static function mock(string|array $feature, bool $enabled = true): void
-    {
-        $features = is_array($feature) ? $feature : [$feature => $enabled];
-
-        foreach ($features as $feature => $enabled) {
-            Hyde::features()->features[$feature] = $enabled;
-        }
-    }
-}

From 57196acddb40c6bb912a573511ea2da9bda025eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:50:38 +0200
Subject: [PATCH 1588/2811] Cleanup test

---
 packages/framework/tests/Feature/HydeExtensionFeatureTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
index b7cbfc6e0ba..6ed83dd5793 100644
--- a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
+++ b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
@@ -104,7 +104,6 @@ public function testCustomRegisteredPagesAreDiscoveredByTheFileCollectionClass()
 
         $this->directory('foo');
         $this->file('foo/bar.txt');
-        $this->kernel->boot();
 
         $this->assertArrayHasKey('foo/bar.txt', Files::all());
         $this->assertEquals(new SourceFile('foo/bar.txt', TestPageClass::class), Files::get('foo/bar.txt'));

From fa42c6bf6eb0cf7de881116382a9a76e5e3c9771 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:52:12 +0200
Subject: [PATCH 1589/2811] Revert out of scope changes in test

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 0e8a72f95bf..35233b1388a 100644
--- 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\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
@@ -81,13 +82,13 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
 
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
         ]);
 
-        app()->instance('navigation.main', new MainNavigationMenu());
-
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',
@@ -100,12 +101,12 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
 
     public function testDarkModeThemeButtonIsHiddenInDocumentationPagesWhenDisabled()
     {
+        Hyde::boot();
+
         Config::set('hyde.features', [
             Features::documentationPages(),
         ]);
 
-        view()->share('page', new DocumentationPage());
-
         $view = view('hyde::layouts/docs')->with([
             'title' => 'foo',
             'content' => 'foo',

From 05d67ccfbdc41d436e18a85ee7605f4d72c8395a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:53:52 +0200
Subject: [PATCH 1590/2811] Fix test boot order

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 35233b1388a..a4607856d0d 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -82,13 +82,13 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
 
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
-        Hyde::boot();
-
         Config::set('hyde.features', [
             Features::markdownPages(),
             Features::bladePages(),
         ]);
 
+        Hyde::boot();
+
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',
             'content' => 'foo',

From ccef9d843858c3085928959a5544a241a5ddb2cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:54:01 +0200
Subject: [PATCH 1591/2811] Fix test type issue

---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index a4607856d0d..2ec1ff4aadd 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -101,12 +101,12 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
 
     public function testDarkModeThemeButtonIsHiddenInDocumentationPagesWhenDisabled()
     {
-        Hyde::boot();
-
         Config::set('hyde.features', [
             Features::documentationPages(),
         ]);
 
+        view()->share('page', new DocumentationPage());
+
         $view = view('hyde::layouts/docs')->with([
             'title' => 'foo',
             'content' => 'foo',

From 8dfb7f2f032c90b2b91885d38ae21712726f94d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:48:32 +0200
Subject: [PATCH 1592/2811] Remove old comments and make features class public

---
 packages/framework/src/Facades/Features.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index b24800678b4..7de61615424 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -21,12 +21,6 @@
 /**
  * Allows features to be enabled and disabled in a simple object-oriented manner.
  *
- * @internal Until this class is split into a service/manager class, it should not be used outside of Hyde as the API is subject to change.
- *
- * @todo Split facade logic to service/manager class. (Initial and mock data could be set with boot/set methods)
- * @todo Add new enabled method to get just the enabled options array, and another called options/status/similar to get all options with their status.
- * Based entirely on Laravel Jetstream (License MIT)
- *
  * @see https://jetstream.laravel.com/
  */
 class Features implements SerializableContract

From 8d693d5f3c98abb1a47ad3e8819702c42acbbf2f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 14:57:08 +0200
Subject: [PATCH 1593/2811] Revert "Revert out of scope changes in test"

This reverts commit fa42c6bf6eb0cf7de881116382a9a76e5e3c9771.
---
 packages/framework/tests/Feature/DarkmodeFeatureTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 2ec1ff4aadd..0e8a72f95bf 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
@@ -87,7 +86,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
             Features::bladePages(),
         ]);
 
-        Hyde::boot();
+        app()->instance('navigation.main', new MainNavigationMenu());
 
         $view = view('hyde::layouts/page')->with([
             'title' => 'foo',

From 34fff90b8aff5f841b403773207919f233da3e53 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 17:13:33 +0200
Subject: [PATCH 1594/2811] Update test to get features statically

---
 packages/framework/tests/Feature/ConfigurableFeaturesTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index b3201ae3a6f..8b5d92f9971 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -218,12 +218,11 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
 
         config(['hyde.features' => $config]);
 
-        $features = new Features();
         $this->assertSame([
             'html-pages',
             'markdown-posts',
             'blade-pages',
-        ], $features->enabled());
+        ], Hyde::features()->enabled());
     }
 
     protected function defaultOptions(): array

From fe4116ea21903ce463c4100721de8a66be2a2511 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 17:15:57 +0200
Subject: [PATCH 1595/2811] Refactor test to extend unit test case

---
 .../Feature/ConfigurableFeaturesTest.php      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 8b5d92f9971..2203a742856 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -4,15 +4,37 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Facades\Features;
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Facades\Config;
+use Hyde\Testing\UnitTestCase;
+use Hyde\Foundation\HydeKernel;
 
 /**
  * @covers \Hyde\Facades\Features
  */
-class ConfigurableFeaturesTest extends TestCase
+class ConfigurableFeaturesTest extends UnitTestCase
 {
+    protected static array $defaultConfig;
+
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        self::$defaultConfig = require Hyde::path('config/hyde.php');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        self::mockConfig();
+
+        HydeKernel::setInstance(new HydeKernel());
+    }
+
     public function testHasHtmlPagesReturnsFalseWhenFeatureIsNotEnabled()
     {
         $this->expectMethodReturnsFalse('hasHtmlPages');
@@ -96,6 +118,7 @@ public function testHasSitemapReturnsTrueWhenFeatureIsEnabled()
     public function testCanGenerateSitemapHelperReturnsTrueIfHydeHasBaseUrl()
     {
         config(['hyde.url' => 'foo']);
+
         $this->assertTrue(Features::hasSitemap());
     }
 
@@ -241,13 +264,18 @@ protected function defaultOptions(): array
 
     protected function expectMethodReturnsFalse(string $method): void
     {
-        Config::set('hyde.features', []);
-
         $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
     }
 
     protected function expectMethodReturnsTrue(string $method): void
     {
+        $this->mockDefaultConfig();
+
         $this->assertTrue(Features::$method(), "Method '$method' should return true when feature is enabled");
     }
+
+    protected function mockDefaultConfig(): void
+    {
+        self::mockConfig(['hyde' => self::$defaultConfig]);
+    }
 }

From 3cb3873179ba33c66a3a202739f4921558d860df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 17:16:00 +0200
Subject: [PATCH 1596/2811] Revert "Refactor test to extend unit test case"

This reverts commit fe4116ea21903ce463c4100721de8a66be2a2511.
---
 .../Feature/ConfigurableFeaturesTest.php      | 38 +++----------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 2203a742856..8b5d92f9971 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -4,37 +4,15 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Facades\Features;
-use Hyde\Testing\UnitTestCase;
-use Hyde\Foundation\HydeKernel;
+use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Config;
 
 /**
  * @covers \Hyde\Facades\Features
  */
-class ConfigurableFeaturesTest extends UnitTestCase
+class ConfigurableFeaturesTest extends TestCase
 {
-    protected static array $defaultConfig;
-
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-
-        self::$defaultConfig = require Hyde::path('config/hyde.php');
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        self::mockConfig();
-
-        HydeKernel::setInstance(new HydeKernel());
-    }
-
     public function testHasHtmlPagesReturnsFalseWhenFeatureIsNotEnabled()
     {
         $this->expectMethodReturnsFalse('hasHtmlPages');
@@ -118,7 +96,6 @@ public function testHasSitemapReturnsTrueWhenFeatureIsEnabled()
     public function testCanGenerateSitemapHelperReturnsTrueIfHydeHasBaseUrl()
     {
         config(['hyde.url' => 'foo']);
-
         $this->assertTrue(Features::hasSitemap());
     }
 
@@ -264,18 +241,13 @@ protected function defaultOptions(): array
 
     protected function expectMethodReturnsFalse(string $method): void
     {
+        Config::set('hyde.features', []);
+
         $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
     }
 
     protected function expectMethodReturnsTrue(string $method): void
     {
-        $this->mockDefaultConfig();
-
         $this->assertTrue(Features::$method(), "Method '$method' should return true when feature is enabled");
     }
-
-    protected function mockDefaultConfig(): void
-    {
-        self::mockConfig(['hyde' => self::$defaultConfig]);
-    }
 }

From 01fe588db363389244f422aab646714917f0af11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 17:16:27 +0200
Subject: [PATCH 1597/2811] Import class

---
 packages/framework/tests/Feature/ConfigurableFeaturesTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 8b5d92f9971..d263490c042 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;

From 6d3aa0baeaaedfb3fa7abb0026dc1262cf5d67de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 17:51:16 +0200
Subject: [PATCH 1598/2811] Extract Pest unit test

---
 .../Feature/ConfigurableFeaturesTest.php      | 50 -------------------
 .../Unit/ConfigurableFeaturesUnitTest.php     | 37 ++++++++++++++
 2 files changed, 37 insertions(+), 50 deletions(-)
 create mode 100644 packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index d263490c042..1734af8c6a9 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -14,31 +14,6 @@
  */
 class ConfigurableFeaturesTest extends TestCase
 {
-    public function testHasHtmlPagesReturnsFalseWhenFeatureIsNotEnabled()
-    {
-        $this->expectMethodReturnsFalse('hasHtmlPages');
-    }
-
-    public function testHasBladePagesReturnsFalseWhenFeatureIsNotEnabled()
-    {
-        $this->expectMethodReturnsFalse('hasBladePages');
-    }
-
-    public function testHasMarkdownPagesReturnsFalseWhenFeatureIsNotEnabled()
-    {
-        $this->expectMethodReturnsFalse('hasMarkdownPages');
-    }
-
-    public function testHasMarkdownPostsReturnsFalseWhenFeatureIsNotEnabled()
-    {
-        $this->expectMethodReturnsFalse('hasMarkdownPosts');
-    }
-
-    public function testHasDocumentationPagesReturnsFalseWhenFeatureIsNotEnabled()
-    {
-        $this->expectMethodReturnsFalse('hasDocumentationPages');
-    }
-
     public function testHasDocumentationSearchReturnsFalseWhenFeatureIsNotEnabled()
     {
         $this->expectMethodReturnsFalse('hasDocumentationSearch');
@@ -59,31 +34,6 @@ public function testHasRssReturnsFalseWhenFeatureIsNotEnabled()
         $this->expectMethodReturnsFalse('hasRss');
     }
 
-    public function testHasHtmlPagesReturnsTrueWhenFeatureIsEnabled()
-    {
-        $this->expectMethodReturnsTrue('hasHtmlPages');
-    }
-
-    public function testHasBladePagesReturnsTrueWhenFeatureIsEnabled()
-    {
-        $this->expectMethodReturnsTrue('hasBladePages');
-    }
-
-    public function testHasMarkdownPagesReturnsTrueWhenFeatureIsEnabled()
-    {
-        $this->expectMethodReturnsTrue('hasMarkdownPages');
-    }
-
-    public function testHasMarkdownPostsReturnsTrueWhenFeatureIsEnabled()
-    {
-        $this->expectMethodReturnsTrue('hasMarkdownPosts');
-    }
-
-    public function testHasDocumentationPagesReturnsTrueWhenFeatureIsEnabled()
-    {
-        $this->expectMethodReturnsTrue('hasDocumentationPages');
-    }
-
     public function testHasDarkmodeReturnsTrueWhenFeatureIsEnabled()
     {
         $this->expectMethodReturnsTrue('hasDarkmode');
diff --git a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
new file mode 100644
index 00000000000..b24fbb17209
--- /dev/null
+++ b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Facades\Features;
+use Illuminate\Support\Facades\Config;
+
+beforeEach(function () {
+    $this->mockConfig();
+    $this->needsKernel();
+});
+
+test('expect has method returns false when feature is disabled', function (string $method) {
+    Config::set('hyde.features', []);
+    \Hyde\Foundation\HydeKernel::setInstance(new \Hyde\Foundation\HydeKernel());
+
+    $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
+})->with([
+    'hasHtmlPages',
+    'hasBladePages',
+    'hasMarkdownPages',
+    'hasMarkdownPosts',
+    'hasDocumentationPages',
+])->covers(Hyde\Facades\Features::class);
+
+test('expect has method returns true when feature is enabled', function (string $method) {
+    Config::set('hyde.features', [str($method)->kebab()->replace('has-', '')->toString()]);
+    \Hyde\Foundation\HydeKernel::setInstance(new \Hyde\Foundation\HydeKernel());
+
+    $this->assertTrue(Features::$method(), "Method '$method' should return true when feature is enabled");
+})->with([
+    'hasHtmlPages',
+    'hasBladePages',
+    'hasMarkdownPages',
+    'hasMarkdownPosts',
+    'hasDocumentationPages',
+])->covers(Hyde\Facades\Features::class);

From 559be6c9119993cdf7e8be8846f866c15f79bcf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:21:06 +0200
Subject: [PATCH 1599/2811] Remove old annotation

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 7de61615424..d78a18a3487 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -20,8 +20,6 @@
 
 /**
  * Allows features to be enabled and disabled in a simple object-oriented manner.
- *
- * @see https://jetstream.laravel.com/
  */
 class Features implements SerializableContract
 {

From 337bab00bdbdb27185df5f8d1a3c71d146090e2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:36:48 +0200
Subject: [PATCH 1600/2811] Deprecate added method

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index d78a18a3487..f7a735a757c 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -58,6 +58,8 @@ public static function enabled(): array
     /**
      * Get all features and their status.
      *
+     * @deprecated This method might not actually provide value, as it's not interesting information to have.
+     *
      * @return array<string, bool>
      */
     public static function getFeatures(): array

From 703234b7ba1b4e6a4cb7ed6cae936e8d66817ac6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:20:40 +0200
Subject: [PATCH 1601/2811] Create Feature.php

---
 packages/framework/src/Foundation/Concerns/Feature.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Foundation/Concerns/Feature.php

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
new file mode 100644
index 00000000000..9afe1dbd7f4
--- /dev/null
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Concerns;
+
+enum Feature
+{
+    //
+}

From 6e0e79c7807740ed394005c20cf3ce270c7aa1f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:21:54 +0200
Subject: [PATCH 1602/2811] Mark enum as experimental

---
 packages/framework/src/Foundation/Concerns/Feature.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
index 9afe1dbd7f4..3924a082fcf 100644
--- a/packages/framework/src/Foundation/Concerns/Feature.php
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Foundation\Concerns;
 
+/**
+ * @experimental This class may change significantly before its release.
+ */
 enum Feature
 {
     //

From f69217a1a214ae74447de6c3f158094ccf75adc6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:22:24 +0200
Subject: [PATCH 1603/2811] Add enum description

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

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
index 3924a082fcf..c30d781dbc0 100644
--- a/packages/framework/src/Foundation/Concerns/Feature.php
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -5,6 +5,8 @@
 namespace Hyde\Foundation\Concerns;
 
 /**
+ * A configurable feature that belongs to the Features class.
+ *
  * @experimental This class may change significantly before its release.
  */
 enum Feature

From 7425d446c9d0ab4a2fa9de9f9fb9b000072a8ef4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:22:30 +0200
Subject: [PATCH 1604/2811] Add link to related class

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

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
index c30d781dbc0..d00e4a22f67 100644
--- a/packages/framework/src/Foundation/Concerns/Feature.php
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -7,6 +7,8 @@
 /**
  * A configurable feature that belongs to the Features class.
  *
+ * @see \Hyde\Facades\Features
+ *
  * @experimental This class may change significantly before its release.
  */
 enum Feature

From 0742896b3144eb95a579e2759361160ed0b8d193 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:24:59 +0200
Subject: [PATCH 1605/2811] Add enum cases based on features facade

---
 .../framework/src/Foundation/Concerns/Feature.php  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
index d00e4a22f67..5f066e19e54 100644
--- a/packages/framework/src/Foundation/Concerns/Feature.php
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -13,5 +13,17 @@
  */
 enum Feature
 {
-    //
+    // Page Modules
+    case HtmlPages;
+    case MarkdownPosts;
+    case BladePages;
+    case MarkdownPages;
+    case DocumentationPages;
+
+    // Frontend Features
+    case Darkmode;
+    case DocumentationSearch;
+
+    // Integrations
+    case Torchlight;
 }

From 89e5f7ae57b7ba229a2c301f7028ed35828243de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:30:06 +0200
Subject: [PATCH 1606/2811] Back enum cases

---
 .../src/Foundation/Concerns/Feature.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/Feature.php b/packages/framework/src/Foundation/Concerns/Feature.php
index 5f066e19e54..812cad8a2b7 100644
--- a/packages/framework/src/Foundation/Concerns/Feature.php
+++ b/packages/framework/src/Foundation/Concerns/Feature.php
@@ -11,19 +11,19 @@
  *
  * @experimental This class may change significantly before its release.
  */
-enum Feature
+enum Feature: string
 {
     // Page Modules
-    case HtmlPages;
-    case MarkdownPosts;
-    case BladePages;
-    case MarkdownPages;
-    case DocumentationPages;
+    case HtmlPages = 'html-pages';
+    case MarkdownPosts = 'markdown-posts';
+    case BladePages = 'blade-pages';
+    case MarkdownPages = 'markdown-pages';
+    case DocumentationPages = 'documentation-pages';
 
     // Frontend Features
-    case Darkmode;
-    case DocumentationSearch;
+    case Darkmode = 'darkmode';
+    case DocumentationSearch = 'documentation-search';
 
     // Integrations
-    case Torchlight;
+    case Torchlight = 'torchlight';
 }

From 4f086da28967e5344b499e5d11d16539cc0d8ef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:30:48 +0200
Subject: [PATCH 1607/2811] Import feature enum

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index f7a735a757c..f280369d383 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 

From 07faf9c35a898719ab35bb4155b696d0489ddaa6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:31:13 +0200
Subject: [PATCH 1608/2811] Update feature methods to return feature instances

---
 packages/framework/src/Facades/Features.php | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index f280369d383..50326a02a48 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -72,44 +72,44 @@ public static function getFeatures(): array
     // Configure features to be used in the config file.
     // =================================================
 
-    public static function htmlPages(): string
+    public static function htmlPages(): Feature
     {
-        return 'html-pages';
+        return Feature::HtmlPages;
     }
 
-    public static function bladePages(): string
+    public static function bladePages(): Feature
     {
-        return 'blade-pages';
+        return Feature::BladePages;
     }
 
-    public static function markdownPages(): string
+    public static function markdownPages(): Feature
     {
-        return 'markdown-pages';
+        return Feature::MarkdownPages;
     }
 
-    public static function markdownPosts(): string
+    public static function markdownPosts(): Feature
     {
-        return 'markdown-posts';
+        return Feature::MarkdownPosts;
     }
 
-    public static function documentationPages(): string
+    public static function documentationPages(): Feature
     {
-        return 'documentation-pages';
+        return Feature::DocumentationPages;
     }
 
-    public static function documentationSearch(): string
+    public static function documentationSearch(): Feature
     {
-        return 'documentation-search';
+        return Feature::DocumentationSearch;
     }
 
-    public static function darkmode(): string
+    public static function darkmode(): Feature
     {
-        return 'darkmode';
+        return Feature::Darkmode;
     }
 
-    public static function torchlight(): string
+    public static function torchlight(): Feature
     {
-        return 'torchlight';
+        return Feature::Torchlight;
     }
 
     // ================================================

From 2b2cec7df1cd372b419d1588ef7c5733337e9093 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:31:30 +0200
Subject: [PATCH 1609/2811] Update state check method to take feature instead
 of string

---
 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 50326a02a48..ae71f320dcd 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -41,7 +41,7 @@ public function __construct()
     /**
      * Determine if the given specified is enabled.
      */
-    public static function has(string $feature): bool
+    public static function has(Feature $feature): bool
     {
         return in_array($feature, static::enabled());
     }

From 295f7ae0c76523ed398345725c1353756c0d717d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:32:00 +0200
Subject: [PATCH 1610/2811] Update array generics

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index ae71f320dcd..ca64449ba20 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -203,7 +203,7 @@ public function toArray(): array
         return $this->features;
     }
 
-    /** @return array<string> */
+    /** @return array<Feature> */
     protected static function getDefaultOptions(): array
     {
         return [
@@ -244,7 +244,7 @@ protected function boot(): array
         return $enabled;
     }
 
-    /** @return array<string> */
+    /** @return array<Feature> */
     protected function getConfiguredFeatures(): array
     {
         return Config::getArray('hyde.features', static::getDefaultOptions());

From 0de3bead7a71800bad5ef1516157f31d96997e9d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:32:54 +0200
Subject: [PATCH 1611/2811] Store internal state using the enum values

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index ca64449ba20..0d64d53749d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -231,13 +231,13 @@ protected function boot(): array
 
         // Set all default features to false
         foreach ($options as $feature) {
-            $enabled[$feature] = false;
+            $enabled[$feature->value] = false;
         }
 
         // Set all features to true if they are enabled in the config file
         foreach ($this->getConfiguredFeatures() as $feature) {
             if (in_array($feature, $options)) {
-                $enabled[$feature] = true;
+                $enabled[$feature->value] = true;
             }
         }
 

From 93c15c5024c3ee6539b3b0af63b84a0b1078f78c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:34:37 +0200
Subject: [PATCH 1612/2811] Fix illegal offset type

---
 .../framework/tests/Feature/ConfigurableFeaturesTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 1734af8c6a9..2172e4246bc 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -143,9 +143,9 @@ public function testGetEnabledUsesConfiguredOptions()
             Features::bladePages(),
         ];
         $expected = [
-            Features::htmlPages() => true,
-            Features::markdownPosts() => true,
-            Features::bladePages() => true,
+            Features::htmlPages()->value => true,
+            Features::markdownPosts()->value => true,
+            Features::bladePages()->value => true,
             'markdown-pages' => false,
             'documentation-pages' => false,
             'darkmode' => false,

From 9a4a5de8e5560ef7e33a1a1da33601f234dcf330 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:38:06 +0200
Subject: [PATCH 1613/2811] Compare against enabled values

---
 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 0d64d53749d..a83bb356ff0 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -43,7 +43,7 @@ public function __construct()
      */
     public static function has(Feature $feature): bool
     {
-        return in_array($feature, static::enabled());
+        return in_array($feature->value, static::enabled());
     }
 
     /**

From 78cadabd85cb02768fc63a531356c59afd9f9805 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:46:05 +0200
Subject: [PATCH 1614/2811] Refactor unit test to use the enum

---
 .../Unit/ConfigurableFeaturesUnitTest.php     | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
index b24fbb17209..a7ba8225f77 100644
--- a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
+++ b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Hyde\Facades\Features;
+use Hyde\Foundation\Concerns\Feature;
 use Illuminate\Support\Facades\Config;
 
 beforeEach(function () {
@@ -10,28 +11,25 @@
     $this->needsKernel();
 });
 
-test('expect has method returns false when feature is disabled', function (string $method) {
+test('expect has method returns false when feature is disabled', function (Feature $feature) {
+    $method = "has$feature->name";
+
     Config::set('hyde.features', []);
     \Hyde\Foundation\HydeKernel::setInstance(new \Hyde\Foundation\HydeKernel());
 
     $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
-})->with([
-    'hasHtmlPages',
-    'hasBladePages',
-    'hasMarkdownPages',
-    'hasMarkdownPosts',
-    'hasDocumentationPages',
-])->covers(Hyde\Facades\Features::class);
-
-test('expect has method returns true when feature is enabled', function (string $method) {
-    Config::set('hyde.features', [str($method)->kebab()->replace('has-', '')->toString()]);
+})->with(Feature::cases())->covers(Hyde\Facades\Features::class);
+
+test('expect has method returns true when feature is enabled', function (Feature $feature) {
+    $method = "has$feature->name";
+
+    Config::set('hyde.features', [$feature]);
     \Hyde\Foundation\HydeKernel::setInstance(new \Hyde\Foundation\HydeKernel());
 
     $this->assertTrue(Features::$method(), "Method '$method' should return true when feature is enabled");
-})->with([
-    'hasHtmlPages',
-    'hasBladePages',
-    'hasMarkdownPages',
-    'hasMarkdownPosts',
-    'hasDocumentationPages',
-])->covers(Hyde\Facades\Features::class);
+})->with(
+    collect(Feature::cases())->reject(fn (Feature $feature): bool => in_array($feature, [
+        Feature::DocumentationSearch,
+        Feature::Torchlight,
+    ]))
+)->covers(Hyde\Facades\Features::class);

From 4696fddde8a1852573b798b5e03599a47bbaa37a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 18:51:27 +0200
Subject: [PATCH 1615/2811] Update kernel helper to support features enum

---
 packages/framework/src/Foundation/HydeKernel.php    | 5 +++--
 packages/framework/tests/Feature/HydeKernelTest.php | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index a3494286e10..148bd125c5f 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation;
 
 use Hyde\Facades\Features;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Foundation\Kernel\FileCollection;
@@ -91,9 +92,9 @@ public function features(): Features
         return $this->features ??= new Features();
     }
 
-    public function hasFeature(string $feature): bool
+    public function hasFeature(Feature|string $feature): bool
     {
-        return Features::has($feature);
+        return Features::has($feature instanceof Feature ? $feature : Feature::from($feature));
     }
 
     /** @inheritDoc */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index b7beb1b07be..d7f041b24f7 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -10,6 +10,7 @@
 use Hyde\Foundation\Facades\Pages;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
@@ -76,7 +77,8 @@ public function testFeaturesHelperReturnsNewFeaturesInstance()
 
     public function testHasFeatureHelperCallsMethodOnFeaturesClass()
     {
-        $this->assertSame(Features::has('foo'), Hyde::hasFeature('foo'));
+        $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature(Feature::BladePages));
+        $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature('blade-pages'));
     }
 
     public function testCurrentPageHelperReturnsCurrentPageName()

From 66d69c716b88acee200e80a72e471c1176a27eae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 19:01:25 +0200
Subject: [PATCH 1616/2811] Update reset logic to use added enum

---
 packages/testing/src/ResetsApplication.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/testing/src/ResetsApplication.php b/packages/testing/src/ResetsApplication.php
index 96729828402..7b2e10e645c 100644
--- a/packages/testing/src/ResetsApplication.php
+++ b/packages/testing/src/ResetsApplication.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Filesystem;
 use Hyde\Hyde;
+use Hyde\Foundation\Concerns\Feature;
 
 trait ResetsApplication
 {
@@ -55,9 +56,7 @@ protected function withoutDocumentationSearch(): void
     {
         $features = config('hyde.features');
 
-        $flipped = array_flip($features);
-        unset($flipped['documentation-search']);
-        $features = array_flip($flipped);
+        $features = array_filter($features, fn (Feature $feature): bool => $feature !== Feature::DocumentationSearch);
 
         config(['hyde.features' => $features]);
     }
@@ -67,7 +66,7 @@ protected function restoreDocumentationSearch(): void
     {
         $features = config('hyde.features');
 
-        $features[] = 'documentation-search';
+        $features[] = Feature::DocumentationSearch;
 
         config(['hyde.features' => $features]);
     }

From 05dc52b93b5b6b724c9209d0e28a8da8572386af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 19:03:42 +0200
Subject: [PATCH 1617/2811] Update method annotation

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

diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 131db5b0f5b..5745a939992 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\Kernel\PageCollection;
@@ -58,7 +59,7 @@
  * @method static HydeKernel getInstance()
  * @method static Filesystem filesystem()
  * @method static array getRegisteredExtensions()
- * @method static bool hasFeature(string $feature)
+ * @method static bool hasFeature(Feature|string $feature)
  * @method static bool hasSiteUrl()
  * @method static void setInstance(HydeKernel $instance)
  * @method static void setBasePath(string $basePath)

From e6277b4812312569eb164df7a4e7d11821494315 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 19:05:15 +0200
Subject: [PATCH 1618/2811] Update command to use features enum

---
 packages/framework/src/Console/Commands/DebugCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/DebugCommand.php b/packages/framework/src/Console/Commands/DebugCommand.php
index c3f4effc11e..ce8d426fbd9 100644
--- a/packages/framework/src/Console/Commands/DebugCommand.php
+++ b/packages/framework/src/Console/Commands/DebugCommand.php
@@ -70,11 +70,11 @@ protected function printVerbosePathInformation(): void
 
     protected function printEnabledFeatures(): void
     {
-        /** @var array<string, string> $features */
+        /** @var array<\Hyde\Foundation\Concerns\Feature> $features */
         $features = Config::getArray('hyde.features', []);
 
         foreach ($features as $feature) {
-            $this->line(" - $feature");
+            $this->line(" - $feature->name");
         }
     }
 }

From c7efeeedb86381d980d48c096437d1f7181b735a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:15:51 +0200
Subject: [PATCH 1619/2811] Use enum cases as default array

---
 packages/framework/src/Facades/Features.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index a83bb356ff0..6f72ccd278c 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -206,21 +206,7 @@ public function toArray(): array
     /** @return array<Feature> */
     protected static function getDefaultOptions(): array
     {
-        return [
-            // Page Modules
-            static::htmlPages(),
-            static::markdownPosts(),
-            static::bladePages(),
-            static::markdownPages(),
-            static::documentationPages(),
-
-            // Frontend Features
-            static::darkmode(),
-            static::documentationSearch(),
-
-            // Integrations
-            static::torchlight(),
-        ];
+        return Feature::cases();
     }
 
     protected function boot(): array

From 98ffaf0eac6ea213e51e752a7967b67174f0c873 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:21:26 +0200
Subject: [PATCH 1620/2811] Remove the features getter

This method might not actually provide value, as it's not interesting information to have. It has also not been released, so this change is not breaking.
---
 packages/framework/src/Facades/Features.php   | 14 +-------
 .../Feature/ConfigurableFeaturesTest.php      | 33 ++++++++-----------
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 6f72ccd278c..e2774a16769 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -53,19 +53,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return array_keys(array_filter(Hyde::features()->getFeatures()));
-    }
-
-    /**
-     * Get all features and their status.
-     *
-     * @deprecated This method might not actually provide value, as it's not interesting information to have.
-     *
-     * @return array<string, bool>
-     */
-    public static function getFeatures(): array
-    {
-        return Hyde::features()->toArray();
+        return array_keys(array_filter(Hyde::features()->toArray()));
     }
 
     // =================================================
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 2172e4246bc..e69b8283bbf 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -123,7 +123,7 @@ public function testGetEnabledUsesDefaultOptionsByDefault()
     {
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, Features::getFeatures());
+        $this->assertSame($default, Features::enabled());
     }
 
     public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
@@ -132,7 +132,7 @@ public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
 
         $default = $this->defaultOptions();
 
-        $this->assertSame($default, Features::getFeatures());
+        $this->assertSame($default, Features::enabled());
     }
 
     public function testGetEnabledUsesConfiguredOptions()
@@ -143,19 +143,14 @@ public function testGetEnabledUsesConfiguredOptions()
             Features::bladePages(),
         ];
         $expected = [
-            Features::htmlPages()->value => true,
-            Features::markdownPosts()->value => true,
-            Features::bladePages()->value => true,
-            'markdown-pages' => false,
-            'documentation-pages' => false,
-            'darkmode' => false,
-            'documentation-search' => false,
-            'torchlight' => false,
+            'html-pages',
+            'markdown-posts',
+            'blade-pages',
         ];
 
         config(['hyde.features' => $config]);
 
-        $this->assertSame($expected, Features::getFeatures());
+        $this->assertSame($expected, Features::enabled());
     }
 
     public function testCannotUseArbitraryValuesInEnabledOptions()
@@ -179,14 +174,14 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
     protected function defaultOptions(): array
     {
         return [
-            'html-pages' => true,
-            'markdown-posts' => true,
-            'blade-pages' => true,
-            'markdown-pages' => true,
-            'documentation-pages' => true,
-            'darkmode' => true,
-            'documentation-search' => true,
-            'torchlight' => true,
+            'html-pages',
+            'markdown-posts',
+            'blade-pages',
+            'markdown-pages',
+            'documentation-pages',
+            'darkmode',
+            'documentation-search',
+            'torchlight',
         ];
     }
 

From 82e99e6aaf2c8f61053d563c25b6739706a6b8c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:22:05 +0200
Subject: [PATCH 1621/2811] Inline local variables

---
 .../tests/Feature/ConfigurableFeaturesTest.php      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index e69b8283bbf..48408adb82a 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -137,20 +137,17 @@ public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
 
     public function testGetEnabledUsesConfiguredOptions()
     {
-        $config = [
+        config(['hyde.features' => [
             Features::htmlPages(),
             Features::markdownPosts(),
             Features::bladePages(),
-        ];
-        $expected = [
+        ]]);
+
+        $this->assertSame([
             'html-pages',
             'markdown-posts',
             'blade-pages',
-        ];
-
-        config(['hyde.features' => $config]);
-
-        $this->assertSame($expected, Features::enabled());
+        ], Features::enabled());
     }
 
     public function testCannotUseArbitraryValuesInEnabledOptions()

From 2f5a472fe2cf0c668b0e46d14e920adea080f3f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:31:00 +0200
Subject: [PATCH 1622/2811] Add todo

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index e2774a16769..79cfa9eb24d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -29,6 +29,8 @@ class Features implements SerializableContract
     /**
      * The features that are enabled.
      *
+     * @todo Simplify internal state complexity
+     *
      * @var array<string, bool>
      */
     protected array $features = [];

From 4c1db295c7607802dee76ba037c1b3632dddd392 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:32:15 +0200
Subject: [PATCH 1623/2811] Merge multiple array assertions into assert same
 call

No idea why this was the way it was
---
 .../Feature/ConfigurableFeaturesTest.php      | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 48408adb82a..291c4c79597 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -77,18 +77,16 @@ public function testToArrayMethodReturnsMethodArray()
 
     public function testToArrayMethodContainsAllSettings()
     {
-        $array = (new Features)->toArray();
-
-        $this->assertArrayHasKey('html-pages', $array);
-        $this->assertArrayHasKey('markdown-posts', $array);
-        $this->assertArrayHasKey('blade-pages', $array);
-        $this->assertArrayHasKey('markdown-pages', $array);
-        $this->assertArrayHasKey('documentation-pages', $array);
-        $this->assertArrayHasKey('darkmode', $array);
-        $this->assertArrayHasKey('documentation-search', $array);
-        $this->assertArrayHasKey('torchlight', $array);
-
-        $this->assertCount(8, $array);
+        $this->assertSame([
+            'html-pages',
+            'markdown-posts',
+            'blade-pages',
+            'markdown-pages',
+            'documentation-pages',
+            'darkmode',
+            'documentation-search',
+            'torchlight',
+        ], array_keys((new Features)->toArray()));
     }
 
     public function testFeaturesCanBeMocked()

From f43e0478076382259309f0bb86e7e25ceea572e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:33:28 +0200
Subject: [PATCH 1624/2811] Change internal parameter to null to get prettier
 IDE support

---
 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 79cfa9eb24d..2038ed2f56f 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -231,7 +231,7 @@ protected function getConfiguredFeatures(): array
      *
      * @param  string|array<string, bool>  $feature
      */
-    public static function mock(string|array $feature, bool $enabled = true): void
+    public static function mock(string|array $feature, bool $enabled = null): void
     {
         $features = is_array($feature) ? $feature : [$feature => $enabled];
 

From b1bfd84d1494fbc3eeb365c1dc7066378949f184 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:35:02 +0200
Subject: [PATCH 1625/2811] Merge complex tests into single test with the same
 coverage

---
 .../Feature/ConfigurableFeaturesTest.php      | 30 ++++++-------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 291c4c79597..7d550ba55e9 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -63,30 +63,18 @@ public function testCanGenerateSitemapHelperReturnsFalseIfSitemapsAreDisabledInC
         $this->assertFalse(Features::hasSitemap());
     }
 
-    public function testToArrayMethodReturnsMethodArray()
-    {
-        $array = (new Features)->toArray();
-        $this->assertIsArray($array);
-        $this->assertNotEmpty($array);
-        foreach ($array as $feature => $enabled) {
-            $this->assertIsString($feature);
-            $this->assertIsBool($enabled);
-            $this->assertStringStartsNotWith('has', $feature);
-        }
-    }
-
     public function testToArrayMethodContainsAllSettings()
     {
         $this->assertSame([
-            'html-pages',
-            'markdown-posts',
-            'blade-pages',
-            'markdown-pages',
-            'documentation-pages',
-            'darkmode',
-            'documentation-search',
-            'torchlight',
-        ], array_keys((new Features)->toArray()));
+            'html-pages' => true,
+            'markdown-posts' => true,
+            'blade-pages' => true,
+            'markdown-pages' => true,
+            'documentation-pages' => true,
+            'darkmode' => true,
+            'documentation-search' => true,
+            'torchlight' => true,
+        ], (new Features)->toArray());
     }
 
     public function testFeaturesCanBeMocked()

From 0fddc9405f73ed90fed90886bd6d4b62acb77e36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:35:49 +0200
Subject: [PATCH 1626/2811] Add additional testing case

---
 .../Feature/ConfigurableFeaturesTest.php      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 7d550ba55e9..df145e38c06 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -77,6 +77,26 @@ public function testToArrayMethodContainsAllSettings()
         ], (new Features)->toArray());
     }
 
+    public function testToArrayMethodContainsAllSettingsIncludingFalseValues()
+    {
+        config(['hyde.features' => [
+            Features::htmlPages(),
+            Features::markdownPosts(),
+            Features::bladePages(),
+        ]]);
+
+        $this->assertSame([
+            'html-pages' => true,
+            'markdown-posts' => true,
+            'blade-pages' => true,
+            'markdown-pages' => false,
+            'documentation-pages' => false,
+            'darkmode' => false,
+            'documentation-search' => false,
+            'torchlight' => false,
+        ], (new Features)->toArray());
+    }
+
     public function testFeaturesCanBeMocked()
     {
         Features::mock('darkmode', true);

From 006bce83039fd1e6f267ab2ca519a29b4b70b11f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:37:55 +0200
Subject: [PATCH 1627/2811] Test serialized class state

---
 .../Feature/ConfigurableFeaturesTest.php      | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index df145e38c06..fcea406456a 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -9,6 +9,8 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
+use function config;
+
 /**
  * @covers \Hyde\Facades\Features
  */
@@ -97,6 +99,28 @@ public function testToArrayMethodContainsAllSettingsIncludingFalseValues()
         ], (new Features)->toArray());
     }
 
+    public function testSerializedClassState()
+    {
+        config(['hyde.features' => [
+            Features::htmlPages(),
+            Features::markdownPosts(),
+            Features::bladePages(),
+        ]]);
+
+        $this->assertSame(<<<'JSON'
+        {
+            "html-pages": true,
+            "markdown-posts": true,
+            "blade-pages": true,
+            "markdown-pages": false,
+            "documentation-pages": false,
+            "darkmode": false,
+            "documentation-search": false,
+            "torchlight": false
+        }
+        JSON, (new Features)->toJson(JSON_PRETTY_PRINT));
+    }
+
     public function testFeaturesCanBeMocked()
     {
         Features::mock('darkmode', true);

From 7c505699ef246a55e95797590ebf7835bbfb79fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:48:27 +0200
Subject: [PATCH 1628/2811] Return array representation using case mappings

---
 packages/framework/src/Facades/Features.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 2038ed2f56f..8a9518da84f 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -190,7 +190,10 @@ public static function hasDocumentationSearch(): bool
      */
     public function toArray(): array
     {
-        return $this->features;
+        return collect(Feature::cases())
+            ->mapWithKeys(fn (Feature $case): array => [
+                $case->value => $this->features[$case->value],
+            ])->toArray();
     }
 
     /** @return array<Feature> */

From db485e747f55ae717f8a3fcad6263038ecc607ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:51:00 +0200
Subject: [PATCH 1629/2811] Rename closure parameter

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 8a9518da84f..fb3b5f18e4a 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -191,8 +191,8 @@ public static function hasDocumentationSearch(): bool
     public function toArray(): array
     {
         return collect(Feature::cases())
-            ->mapWithKeys(fn (Feature $case): array => [
-                $case->value => $this->features[$case->value],
+            ->mapWithKeys(fn (Feature $feature): array => [
+                $feature->value => $this->features[$feature->value],
             ])->toArray();
     }
 

From e41e96daa81b79d07fc04e8f04f158c6213d4b29 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:51:12 +0200
Subject: [PATCH 1630/2811] Draft future closure logic

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index fb3b5f18e4a..9157fc07973 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -192,6 +192,7 @@ public function toArray(): array
     {
         return collect(Feature::cases())
             ->mapWithKeys(fn (Feature $feature): array => [
+                // Todo: $feature->value => isset($this->features[$feature->value]),
                 $feature->value => $this->features[$feature->value],
             ])->toArray();
     }

From a032b33478e642a964aab223fddafea908e115b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 20:59:47 +0200
Subject: [PATCH 1631/2811] Enable new logic

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 9157fc07973..d8850563825 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -192,8 +192,7 @@ public function toArray(): array
     {
         return collect(Feature::cases())
             ->mapWithKeys(fn (Feature $feature): array => [
-                // Todo: $feature->value => isset($this->features[$feature->value]),
-                $feature->value => $this->features[$feature->value],
+                 $feature->value => isset($this->features[$feature->value]),
             ])->toArray();
     }
 

From 626ff0f88753178708ee614941bfcd432e41b43a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:08:36 +0200
Subject: [PATCH 1632/2811] Simplify internal state complexity

---
 packages/framework/src/Facades/Features.php   | 35 ++++++-------------
 .../Feature/ConfigurableFeaturesTest.php      |  2 ++
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index d8850563825..36272bd6019 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -12,7 +12,7 @@
 use Hyde\Support\Contracts\SerializableContract;
 
 use function is_array;
-use function array_keys;
+use function array_map;
 use function array_filter;
 use function extension_loaded;
 use function in_array;
@@ -29,9 +29,7 @@ class Features implements SerializableContract
     /**
      * The features that are enabled.
      *
-     * @todo Simplify internal state complexity
-     *
-     * @var array<string, bool>
+     * @var array<string>
      */
     protected array $features = [];
 
@@ -55,7 +53,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return array_keys(array_filter(Hyde::features()->toArray()));
+        return Hyde::features()->features;
     }
 
     // =================================================
@@ -192,7 +190,7 @@ public function toArray(): array
     {
         return collect(Feature::cases())
             ->mapWithKeys(fn (Feature $feature): array => [
-                 $feature->value => isset($this->features[$feature->value]),
+                $feature->value => in_array($feature->value, $this->features),
             ])->toArray();
     }
 
@@ -204,23 +202,7 @@ protected static function getDefaultOptions(): array
 
     protected function boot(): array
     {
-        $options = static::getDefaultOptions();
-
-        $enabled = [];
-
-        // Set all default features to false
-        foreach ($options as $feature) {
-            $enabled[$feature->value] = false;
-        }
-
-        // Set all features to true if they are enabled in the config file
-        foreach ($this->getConfiguredFeatures() as $feature) {
-            if (in_array($feature, $options)) {
-                $enabled[$feature->value] = true;
-            }
-        }
-
-        return $enabled;
+        return array_map(fn (Feature $feature): string => $feature->value, $this->getConfiguredFeatures());
     }
 
     /** @return array<Feature> */
@@ -239,7 +221,12 @@ public static function mock(string|array $feature, bool $enabled = null): void
         $features = is_array($feature) ? $feature : [$feature => $enabled];
 
         foreach ($features as $feature => $enabled) {
-            Hyde::features()->features[$feature] = $enabled;
+            if ($enabled !== true) {
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
+                continue;
+            }
+
+            Hyde::features()->features[] = $feature;
         }
     }
 }
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index fcea406456a..3a67769abba 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -182,6 +182,8 @@ public function testGetEnabledUsesConfiguredOptions()
 
     public function testCannotUseArbitraryValuesInEnabledOptions()
     {
+        $this->expectException(\TypeError::class); // Todo: Consider if we should handle this again by ignoring it, or throw with a more specific message
+
         $config = [
             Features::htmlPages(),
             Features::markdownPosts(),

From ed86b9a722a1cf5237421098354baa10f6236966 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:38:06 +0200
Subject: [PATCH 1633/2811] Update test names to be clearer

---
 .../framework/tests/Unit/ConfigurableFeaturesUnitTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
index a7ba8225f77..affa5198563 100644
--- a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
+++ b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
@@ -11,7 +11,7 @@
     $this->needsKernel();
 });
 
-test('expect has method returns false when feature is disabled', function (Feature $feature) {
+test('has feature method returns false when feature is disabled', function (Feature $feature) {
     $method = "has$feature->name";
 
     Config::set('hyde.features', []);
@@ -20,7 +20,7 @@
     $this->assertFalse(Features::$method(), "Method '$method' should return false when feature is not enabled");
 })->with(Feature::cases())->covers(Hyde\Facades\Features::class);
 
-test('expect has method returns true when feature is enabled', function (Feature $feature) {
+test('has feature method returns true when feature is enabled', function (Feature $feature) {
     $method = "has$feature->name";
 
     Config::set('hyde.features', [$feature]);

From 25f467ca6640ddbbd96531e21d834efa35c04691 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:40:06 +0200
Subject: [PATCH 1634/2811] Update test to use enum cases instead of reflection

---
 packages/framework/tests/Unit/ConfigFileTest.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/ConfigFileTest.php b/packages/framework/tests/Unit/ConfigFileTest.php
index 8ea6dda5e80..d216f6c41f9 100644
--- a/packages/framework/tests/Unit/ConfigFileTest.php
+++ b/packages/framework/tests/Unit/ConfigFileTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Facades\Features;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
@@ -13,7 +13,6 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\UnitTestCase;
-use ReflectionClass;
 
 /**
  * @see \Hyde\Framework\Testing\Unit\HydeConfigFilesAreMatchingTest
@@ -79,7 +78,7 @@ public function testDefaultOutputDirectoriesValuesCoverAllCoreExtensionClasses()
     public function testDefaultFeaturesArrayMatchesDefaultFeatures()
     {
         expect($this->getConfig('features'))
-            ->toBe((new ReflectionClass(Features::class))->getMethod('getDefaultOptions')->invoke(null));
+            ->toBe(Feature::cases());
     }
 
     protected function getConfig(string $option): mixed

From 2276ecee0f1e4ae6027c0f3975cef2aa84ffc3d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:40:20 +0200
Subject: [PATCH 1635/2811] Inline helper method only used once

---
 packages/framework/src/Facades/Features.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 36272bd6019..32cc28cfff4 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -194,12 +194,6 @@ public function toArray(): array
             ])->toArray();
     }
 
-    /** @return array<Feature> */
-    protected static function getDefaultOptions(): array
-    {
-        return Feature::cases();
-    }
-
     protected function boot(): array
     {
         return array_map(fn (Feature $feature): string => $feature->value, $this->getConfiguredFeatures());
@@ -208,7 +202,7 @@ protected function boot(): array
     /** @return array<Feature> */
     protected function getConfiguredFeatures(): array
     {
-        return Config::getArray('hyde.features', static::getDefaultOptions());
+        return Config::getArray('hyde.features', Feature::cases());
     }
 
     /**

From 33c49b68e738223dcc10facab3414195a3841c34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:42:17 +0200
Subject: [PATCH 1636/2811] Test all enum cases have a features accessor

---
 .../framework/tests/Unit/ConfigurableFeaturesUnitTest.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
index affa5198563..ab9181af0b3 100644
--- a/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
+++ b/packages/framework/tests/Unit/ConfigurableFeaturesUnitTest.php
@@ -33,3 +33,9 @@
         Feature::Torchlight,
     ]))
 )->covers(Hyde\Facades\Features::class);
+
+test('all enum cases have a features accessor', function (Feature $feature) {
+    $method = "has$feature->name";
+
+    $this->assertTrue(method_exists(Features::class, $method), "Method '$method' should exist on Features facade");
+})->with(Feature::cases())->covers(Hyde\Facades\Features::class);

From 3568fe578eb721c6afe05284881d20fd9c6cc724 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 21:57:35 +0200
Subject: [PATCH 1637/2811] Format inline code in comment

---
 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 32cc28cfff4..57a559e8e64 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -163,7 +163,7 @@ public static function hasRss(): bool
 
     /**
      * Torchlight is by default enabled automatically when an API token
-     * is set in the .env file but is disabled when running tests.
+     * is set in the `.env` file but is disabled when running tests.
      */
     public static function hasTorchlight(): bool
     {

From db3d5f81fbc964dd101da0c7d02acbd5ddd812a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Apr 2024 22:06:08 +0200
Subject: [PATCH 1638/2811] Breaking: Replace feature config helper methods
 with enum usages

---
 RELEASE_NOTES.md                              | 50 ++++++++++++++++
 config/hyde.php                               | 19 +++---
 docs/creating-content/documentation-pages.md  |  4 +-
 packages/framework/config/hyde.php            | 19 +++---
 packages/framework/src/Facades/Features.php   | 60 +++----------------
 .../Framework/Services/ValidationService.php  |  3 +-
 .../Feature/ConfigurableFeaturesTest.php      | 25 ++++----
 .../tests/Feature/DarkmodeFeatureTest.php     | 20 +++----
 8 files changed, 103 insertions(+), 97 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9291bf16b26..369a951b155 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,6 +15,7 @@ This serves two purposes:
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
+- **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
@@ -70,6 +71,55 @@ The following configuration entries have been updated:
 -  Changed configuration option `docs.table_of_contents` to `docs.sidebar.table_of_contents` in https://github.com/hydephp/develop/pull/1584
 -  Upgrade path: Move the `table_of_contents` option's array in the `config/docs.php` file into the `sidebar` array in the same file.
 
+### Features configuration changes
+
+The `hyde.features` configuration format has changed to use Enums instead of static method calls. This change is breaking as it will require you to update your `config/hyde.php` file.
+
+#### Instead of
+
+```php
+// filepath: config/hyde.php
+
+'features' => [
+    // Page Modules
+    Features::htmlPages(),
+    Features::markdownPosts(),
+    Features::bladePages(),
+    Features::markdownPages(),
+    Features::documentationPages(),
+    
+    // Frontend Features
+    Features::darkmode(),
+    Features::documentationSearch(),
+    
+    // Integrations
+    Features::torchlight(),
+],
+```
+
+#### Use instead
+
+```php
+// filepath: config/hyde.php
+
+'features' => [
+    // Page Modules
+    Feature::HtmlPages,
+    Feature::MarkdownPosts,
+    Feature::BladePages,
+    Feature::MarkdownPages,
+    Feature::DocumentationPages,
+
+    // Frontend Features
+    Feature::Darkmode,
+    Feature::DocumentationSearch,
+
+    // Integrations
+    Feature::Torchlight,
+],
+```
+
+Of course, if you have disabled any of the features, do not include them in the new array.
 
 ## General impact
 
diff --git a/config/hyde.php b/config/hyde.php
index c91370adce7..b343067a44c 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -23,8 +23,8 @@
 */
 
 use Hyde\Facades\Author;
-use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
+use Hyde\Foundation\Concerns\Feature;
 
 return [
 
@@ -248,24 +248,23 @@
     |
     | Some of Hyde's features are optional. Feel free to disable the features
     | you don't need by removing or commenting them out from this array.
-    | This config concept is directly inspired by Laravel Jetstream.
     |
     */
 
     '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/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 1e9839e8539..aed6f445be6 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -290,12 +290,12 @@ that runs during the build command, and a frontend JavaScript plugin that adds t
 
 >info Tip: The HydeSearch plugin is what powers the search feature on this site! Why not [try it out](search)?
 
-The search feature is enabled by default. You can disable it by removing the `documentationSearch` from the Hyde `Features` config array.
+The search feature is enabled by default. You can disable it by removing the `DocumentationSearch` option from the Hyde `Features` config array.
 
 ```php
 // filepath: config/hyde.php
 'features' => [
-    Features::documentationSearch(), // [tl! --]
+    Feature::DocumentationSearch, // [tl! --]
 ],
 ```
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index c91370adce7..b343067a44c 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -23,8 +23,8 @@
 */
 
 use Hyde\Facades\Author;
-use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
+use Hyde\Foundation\Concerns\Feature;
 
 return [
 
@@ -248,24 +248,23 @@
     |
     | Some of Hyde's features are optional. Feel free to disable the features
     | you don't need by removing or commenting them out from this array.
-    | This config concept is directly inspired by Laravel Jetstream.
     |
     */
 
     '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
index 57a559e8e64..dd73fc2fc0c 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -56,82 +56,38 @@ public static function enabled(): array
         return Hyde::features()->features;
     }
 
-    // =================================================
-    // Configure features to be used in the config file.
-    // =================================================
-
-    public static function htmlPages(): Feature
-    {
-        return Feature::HtmlPages;
-    }
-
-    public static function bladePages(): Feature
-    {
-        return Feature::BladePages;
-    }
-
-    public static function markdownPages(): Feature
-    {
-        return Feature::MarkdownPages;
-    }
-
-    public static function markdownPosts(): Feature
-    {
-        return Feature::MarkdownPosts;
-    }
-
-    public static function documentationPages(): Feature
-    {
-        return Feature::DocumentationPages;
-    }
-
-    public static function documentationSearch(): Feature
-    {
-        return Feature::DocumentationSearch;
-    }
-
-    public static function darkmode(): Feature
-    {
-        return Feature::Darkmode;
-    }
-
-    public static function torchlight(): Feature
-    {
-        return Feature::Torchlight;
-    }
-
     // ================================================
     // Determine if a given feature is enabled.
     // ================================================
 
     public static function hasHtmlPages(): bool
     {
-        return static::has(static::htmlPages());
+        return static::has(Feature::HtmlPages);
     }
 
     public static function hasBladePages(): bool
     {
-        return static::has(static::bladePages());
+        return static::has(Feature::BladePages);
     }
 
     public static function hasMarkdownPages(): bool
     {
-        return static::has(static::markdownPages());
+        return static::has(Feature::MarkdownPages);
     }
 
     public static function hasMarkdownPosts(): bool
     {
-        return static::has(static::markdownPosts());
+        return static::has(Feature::MarkdownPosts);
     }
 
     public static function hasDocumentationPages(): bool
     {
-        return static::has(static::documentationPages());
+        return static::has(Feature::DocumentationPages);
     }
 
     public static function hasDarkmode(): bool
     {
-        return static::has(static::darkmode());
+        return static::has(Feature::Darkmode);
     }
 
     // ====================================================
@@ -167,14 +123,14 @@ public static function hasRss(): bool
      */
     public static function hasTorchlight(): bool
     {
-        return static::has(static::torchlight())
+        return static::has(Feature::Torchlight)
             && (Config::getNullableString('torchlight.token') !== null)
             && (app('env') !== 'testing');
     }
 
     public static function hasDocumentationSearch(): bool
     {
-        return static::has(static::documentationSearch())
+        return static::has(Feature::DocumentationSearch)
             && static::hasDocumentationPages()
             && count(DocumentationPage::files()) > 0;
     }
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index fc62734ce59..307e3eb3fa9 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\Concerns\Feature;
 use Hyde\Support\Models\ValidationResult as Result;
 
 use function count;
@@ -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::has(Features::torchlight())) {
+        if (! Features::has(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/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 3a67769abba..8ff74c14457 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Features;
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\Concerns\Feature;
 use Illuminate\Support\Facades\Config;
 
 use function config;
@@ -82,9 +83,9 @@ public function testToArrayMethodContainsAllSettings()
     public function testToArrayMethodContainsAllSettingsIncludingFalseValues()
     {
         config(['hyde.features' => [
-            Features::htmlPages(),
-            Features::markdownPosts(),
-            Features::bladePages(),
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
         ]]);
 
         $this->assertSame([
@@ -102,9 +103,9 @@ public function testToArrayMethodContainsAllSettingsIncludingFalseValues()
     public function testSerializedClassState()
     {
         config(['hyde.features' => [
-            Features::htmlPages(),
-            Features::markdownPosts(),
-            Features::bladePages(),
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
         ]]);
 
         $this->assertSame(<<<'JSON'
@@ -168,9 +169,9 @@ public function testGetEnabledUsesDefaultOptionsWhenConfigIsEmpty()
     public function testGetEnabledUsesConfiguredOptions()
     {
         config(['hyde.features' => [
-            Features::htmlPages(),
-            Features::markdownPosts(),
-            Features::bladePages(),
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
         ]]);
 
         $this->assertSame([
@@ -185,9 +186,9 @@ public function testCannotUseArbitraryValuesInEnabledOptions()
         $this->expectException(\TypeError::class); // Todo: Consider if we should handle this again by ignoring it, or throw with a more specific message
 
         $config = [
-            Features::htmlPages(),
-            Features::markdownPosts(),
-            Features::bladePages(),
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
             'foo',
         ];
 
diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 0e8a72f95bf..2e6fcfb4831 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -7,11 +7,11 @@
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use Hyde\Foundation\Concerns\Feature;
 use Illuminate\Support\Facades\Config;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 
 /**
- * @covers \Hyde\Facades\Features::darkmode
  * @covers \Hyde\Facades\Features::hasDarkmode
  */
 class DarkmodeFeatureTest extends TestCase
@@ -34,7 +34,7 @@ public function testHasDarkmodeIsFalseWhenNotSet()
     public function testHasDarkmodeIsTrueWhenSet()
     {
         Config::set('hyde.features', [
-            Features::darkmode(),
+            Feature::Darkmode,
         ]);
 
         $this->assertTrue(Features::hasDarkmode());
@@ -43,9 +43,9 @@ public function testHasDarkmodeIsTrueWhenSet()
     public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     {
         Config::set('hyde.features', [
-            Features::markdownPages(),
-            Features::bladePages(),
-            Features::darkmode(),
+            Feature::MarkdownPages,
+            Feature::BladePages,
+            Feature::Darkmode,
         ]);
 
         app()->instance('navigation.main', new MainNavigationMenu());
@@ -63,8 +63,8 @@ public function testLayoutHasToggleButtonAndScriptWhenEnabled()
     public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
     {
         Config::set('hyde.features', [
-            Features::documentationPages(),
-            Features::darkmode(),
+            Feature::DocumentationPages,
+            Feature::Darkmode,
         ]);
 
         view()->share('page', new DocumentationPage());
@@ -82,8 +82,8 @@ public function testDocumentationPageHasToggleButtonAndScriptWhenEnabled()
     public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     {
         Config::set('hyde.features', [
-            Features::markdownPages(),
-            Features::bladePages(),
+            Feature::MarkdownPages,
+            Feature::BladePages,
         ]);
 
         app()->instance('navigation.main', new MainNavigationMenu());
@@ -101,7 +101,7 @@ public function testDarkModeThemeButtonIsHiddenInLayoutsWhenDisabled()
     public function testDarkModeThemeButtonIsHiddenInDocumentationPagesWhenDisabled()
     {
         Config::set('hyde.features', [
-            Features::documentationPages(),
+            Feature::DocumentationPages,
         ]);
 
         view()->share('page', new DocumentationPage());

From 049e894fdc21787327fa9f2a8ba80d8d5e83d3d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 10:59:25 +0200
Subject: [PATCH 1639/2811] Add method description

---
 packages/framework/src/Facades/Features.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index dd73fc2fc0c..ad98c601280 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -128,6 +128,9 @@ public static function hasTorchlight(): bool
             && (app('env') !== 'testing');
     }
 
+    /**
+     * Should documentation search be enabled?
+     */
     public static function hasDocumentationSearch(): bool
     {
         return static::has(Feature::DocumentationSearch)

From dfb56d58e0f9e0531e4b5e384fdebc316e9a07af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:26:47 +0200
Subject: [PATCH 1640/2811] Move up method in source

---
 packages/framework/src/Facades/Features.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index ad98c601280..ef90e5be6e6 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -117,6 +117,16 @@ public static function hasRss(): bool
             && count(MarkdownPost::files()) > 0;
     }
 
+    /**
+     * Should documentation search be enabled?
+     */
+    public static function hasDocumentationSearch(): bool
+    {
+        return static::has(Feature::DocumentationSearch)
+            && static::hasDocumentationPages()
+            && count(DocumentationPage::files()) > 0;
+    }
+
     /**
      * Torchlight is by default enabled automatically when an API token
      * is set in the `.env` file but is disabled when running tests.
@@ -128,16 +138,6 @@ public static function hasTorchlight(): bool
             && (app('env') !== 'testing');
     }
 
-    /**
-     * Should documentation search be enabled?
-     */
-    public static function hasDocumentationSearch(): bool
-    {
-        return static::has(Feature::DocumentationSearch)
-            && static::hasDocumentationPages()
-            && count(DocumentationPage::files()) > 0;
-    }
-
     /**
      * Get an array representation of the features and their status.
      *

From ed72df638b28c55bc6ea6de7f33d98403e380dac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:26:58 +0200
Subject: [PATCH 1641/2811] Remove legacy section comments for simplified class

---
 packages/framework/src/Facades/Features.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index ef90e5be6e6..7b4d78855cd 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -56,10 +56,6 @@ public static function enabled(): array
         return Hyde::features()->features;
     }
 
-    // ================================================
-    // Determine if a given feature is enabled.
-    // ================================================
-
     public static function hasHtmlPages(): bool
     {
         return static::has(Feature::HtmlPages);
@@ -90,11 +86,6 @@ public static function hasDarkmode(): bool
         return static::has(Feature::Darkmode);
     }
 
-    // ====================================================
-    // Dynamic features that in addition to being enabled
-    // in the config file, require preconditions to be met.
-    // ====================================================
-
     /**
      * Can a sitemap be generated?
      */

From 89d735d21f45b526a8ec93add18bdd1b386e0fe5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:29:48 +0200
Subject: [PATCH 1642/2811] Replace local collect call with array helper

---
 packages/framework/src/Facades/Features.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 7b4d78855cd..32d365a0bfc 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -10,6 +10,7 @@
 use Hyde\Foundation\Concerns\Feature;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
+use Illuminate\Support\Arr;
 
 use function is_array;
 use function array_map;
@@ -138,10 +139,9 @@ public static function hasTorchlight(): bool
      */
     public function toArray(): array
     {
-        return collect(Feature::cases())
-            ->mapWithKeys(fn (Feature $feature): array => [
-                $feature->value => in_array($feature->value, $this->features),
-            ])->toArray();
+        return Arr::mapWithKeys(Feature::cases(), fn (Feature $feature): array => [
+            $feature->value => in_array($feature->value, $this->features),
+        ]);
     }
 
     protected function boot(): array

From f7f9c37a3ffa8ffab0042e28ea19adb841a91346 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:55:52 +0200
Subject: [PATCH 1643/2811] Use array helper to match code style

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 32d365a0bfc..28271088802 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -13,7 +13,6 @@
 use Illuminate\Support\Arr;
 
 use function is_array;
-use function array_map;
 use function array_filter;
 use function extension_loaded;
 use function in_array;
@@ -146,7 +145,7 @@ public function toArray(): array
 
     protected function boot(): array
     {
-        return array_map(fn (Feature $feature): string => $feature->value, $this->getConfiguredFeatures());
+        return Arr::map($this->getConfiguredFeatures(), fn (Feature $feature): string => $feature->value);
     }
 
     /** @return array<Feature> */

From a22ecba039a40b366716afc7364838e42153acef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:57:02 +0200
Subject: [PATCH 1644/2811] Convert the arrow function to a traditional closure

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 28271088802..b8b4549d0ca 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -145,7 +145,9 @@ public function toArray(): array
 
     protected function boot(): array
     {
-        return Arr::map($this->getConfiguredFeatures(), fn (Feature $feature): string => $feature->value);
+        return Arr::map($this->getConfiguredFeatures(), function (Feature $feature): string {
+            return $feature->value;
+        });
     }
 
     /** @return array<Feature> */

From 15ca74580ed73864559c75adde6263c723848882 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:57:34 +0200
Subject: [PATCH 1645/2811] Replace continue with else branch

---
 packages/framework/src/Facades/Features.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index b8b4549d0ca..c1ac25b4a56 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -168,10 +168,9 @@ public static function mock(string|array $feature, bool $enabled = null): void
         foreach ($features as $feature => $enabled) {
             if ($enabled !== true) {
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
-                continue;
+            } else {
+                Hyde::features()->features[] = $feature;
             }
-
-            Hyde::features()->features[] = $feature;
         }
     }
 }

From a1fecf24a3a68fb2ea8c8712bee344bec6948dad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:58:23 +0200
Subject: [PATCH 1646/2811] Inline local variable

---
 packages/framework/src/Facades/Features.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index c1ac25b4a56..512d84df901 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -163,9 +163,7 @@ protected function getConfiguredFeatures(): array
      */
     public static function mock(string|array $feature, bool $enabled = null): void
     {
-        $features = is_array($feature) ? $feature : [$feature => $enabled];
-
-        foreach ($features as $feature => $enabled) {
+        foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
             if ($enabled !== true) {
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
             } else {

From d27a4168c7e8e53fcd69164d92da1e32a15feec8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:58:49 +0200
Subject: [PATCH 1647/2811] Invert 'if' statement

---
 packages/framework/src/Facades/Features.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 512d84df901..b5098197052 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -164,10 +164,10 @@ protected function getConfiguredFeatures(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            if ($enabled !== true) {
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
-            } else {
+            if ($enabled === true) {
                 Hyde::features()->features[] = $feature;
+            } else {
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
             }
         }
     }

From 64f438b5db2c256c485b32763bf5be05e86227c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 11:58:52 +0200
Subject: [PATCH 1648/2811] Revert "Invert 'if' statement"

This reverts commit d27a4168c7e8e53fcd69164d92da1e32a15feec8.
---
 packages/framework/src/Facades/Features.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index b5098197052..512d84df901 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -164,10 +164,10 @@ protected function getConfiguredFeatures(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            if ($enabled === true) {
-                Hyde::features()->features[] = $feature;
-            } else {
+            if ($enabled !== true) {
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
+            } else {
+                Hyde::features()->features[] = $feature;
             }
         }
     }

From 17f0021b3e9843ba47f81700ed61db9d67cc0d91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 12:06:44 +0200
Subject: [PATCH 1649/2811] Simplify internal state to store the enums directly

---
 packages/framework/src/Facades/Features.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 512d84df901..d155c0494e7 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -29,7 +29,7 @@ class Features implements SerializableContract
     /**
      * The features that are enabled.
      *
-     * @var array<string>
+     * @var array<Feature>
      */
     protected array $features = [];
 
@@ -43,7 +43,7 @@ public function __construct()
      */
     public static function has(Feature $feature): bool
     {
-        return in_array($feature->value, static::enabled());
+        return in_array($feature, Hyde::features()->features);
     }
 
     /**
@@ -53,7 +53,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return Hyde::features()->features;
+        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => $feature->value);
     }
 
     public static function hasHtmlPages(): bool
@@ -139,15 +139,13 @@ public static function hasTorchlight(): bool
     public function toArray(): array
     {
         return Arr::mapWithKeys(Feature::cases(), fn (Feature $feature): array => [
-            $feature->value => in_array($feature->value, $this->features),
+            $feature->value => static::has($feature),
         ]);
     }
 
     protected function boot(): array
     {
-        return Arr::map($this->getConfiguredFeatures(), function (Feature $feature): string {
-            return $feature->value;
-        });
+        return $this->getConfiguredFeatures();
     }
 
     /** @return array<Feature> */
@@ -165,9 +163,9 @@ public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
             if ($enabled !== true) {
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (string $search): bool => $search !== $feature);
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== Feature::from($feature));
             } else {
-                Hyde::features()->features[] = $feature;
+                Hyde::features()->features[] = Feature::from($feature);
             }
         }
     }

From 36e8e2f28634be14deb3d28a063f3000b9aea0b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 12:08:07 +0200
Subject: [PATCH 1650/2811] Inline simplified helper method

---
 packages/framework/src/Facades/Features.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index d155c0494e7..643c445b870 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -35,7 +35,7 @@ class Features implements SerializableContract
 
     public function __construct()
     {
-        $this->features = $this->boot();
+        $this->features = $this->getConfiguredFeatures();
     }
 
     /**
@@ -143,11 +143,6 @@ public function toArray(): array
         ]);
     }
 
-    protected function boot(): array
-    {
-        return $this->getConfiguredFeatures();
-    }
-
     /** @return array<Feature> */
     protected function getConfiguredFeatures(): array
     {

From b11bc97a784947b9f2a5c90159c259df2bebfe74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 12:08:16 +0200
Subject: [PATCH 1651/2811] Inline simplified helper method

---
 packages/framework/src/Facades/Features.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 643c445b870..0c0ba5efc9d 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -35,7 +35,7 @@ class Features implements SerializableContract
 
     public function __construct()
     {
-        $this->features = $this->getConfiguredFeatures();
+        $this->features = Config::getArray('hyde.features', Feature::cases());
     }
 
     /**
@@ -143,12 +143,6 @@ public function toArray(): array
         ]);
     }
 
-    /** @return array<Feature> */
-    protected function getConfiguredFeatures(): array
-    {
-        return Config::getArray('hyde.features', Feature::cases());
-    }
-
     /**
      * @internal This method is not covered by the backward compatibility promise.
      *

From fd0eaf15bd6d4d7e96e1c66e8046010c6fb8f075 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 12:08:52 +0200
Subject: [PATCH 1652/2811] Use fully qualified class name in generics

---
 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 0c0ba5efc9d..f105b9bb3a7 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -29,7 +29,7 @@ class Features implements SerializableContract
     /**
      * The features that are enabled.
      *
-     * @var array<Feature>
+     * @var array<\Hyde\Foundation\Concerns\Feature>
      */
     protected array $features = [];
 

From 95574d2be57dc5f93e5d4f64200a713f113de53a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:37:07 +0200
Subject: [PATCH 1653/2811] Extract helper to get the enum key

---
 packages/framework/src/Enums/Feature.php    | 5 +++++
 packages/framework/src/Facades/Features.php | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 073ef90f2f8..2b0a1125f05 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -24,4 +24,9 @@ enum Feature: string
 
     // Integrations
     case Torchlight = 'torchlight';
+
+    public function key(): string
+    {
+        return $this->value;
+    }
 }
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 078d40d2375..6c39d10d8ee 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -53,7 +53,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => $feature->value);
+        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => $feature->key());
     }
 
     public static function hasHtmlPages(): bool
@@ -139,7 +139,7 @@ public static function hasTorchlight(): bool
     public function toArray(): array
     {
         return Arr::mapWithKeys(Feature::cases(), fn (Feature $feature): array => [
-            $feature->value => static::has($feature),
+            $feature->key() => static::has($feature),
         ]);
     }
 

From 217b7bafbd110c4079ea24da42c0407fdebe2880 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:37:39 +0200
Subject: [PATCH 1654/2811] Get key using string name transformation

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

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 2b0a1125f05..bf4206c5608 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Enums;
 
+use Illuminate\Support\Str;
+
 /**
  * A configurable feature that belongs to the Features class.
  *
@@ -27,6 +29,6 @@ enum Feature: string
 
     public function key(): string
     {
-        return $this->value;
+        return Str::kebab($this->name);
     }
 }

From d2b1ef6e07e2ec834f3f18a9c1ae512e0ef96170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:39:39 +0200
Subject: [PATCH 1655/2811] Introduce local variable

---
 packages/framework/src/Facades/Features.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 6c39d10d8ee..af9f49a9bca 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -151,10 +151,12 @@ public function toArray(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
+            $feature = Feature::from($feature);
+
             if ($enabled !== true) {
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== Feature::from($feature));
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== $feature);
             } else {
-                Hyde::features()->features[] = Feature::from($feature);
+                Hyde::features()->features[] = $feature;
             }
         }
     }

From edf8e989d9299d56dd0b8ec86d4f6ca565822563 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:42:40 +0200
Subject: [PATCH 1656/2811] Change search logic in preparation for next
 refactor step

---
 packages/framework/src/Facades/Features.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index af9f49a9bca..43d36cffc72 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Enums\Feature;
@@ -12,6 +13,8 @@
 use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Support\Arr;
 
+use function ucfirst;
+use function collect;
 use function is_array;
 use function array_filter;
 use function extension_loaded;
@@ -151,7 +154,7 @@ public function toArray(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            $feature = Feature::from($feature);
+            $feature = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => $search->name === ucfirst(Str::camel($feature)));
 
             if ($enabled !== true) {
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== $feature);

From 5b050f7764f4dbc1af8a2fa3084b7933d75715f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:44:06 +0200
Subject: [PATCH 1657/2811] Inline the key method

---
 packages/framework/src/Enums/Feature.php    | 7 -------
 packages/framework/src/Facades/Features.php | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index bf4206c5608..073ef90f2f8 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Enums;
 
-use Illuminate\Support\Str;
-
 /**
  * A configurable feature that belongs to the Features class.
  *
@@ -26,9 +24,4 @@ enum Feature: string
 
     // Integrations
     case Torchlight = 'torchlight';
-
-    public function key(): string
-    {
-        return Str::kebab($this->name);
-    }
 }
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 43d36cffc72..1b2726ac454 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -56,7 +56,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => $feature->key());
+        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => Str::kebab($feature->name));
     }
 
     public static function hasHtmlPages(): bool
@@ -142,7 +142,7 @@ public static function hasTorchlight(): bool
     public function toArray(): array
     {
         return Arr::mapWithKeys(Feature::cases(), fn (Feature $feature): array => [
-            $feature->key() => static::has($feature),
+            Str::kebab($feature->name) => static::has($feature),
         ]);
     }
 

From cb136f9a296ced4c2a0bae190d6d72cc0f653c56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 18:24:15 +0200
Subject: [PATCH 1658/2811] Add temporary kebab case support helper

---
 packages/framework/src/Enums/Feature.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 073ef90f2f8..8048fb6229d 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 Temporary kebab case support */
+    public static function from(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,
+        };
+    }
 }

From 649fd9d5ee3e38aaa50b71a32ce34dfce7337dbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 17:46:17 +0200
Subject: [PATCH 1659/2811] Remove string backing from Feature enum

This information does not add any actual value
---
 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 8048fb6229d..f5d0577edf3 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 Temporary kebab case support */
     public static function from(string $name): self

From 3bf22266207d78a57a5d6af3195c9d78353fb5a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Apr 2024 18:28:37 +0200
Subject: [PATCH 1660/2811] Revert "Change search logic in preparation for next
 refactor step"

This reverts commit edf8e989d9299d56dd0b8ec86d4f6ca565822563.
---
 packages/framework/src/Facades/Features.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 1b2726ac454..ac4b8a3f839 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -13,8 +13,6 @@
 use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Support\Arr;
 
-use function ucfirst;
-use function collect;
 use function is_array;
 use function array_filter;
 use function extension_loaded;
@@ -154,7 +152,7 @@ public function toArray(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            $feature = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => $search->name === ucfirst(Str::camel($feature)));
+            $feature = Feature::from($feature);
 
             if ($enabled !== true) {
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== $feature);

From 0979b2988c5ce068d4837af5c2f0d53faebfd7ac 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 1661/2811] 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 bc4e8de71fb..64dbaedd683 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;
@@ -61,7 +62,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 56110d2ee69f258ae904507ec48814d48bf98a24 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Apr 2024 13:46:50 +0200
Subject: [PATCH 1662/2811] Remove support for checking feature state using
 string

---
 packages/framework/src/Foundation/HydeKernel.php    | 4 ++--
 packages/framework/src/Hyde.php                     | 2 +-
 packages/framework/tests/Feature/HydeKernelTest.php | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index ffe1290d1fc..0283a4fbc37 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -92,9 +92,9 @@ public function features(): Features
         return $this->features ??= new Features();
     }
 
-    public function hasFeature(Feature|string $feature): bool
+    public function hasFeature(Feature $feature): bool
     {
-        return Features::has($feature instanceof Feature ? $feature : Feature::from($feature));
+        return Features::has($feature);
     }
 
     /** @inheritDoc */
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)
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index e156efa5eff..ddfc83edb60 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -78,7 +78,6 @@ public function testFeaturesHelperReturnsNewFeaturesInstance()
     public function testHasFeatureHelperCallsMethodOnFeaturesClass()
     {
         $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature(Feature::BladePages));
-        $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature('blade-pages'));
     }
 
     public function testCurrentPageHelperReturnsCurrentPageName()

From 6b1c11d892674c12b43598207203b8065c338879 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 12:49:10 +0200
Subject: [PATCH 1663/2811] Properly merge in feature class changes from master

---
 packages/framework/src/Facades/Features.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 078d40d2375..3ce7c204e80 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Enums\Feature;
@@ -12,6 +13,7 @@
 use Hyde\Support\Contracts\SerializableContract;
 use Illuminate\Support\Arr;
 
+use function collect;
 use function is_array;
 use function array_filter;
 use function extension_loaded;
@@ -53,7 +55,7 @@ public static function has(Feature $feature): bool
      */
     public static function enabled(): array
     {
-        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => $feature->value);
+        return Arr::map(Hyde::features()->features, fn (Feature $feature): string => Str::kebab($feature->name));
     }
 
     public static function hasHtmlPages(): bool
@@ -139,7 +141,7 @@ public static function hasTorchlight(): bool
     public function toArray(): array
     {
         return Arr::mapWithKeys(Feature::cases(), fn (Feature $feature): array => [
-            $feature->value => static::has($feature),
+            Str::kebab($feature->name) => static::has($feature),
         ]);
     }
 
@@ -152,9 +154,9 @@ public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
             if ($enabled !== true) {
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => $search !== Feature::from($feature));
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
             } else {
-                Hyde::features()->features[] = Feature::from($feature);
+                Hyde::features()->features[] = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => Str::kebab($search->name) === $feature);
             }
         }
     }

From 6ed0e87632b0835d9111e0ee8895858bd3ec4278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 14:27:10 +0200
Subject: [PATCH 1664/2811] Update kernel feature helper to only support enum
 cases

This was deprecated in HydePHP v1.6
---
 RELEASE_NOTES.md                                    | 1 +
 packages/framework/src/Foundation/HydeKernel.php    | 4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 369a951b155..89b99818e25 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,7 @@ This serves two purposes:
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index ffe1290d1fc..0283a4fbc37 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -92,9 +92,9 @@ public function features(): Features
         return $this->features ??= new Features();
     }
 
-    public function hasFeature(Feature|string $feature): bool
+    public function hasFeature(Feature $feature): bool
     {
-        return Features::has($feature instanceof Feature ? $feature : Feature::from($feature));
+        return Features::has($feature);
     }
 
     /** @inheritDoc */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index e156efa5eff..ddfc83edb60 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -78,7 +78,6 @@ public function testFeaturesHelperReturnsNewFeaturesInstance()
     public function testHasFeatureHelperCallsMethodOnFeaturesClass()
     {
         $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature(Feature::BladePages));
-        $this->assertSame(Features::has(Feature::BladePages), Hyde::hasFeature('blade-pages'));
     }
 
     public function testCurrentPageHelperReturnsCurrentPageName()

From f83c1df6eacfead7dc1832c9d23802aed9343059 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 12:30:38 +0200
Subject: [PATCH 1665/2811] Change default build task message

---
 .../src/Framework/Features/BuildTasks/BuildTask.php         | 2 +-
 packages/framework/tests/Unit/BuildTaskUnitTest.php         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
index 76a50aa382e..7d533436df8 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
@@ -20,7 +20,7 @@ abstract class BuildTask
     use TracksExecutionTime;
 
     /** @var string The message that will be displayed when the task is run. */
-    protected static string $message = 'Running generic build task';
+    protected static string $message = 'Running build task';
 
     protected int $exitCode = Command::SUCCESS;
 
diff --git a/packages/framework/tests/Unit/BuildTaskUnitTest.php b/packages/framework/tests/Unit/BuildTaskUnitTest.php
index 1a0d540cb2b..0b2450314aa 100644
--- a/packages/framework/tests/Unit/BuildTaskUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskUnitTest.php
@@ -60,7 +60,7 @@ public function testItPrintsStartMessage()
     {
         $task = tap(new BufferedTestBuildTask(), fn ($task) => $task->run());
 
-        $this->assertStringContainsString('Running generic build task', $task->buffer[0]);
+        $this->assertStringContainsString('Running build task', $task->buffer[0]);
     }
 
     public function testItPrintsFinishMessage()
@@ -95,7 +95,7 @@ public function testRunMethodReturnsExitCode()
 
     public function testCanGetMessage()
     {
-        $this->assertSame('Running generic build task', (new BufferedTestBuildTask())->getMessage());
+        $this->assertSame('Running build task', (new BufferedTestBuildTask())->getMessage());
     }
 
     public function testCanGetCustomMessage()
@@ -109,7 +109,7 @@ public function testCanPrintStartMessage()
     {
         $task = tap(new BufferedTestBuildTask(), fn ($task) => $task->printStartMessage());
 
-        $this->assertSame('<comment>Running generic build task...</comment>', trim($task->buffer[0]));
+        $this->assertSame('<comment>Running build task...</comment>', trim($task->buffer[0]));
     }
 
     public function testCanPrintCustomStartMessage()

From 13f3455653dd168053bd26d7333bd87c076b75c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 12:31:18 +0200
Subject: [PATCH 1666/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 89b99818e25..5b0b17ed1c2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,7 @@ This serves two purposes:
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
+- Minor: Changed the default build task message to make it more concise in https://github.com/hydephp/develop/pull/1659
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.

From f79a1caa79ba73193ce8b96cab3f0885ebe590c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 20:15:54 +0200
Subject: [PATCH 1667/2811] Invert 'if' statement

---
 packages/framework/src/Facades/Features.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 3ce7c204e80..59f8261d783 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -153,10 +153,10 @@ public function toArray(): array
     public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            if ($enabled !== true) {
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
-            } else {
+            if ($enabled === true) {
                 Hyde::features()->features[] = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => Str::kebab($search->name) === $feature);
+            } else {
+                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
             }
         }
     }

From 71427d8136c7f6ffdd24c3af04f05781a819cc1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 20:16:05 +0200
Subject: [PATCH 1668/2811] Comment code

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

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index 59f8261d783..f67f3a69a80 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -154,8 +154,10 @@ public static function mock(string|array $feature, bool $enabled = null): void
     {
         foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
             if ($enabled === true) {
+                // Add the feature if it doesn't already exist.
                 Hyde::features()->features[] = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => Str::kebab($search->name) === $feature);
             } else {
+                // Remove the feature if it exists.
                 Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
             }
         }

From 998ef3d41badefac7d98c76df6fcc05f3d701d0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Apr 2024 20:25:51 +0200
Subject: [PATCH 1669/2811] Simplify internal mocking helper

Lost this when merging https://github.com/hydephp/develop/pull/1651
---
 packages/framework/src/Facades/Features.php   | 23 +++++++------------
 .../Feature/ConfigurableFeaturesTest.php      | 12 ++++------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index f67f3a69a80..d1a07cd6c28 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -14,7 +14,6 @@
 use Illuminate\Support\Arr;
 
 use function collect;
-use function is_array;
 use function array_filter;
 use function extension_loaded;
 use function in_array;
@@ -145,21 +144,15 @@ public function toArray(): array
         ]);
     }
 
-    /**
-     * @internal This method is not covered by the backward compatibility promise.
-     *
-     * @param  string|array<string, bool>  $feature
-     */
-    public static function mock(string|array $feature, bool $enabled = null): void
+    /** @internal This method is not covered by the backward compatibility promise. */
+    public static function mock(string $feature, bool $enabled = null): void
     {
-        foreach (is_array($feature) ? $feature : [$feature => $enabled] as $feature => $enabled) {
-            if ($enabled === true) {
-                // Add the feature if it doesn't already exist.
-                Hyde::features()->features[] = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => Str::kebab($search->name) === $feature);
-            } else {
-                // Remove the feature if it exists.
-                Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
-            }
+        if ($enabled === true) {
+            // Add the feature if it doesn't already exist.
+            Hyde::features()->features[] = collect(Feature::cases())->firstOrFail(fn (Feature $search): bool => Str::kebab($search->name) === $feature);
+        } else {
+            // Remove the feature if it exists.
+            Hyde::features()->features = array_filter(Hyde::features()->features, fn (Feature $search): bool => Str::kebab($search->name) !== $feature);
         }
     }
 }
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index d3eeaad9297..7d076d1498f 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -133,18 +133,14 @@ public function testFeaturesCanBeMocked()
 
     public function testMultipleFeaturesCanBeMocked()
     {
-        Features::mock([
-            'blade-pages' => true,
-            'darkmode' => true,
-        ]);
+        Features::mock('blade-pages', true);
+        Features::mock('darkmode', true);
 
         $this->assertTrue(Features::hasBladePages());
         $this->assertTrue(Features::hasDarkmode());
 
-        Features::mock([
-            'blade-pages' => false,
-            'darkmode' => false,
-        ]);
+        Features::mock('blade-pages', false);
+        Features::mock('darkmode', false);
 
         $this->assertFalse(Features::hasBladePages());
         $this->assertFalse(Features::hasDarkmode());

From 6ed117bc0ba73f24a7871921bc05a04e5b138ec9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 16:57:51 +0200
Subject: [PATCH 1670/2811] Run workflow on all branches

---
 .github/workflows/static-analysis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index f0b34dc94d9..ea95ebd45a8 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -2,7 +2,6 @@ name: 🔎 Static Analysis
 
 on:
   pull_request:
-    branches: [ "master" ]
 
 jobs:
 

From c660d36fa0123c108a740d6661068877c461ce14 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 16:58:03 +0200
Subject: [PATCH 1671/2811] Add type annotation for wrapped array

---
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7329b6bfbe9..2dc4c0e61c5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -56,6 +56,7 @@ public function getItems(): Collection
      */
     public function add(NavigationItem|NavigationGroup|array $items): static
     {
+        /** @var \Hyde\Framework\Features\Navigation\NavigationItem $item */
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
         }

From 9703afb7ac7e6afa47443f2691eead3204a8967b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 17:30:24 +0200
Subject: [PATCH 1672/2811] Type annotate container access

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 .../src/Framework/Features/Navigation/MainNavigationMenu.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 6e8332b8ad2..e8b0aa78c2e 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -19,7 +19,10 @@ class DocumentationSidebar extends NavigationMenu
      */
     public static function get(): static
     {
-        return app('navigation.sidebar');
+        /** @var self::class $menu */
+        $menu = app('navigation.sidebar');
+
+        return $menu;
     }
 
     public function __construct(Arrayable|array $items = [])
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index e6681c42ffd..f735186d29f 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -10,6 +10,9 @@ class MainNavigationMenu extends NavigationMenu
 {
     public static function get(): static
     {
-        return app('navigation.main');
+        /** @var self::class $menu */
+        $menu = app('navigation.main');
+
+        return $menu;
     }
 }

From 2efd122f53beb115e1b8c3480401dcc4369e1d9d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 17:52:12 +0200
Subject: [PATCH 1673/2811] Create .phpstorm.meta.php

---
 .phpstorm.meta.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .phpstorm.meta.php

diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
new file mode 100644
index 00000000000..f7f7bf84097
--- /dev/null
+++ b/.phpstorm.meta.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPSTORM_META {
+    override(\app(0), map([
+        'navigation.main' => \Hyde\Framework\Features\Navigation\MainNavigationMenu::class,
+        'navigation.sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::class,
+    ]));
+}

From 617142a189dfdfb8a4ec09279f9ab8c6cdf2bede Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:03:55 +0200
Subject: [PATCH 1674/2811] Create sdf.meta.php

---
 .phpstorm.meta.php => .phpstorm.meta.php/sdf.meta.php | 4 ++++
 1 file changed, 4 insertions(+)
 rename .phpstorm.meta.php => .phpstorm.meta.php/sdf.meta.php (73%)

diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php/sdf.meta.php
similarity index 73%
rename from .phpstorm.meta.php
rename to .phpstorm.meta.php/sdf.meta.php
index f7f7bf84097..8ac94568820 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php/sdf.meta.php
@@ -1,8 +1,12 @@
 <?php
 
 namespace PHPSTORM_META {
+
     override(\app(0), map([
+        '' => '@',
         'navigation.main' => \Hyde\Framework\Features\Navigation\MainNavigationMenu::class,
         'navigation.sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::class,
     ]));
+
+    expectedArguments(\app(), 0, 'navigation.main', 'navigation.sidebar');
 }

From 98529993bf72ee975d4d15791a0656cce18d8dc9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:03:58 +0200
Subject: [PATCH 1675/2811] Revert "Create sdf.meta.php"

This reverts commit 617142a189dfdfb8a4ec09279f9ab8c6cdf2bede.
---
 .phpstorm.meta.php/sdf.meta.php => .phpstorm.meta.php | 4 ----
 1 file changed, 4 deletions(-)
 rename .phpstorm.meta.php/sdf.meta.php => .phpstorm.meta.php (73%)

diff --git a/.phpstorm.meta.php/sdf.meta.php b/.phpstorm.meta.php
similarity index 73%
rename from .phpstorm.meta.php/sdf.meta.php
rename to .phpstorm.meta.php
index 8ac94568820..f7f7bf84097 100644
--- a/.phpstorm.meta.php/sdf.meta.php
+++ b/.phpstorm.meta.php
@@ -1,12 +1,8 @@
 <?php
 
 namespace PHPSTORM_META {
-
     override(\app(0), map([
-        '' => '@',
         'navigation.main' => \Hyde\Framework\Features\Navigation\MainNavigationMenu::class,
         'navigation.sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::class,
     ]));
-
-    expectedArguments(\app(), 0, 'navigation.main', 'navigation.sidebar');
 }

From 6a80301690feab53d4e4fb3501807871d0ee05b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:15:33 +0200
Subject: [PATCH 1676/2811] Revert "Type annotate container access"

This reverts commit 9703afb7ac7e6afa47443f2691eead3204a8967b.
---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 +----
 .../src/Framework/Features/Navigation/MainNavigationMenu.php | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e8b0aa78c2e..6e8332b8ad2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -19,10 +19,7 @@ class DocumentationSidebar extends NavigationMenu
      */
     public static function get(): static
     {
-        /** @var self::class $menu */
-        $menu = app('navigation.sidebar');
-
-        return $menu;
+        return app('navigation.sidebar');
     }
 
     public function __construct(Arrayable|array $items = [])
diff --git a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
index f735186d29f..e6681c42ffd 100644
--- a/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/MainNavigationMenu.php
@@ -10,9 +10,6 @@ class MainNavigationMenu extends NavigationMenu
 {
     public static function get(): static
     {
-        /** @var self::class $menu */
-        $menu = app('navigation.main');
-
-        return $menu;
+        return app('navigation.main');
     }
 }

From 4188a96fb983860757f0e3952eec6018595ac87f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:23:55 +0200
Subject: [PATCH 1677/2811] Add generics to the evaluate arrayable helper

---
 packages/framework/src/helpers.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index eccc720e66f..26ffc238bb2 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -144,6 +144,13 @@ function trim_slashes(string $string): string
     }
 
     if (! function_exists('\Hyde\evaluate_arrayable')) {
+        /**
+         * Evaluate an arrayable object or an array to an array.
+         *
+         * @template T
+         * @param array<T>|Arrayable<T> $array
+         * @return array<T>
+         */
         function evaluate_arrayable(array|Arrayable $array): array
         {
             return $array instanceof Arrayable ? $array->toArray() : $array;

From 7cc489b519d1034d57790abf61671580358f9156 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:24:51 +0200
Subject: [PATCH 1678/2811] Revert "Add generics to the evaluate arrayable
 helper"

This reverts commit 4188a96fb983860757f0e3952eec6018595ac87f.
---
 packages/framework/src/helpers.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 26ffc238bb2..eccc720e66f 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -144,13 +144,6 @@ function trim_slashes(string $string): string
     }
 
     if (! function_exists('\Hyde\evaluate_arrayable')) {
-        /**
-         * Evaluate an arrayable object or an array to an array.
-         *
-         * @template T
-         * @param array<T>|Arrayable<T> $array
-         * @return array<T>
-         */
         function evaluate_arrayable(array|Arrayable $array): array
         {
             return $array instanceof Arrayable ? $array->toArray() : $array;

From b05b5e2a2d92a5b2cd91b7eac6d17d59ccbd2628 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:32:39 +0200
Subject: [PATCH 1679/2811] Add type generics

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2dc4c0e61c5..cc74ca46f0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -23,7 +23,11 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    /**
+     * @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     * @template T of NavigationItem|NavigationGroup
+     * @template TValue of T
+     */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])

From c7a7d06b41a36757b8aa59827b8a870826fd0eaa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:34:08 +0200
Subject: [PATCH 1680/2811] Revert "Add type generics"

This reverts commit b05b5e2a2d92a5b2cd91b7eac6d17d59ccbd2628.
---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index cc74ca46f0c..2dc4c0e61c5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -23,11 +23,7 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /**
-     * @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
-     * @template T of NavigationItem|NavigationGroup
-     * @template TValue of T
-     */
+    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
     public function __construct(Arrayable|array $items = [])

From 439050dc4b88dc5f91c011ef817c960ffed45a7a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:35:33 +0200
Subject: [PATCH 1681/2811] Introduce type annotated variable

---
 .../Framework/Features/Navigation/DocumentationSidebar.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 6e8332b8ad2..fb13b0b91bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -76,9 +76,12 @@ public function getActiveGroup(): ?NavigationGroup
             return $this->items->sortBy(fn (NavigationGroup $item): int => $item->getPriority())->first();
         }
 
-        return $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
+        /** @var ?NavigationGroup $first */
+        $first = $this->items->first(function (NavigationGroup $group) use ($currentPage): bool {
             // A group is active when it contains the current page being rendered.
             return $currentPage->navigationMenuGroup() && $group->getGroupKey() === NavigationGroup::normalizeGroupKey($currentPage->navigationMenuGroup());
         });
+
+        return $first;
     }
 }

From e1af2cd3fc4dc9293697e468ef0092616eeebd1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:38:46 +0200
Subject: [PATCH 1682/2811] Annotate arrayable generics

---
 .../src/Framework/Features/Navigation/NavigationMenu.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2dc4c0e61c5..780c07f2ad8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -26,6 +26,7 @@ class NavigationMenu
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
+    /** @param  \Illuminate\Contracts\Support\Arrayable<array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();

From 662915544a8c820869803d1f87aea968b254cd22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:41:23 +0200
Subject: [PATCH 1683/2811] Annotate the constant types

---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 780c07f2ad8..560222c320e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,7 +20,10 @@
  */
 class NavigationMenu
 {
+    /** @var int The default priority for navigation items. */
     public const DEFAULT = 500;
+
+    /** @var int Place the item last in the menu. */
     public const LAST = 999;
 
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */

From e3f891aee2b1895fba7c4d75d569e47261c1c845 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:46:07 +0200
Subject: [PATCH 1684/2811] Annotate the evaluated array generics

---
 .../src/Framework/Features/Navigation/NavigationMenu.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 560222c320e..6d59056f277 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -34,7 +34,10 @@ public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        $this->add(evaluate_arrayable($items));
+        /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
+        $items = evaluate_arrayable($items);
+
+        $this->add($items);
     }
 
     /**

From 92d3693ee6d6387bbb1353c8fe69841485c7bc84 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:46:20 +0200
Subject: [PATCH 1685/2811] Revert "Annotate the constant types"

This reverts commit 662915544a8c820869803d1f87aea968b254cd22.
---
 .../src/Framework/Features/Navigation/NavigationMenu.php       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 6d59056f277..860abd9fc85 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -20,10 +20,7 @@
  */
 class NavigationMenu
 {
-    /** @var int The default priority for navigation items. */
     public const DEFAULT = 500;
-
-    /** @var int Place the item last in the menu. */
     public const LAST = 999;
 
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */

From a512e24219f728ba698bee3d2cdc4a2e7050fe9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:50:07 +0200
Subject: [PATCH 1686/2811] Fix invalid template parameters

---
 .../src/Framework/Features/Navigation/NavigationMenu.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 860abd9fc85..7acd44d47be 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -26,7 +26,7 @@ class NavigationMenu
     /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
-    /** @param  \Illuminate\Contracts\Support\Arrayable<array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
+    /** @param  \Illuminate\Contracts\Support\Arrayable<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();

From 619c62e6523e979daa5d9af2bde7e35fd5a91af5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:52:38 +0200
Subject: [PATCH 1687/2811] Annotate array key templates

---
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 7acd44d47be..facd0c91998 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -23,10 +23,10 @@ class NavigationMenu
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    /** @var \Illuminate\Support\Collection<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
-    /** @param  \Illuminate\Contracts\Support\Arrayable<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
+    /** @param  \Illuminate\Contracts\Support\Arrayable<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
@@ -42,7 +42,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     * @return \Illuminate\Support\Collection<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
      */
     public function getItems(): Collection
     {

From 0aa6814a5e02cd851fb820ec9982229b50d9ee00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 18:58:11 +0200
Subject: [PATCH 1688/2811] Use type safe config accessor

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index fb13b0b91bc..89bc9a033c2 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -29,7 +29,7 @@ public function __construct(Arrayable|array $items = [])
 
     public function getHeader(): string
     {
-        return Config::get('docs.sidebar.header', 'Documentation');
+        return Config::getString('docs.sidebar.header', 'Documentation');
     }
 
     public function getFooter(): ?string

From 79436b52d370e747385da655b4bc5df9f4966b68 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:12:48 +0200
Subject: [PATCH 1689/2811] Extract generics template to clean up the class

---
 .../Features/Navigation/NavigationMenu.php         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index facd0c91998..35c48ea651e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -17,21 +17,23 @@
  *
  * @example `$menu = app('navigation.main');` for the main navigation menu.
  * @example `$menu = app('navigation.sidebar');` for the documentation sidebar.
+ *
+ * @template T of NavigationItem|NavigationGroup
  */
 class NavigationMenu
 {
     public const DEFAULT = 500;
     public const LAST = 999;
 
-    /** @var \Illuminate\Support\Collection<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
+    /** @var \Illuminate\Support\Collection<array-key, T> */
     protected Collection $items;
 
-    /** @param  \Illuminate\Contracts\Support\Arrayable<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items */
+    /** @param  \Illuminate\Contracts\Support\Arrayable<array-key, T>|array<T>  $items */
     public function __construct(Arrayable|array $items = [])
     {
         $this->items = new Collection();
 
-        /** @var array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> $items */
+        /** @var array<T> $items */
         $items = evaluate_arrayable($items);
 
         $this->add($items);
@@ -42,7 +44,7 @@ public function __construct(Arrayable|array $items = [])
      *
      * Items are automatically sorted by their priority, falling back to the order they were added.
      *
-     * @return \Illuminate\Support\Collection<array-key, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>
+     * @return \Illuminate\Support\Collection<array-key, T>
      */
     public function getItems(): Collection
     {
@@ -56,11 +58,11 @@ public function getItems(): Collection
     /**
      * Add one or more navigation items to the navigation menu.
      *
-     * @param  \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup|array<\Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup>  $items
+     * @param  T|array<T>  $items
      */
     public function add(NavigationItem|NavigationGroup|array $items): static
     {
-        /** @var \Hyde\Framework\Features\Navigation\NavigationItem $item */
+        /** @var T $item */
         foreach (Arr::wrap($items) as $item) {
             $this->addItem($item);
         }

From 13b5e19222ef1276c1bf26c675a55c751f5d58b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:16:45 +0200
Subject: [PATCH 1690/2811] Annotate the supported config value types

---
 .../src/Framework/Features/Navigation/DocumentationSidebar.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 89bc9a033c2..a5f01904b27 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -34,6 +34,7 @@ public function getHeader(): string
 
     public function getFooter(): ?string
     {
+        /** @var null|string|false $option */
         $option = Config::get('docs.sidebar.footer', '[Back to home page](../)');
 
         if (is_string($option)) {

From 4607bbe2eea65dc57d0c23648a7c5f4c8e6460a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:31:14 +0200
Subject: [PATCH 1691/2811] Extract helper method for repeated code

---
 .../Features/Navigation/NavigationMenuGenerator.php        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d1476b87ac3..6a9f9f509e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -191,13 +191,18 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        return Config::getArray($key, [])[$groupKey] ?? null;
+        return $this->getConfigArray($key, $groupKey);
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
+        return $this->getConfigArray($key, $groupKey);
+    }
+
+    protected function getConfigArray(string $key, string $groupKey): mixed
+    {
         return Config::getArray($key, [])[$groupKey] ?? null;
     }
 }

From 32b91d37e6ee7cd6c4b058f7e5432761dded61be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:33:18 +0200
Subject: [PATCH 1692/2811] Shift array access to scope down helper method

---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 6a9f9f509e0..b51609c4924 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -191,18 +191,18 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        return $this->getConfigArray($key, $groupKey);
+        return $this->getConfigArray($key)[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
-        return $this->getConfigArray($key, $groupKey);
+        return $this->getConfigArray($key)[$groupKey] ?? null;
     }
 
-    protected function getConfigArray(string $key, string $groupKey): mixed
+    protected function getConfigArray(string $key): array
     {
-        return Config::getArray($key, [])[$groupKey] ?? null;
+        return Config::getArray($key, []);
     }
 }

From fc274745785548026c5f9384652644e83f41a0f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:39:32 +0200
Subject: [PATCH 1693/2811] Annotate the config array types

---
 .../Features/Navigation/NavigationMenuGenerator.php          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b51609c4924..b2486fa0502 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -203,6 +203,9 @@ protected function searchForGroupPriorityInConfig(string $groupKey): ?int
 
     protected function getConfigArray(string $key): array
     {
-        return Config::getArray($key, []);
+        /** @var array<string, string|int>|array<array-key, string> $array */
+        $array = Config::getArray($key, []);
+
+        return $array;
     }
 }

From db435d7c4d73e09c031add55b45121e89b14b13f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:43:01 +0200
Subject: [PATCH 1694/2811] Inline added helper method

---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b2486fa0502..be480fbfd17 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -191,21 +191,19 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        return $this->getConfigArray($key)[$groupKey] ?? null;
+        /** @var array<string, string|int>|array<array-key, string> $array */
+        $array = Config::getArray($key, []);
+
+        return ($array)[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
-        return $this->getConfigArray($key)[$groupKey] ?? null;
-    }
-
-    protected function getConfigArray(string $key): array
-    {
         /** @var array<string, string|int>|array<array-key, string> $array */
         $array = Config::getArray($key, []);
 
-        return $array;
+        return ($array)[$groupKey] ?? null;
     }
 }

From 803d1d6a62fc7fb3f627c0a1dea8c7319e227245 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:43:21 +0200
Subject: [PATCH 1695/2811] Revert "Inline added helper method"

This reverts commit db435d7c4d73e09c031add55b45121e89b14b13f.
---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index be480fbfd17..b2486fa0502 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -191,19 +191,21 @@ protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
         $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
 
-        /** @var array<string, string|int>|array<array-key, string> $array */
-        $array = Config::getArray($key, []);
-
-        return ($array)[$groupKey] ?? null;
+        return $this->getConfigArray($key)[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
         $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
 
+        return $this->getConfigArray($key)[$groupKey] ?? null;
+    }
+
+    protected function getConfigArray(string $key): array
+    {
         /** @var array<string, string|int>|array<array-key, string> $array */
         $array = Config::getArray($key, []);
 
-        return ($array)[$groupKey] ?? null;
+        return $array;
     }
 }

From 894536e35b2358f62757740b194c4eb55c969ea4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:43:52 +0200
Subject: [PATCH 1696/2811] Simplify array generics

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b2486fa0502..fab5ffa57c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -203,7 +203,7 @@ protected function searchForGroupPriorityInConfig(string $groupKey): ?int
 
     protected function getConfigArray(string $key): array
     {
-        /** @var array<string, string|int>|array<array-key, string> $array */
+        /** @var array<string|int, string|int> $array */
         $array = Config::getArray($key, []);
 
         return $array;

From 7ebca61349428e044764a6d64d620e7050ebada4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:44:53 +0200
Subject: [PATCH 1697/2811] Annotate array return generics

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index fab5ffa57c3..257afc54bbc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -201,6 +201,7 @@ protected function searchForGroupPriorityInConfig(string $groupKey): ?int
         return $this->getConfigArray($key)[$groupKey] ?? null;
     }
 
+    /** @return array<string|int, string|int> */
     protected function getConfigArray(string $key): array
     {
         /** @var array<string|int, string|int> $array */

From f26e4d6a47126569dfac804521beb3b0c24b61ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:57:14 +0200
Subject: [PATCH 1698/2811] Fix missing union type in type annotation

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 257afc54bbc..42760bb8ba1 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -23,7 +23,7 @@
  */
 class NavigationMenuGenerator
 {
-    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavigationItem> */
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavigationItem|\Hyde\Framework\Features\Navigation\NavigationGroup> */
     protected Collection $items;
 
     /** @var \Hyde\Foundation\Kernel\RouteCollection<string, \Hyde\Support\Models\Route> */

From 12e8ab3e9c0d3f757c82af42a83127484e57a4d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 19:58:21 +0200
Subject: [PATCH 1699/2811] Inline local variables

---
 .../Features/Navigation/NavigationMenuGenerator.php       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 42760bb8ba1..d2bd01921f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -189,16 +189,12 @@ protected function normalizeGroupLabel(string $label): string
 
     protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
-        $key = $this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels';
-
-        return $this->getConfigArray($key)[$groupKey] ?? null;
+        return $this->getConfigArray($this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels')[$groupKey] ?? null;
     }
 
     protected function searchForGroupPriorityInConfig(string $groupKey): ?int
     {
-        $key = $this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order';
-
-        return $this->getConfigArray($key)[$groupKey] ?? null;
+        return $this->getConfigArray($this->generatesSidebar ? 'docs.sidebar.order' : 'hyde.navigation.order')[$groupKey] ?? null;
     }
 
     /** @return array<string|int, string|int> */

From bbb7238aba2a7276af2e30fb1a04439adabcab21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:10:12 +0200
Subject: [PATCH 1700/2811] Add integer cast for min function call

---
 .../src/Framework/Features/Navigation/NavigationGroup.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
index 9c472b9366a..229960da009 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationGroup.php
@@ -44,7 +44,7 @@ public function getPriority(): int
     {
         if ($this->containsOnlyDocumentationPages()) {
             // For sidebar groups, we use the priority of the lowest priority child, unless the dropdown instance itself has a lower priority.
-            return min($this->priority, $this->getItems()->min(fn (NavigationItem $item): int => $item->getPriority()));
+            return (int) min($this->priority, $this->getItems()->min(fn (NavigationItem $item): int => $item->getPriority()));
         }
 
         return $this->priority;

From 42b188fe7ee91e9640140a970b086317b2ba3af6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:16:00 +0200
Subject: [PATCH 1701/2811] Override kernel binding

---
 .phpstorm.meta.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
index f7f7bf84097..32e63379657 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -5,4 +5,7 @@
         'navigation.main' => \Hyde\Framework\Features\Navigation\MainNavigationMenu::class,
         'navigation.sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::class,
     ]));
+    override((new \Illuminate\Contracts\Container\Container())->make(0), map([
+        \Hyde\Foundation\HydeKernel::class => \Hyde\Foundation\HydeKernel::class,
+    ]));
 }

From e12b7dabd71af9626e165cfe4c7d1980f5aa4e1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:28:51 +0200
Subject: [PATCH 1702/2811] Revert "Override kernel binding"

This reverts commit 42b188fe7ee91e9640140a970b086317b2ba3af6.
---
 .phpstorm.meta.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
index 32e63379657..f7f7bf84097 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -5,7 +5,4 @@
         'navigation.main' => \Hyde\Framework\Features\Navigation\MainNavigationMenu::class,
         'navigation.sidebar' => \Hyde\Framework\Features\Navigation\DocumentationSidebar::class,
     ]));
-    override((new \Illuminate\Contracts\Container\Container())->make(0), map([
-        \Hyde\Foundation\HydeKernel::class => \Hyde\Foundation\HydeKernel::class,
-    ]));
 }

From 9e68809183f6ed064413c56226cbe6ef5f29792b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:31:19 +0200
Subject: [PATCH 1703/2811] Add code spacing

---
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 23954a7c14e..6ce5db7a0b2 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -140,8 +140,10 @@ public function testSidebarPrioritiesCanBeSetInBothFrontMatterAndConfig()
             'third',
             'second',
         ]);
+
         Filesystem::touch('_docs/first.md');
         Filesystem::touch('_docs/second.md');
+
         file_put_contents(Hyde::path('_docs/third.md'),
             (new ConvertsArrayToFrontMatter)->execute(['navigation.priority' => 250 + 300])
         );

From b04cf8be4147232d8c34ba03de3abcf6dfbe61a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:33:09 +0200
Subject: [PATCH 1704/2811] Revert "Run workflow on all branches"

This reverts commit 6ed117bc0ba73f24a7871921bc05a04e5b138ec9.
---
 .github/workflows/static-analysis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index b2acd0dd0c5..dba99d85384 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -2,6 +2,7 @@ name: 🔎 Static Analysis
 
 on:
   pull_request:
+    branches: [ "master" ]
 
 jobs:
 

From 78a9434cdcb40fba25b051bf45b6e0641ab1d155 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:50:14 +0200
Subject: [PATCH 1705/2811] Revert "Update PhpStorm files"

This reverts commit 2c70b02fe4576b288c832b62c7445bf0a5d42032.
---
 .idea/develop.iml | 1 +
 .idea/php.xml     | 1 +
 .idea/phpspec.xml | 3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/develop.iml b/.idea/develop.iml
index 8e317382cd6..57b84ebaf07 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -34,6 +34,7 @@
       <excludeFolder url="file://$MODULE_DIR$/app/storage/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/path-util" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/openlss/lib-array2xml" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/vimeo/psalm" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/uri-template" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/process" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/brianium/paratest" />
diff --git a/.idea/php.xml b/.idea/php.xml
index cde778e065a..d4d63270f91 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -147,6 +147,7 @@
       <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
       <path value="$PROJECT_DIR$/vendor/torchlight/torchlight-commonmark" />
       <path value="$PROJECT_DIR$/vendor/torchlight/torchlight-laravel" />
+      <path value="$PROJECT_DIR$/vendor/vimeo/psalm" />
       <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
       <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
       <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
index 41f23c4c83d..c7cfbc2c5e6 100644
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -11,9 +11,6 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
-      <PhpSpecSuiteConfiguration>
-        <option name="myPath" value="$PROJECT_DIR$" />
-      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>
\ No newline at end of file

From fa6c20ad438489f38c82dcac7d33d4456999cdc7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:54:19 +0200
Subject: [PATCH 1706/2811] Clean up test

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index a98931a6e41..7f6cb8b3ac7 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -199,6 +199,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
+
         $expected = collect([NavigationItem::create(Routes::get('index'))]);
 
         $this->assertCount(count($expected), $menu->getItems());
@@ -212,6 +213,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
+
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
             NavigationItem::create(Routes::get('foo/bar')),
@@ -228,6 +230,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
         $this->file('_pages/foo/bar.md');
 
         $menu = $this->createNavigationMenu();
+
         $expected = collect([
             NavigationItem::create(Routes::get('index')),
             NavigationGroup::create('Foo', [
@@ -245,6 +248,7 @@ public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
+
         $menu = $this->createNavigationMenu();
 
         $this->assertCount(3, $menu->getItems());

From 76b69c0d8c72ac8843ea9a0ad819027bd5d0f478 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:54:47 +0200
Subject: [PATCH 1707/2811] Reapply "Update PhpStorm files"

This reverts commit 78a9434cdcb40fba25b051bf45b6e0641ab1d155.
---
 .idea/develop.iml | 1 -
 .idea/php.xml     | 1 -
 .idea/phpspec.xml | 3 +++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.idea/develop.iml b/.idea/develop.iml
index 57b84ebaf07..8e317382cd6 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -34,7 +34,6 @@
       <excludeFolder url="file://$MODULE_DIR$/app/storage/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/path-util" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/openlss/lib-array2xml" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/vimeo/psalm" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/uri-template" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/illuminate/process" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/brianium/paratest" />
diff --git a/.idea/php.xml b/.idea/php.xml
index d4d63270f91..cde778e065a 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -147,7 +147,6 @@
       <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
       <path value="$PROJECT_DIR$/vendor/torchlight/torchlight-commonmark" />
       <path value="$PROJECT_DIR$/vendor/torchlight/torchlight-laravel" />
-      <path value="$PROJECT_DIR$/vendor/vimeo/psalm" />
       <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
       <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
       <path value="$PROJECT_DIR$/vendor/webmozart/assert" />
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
index c7cfbc2c5e6..41f23c4c83d 100644
--- a/.idea/phpspec.xml
+++ b/.idea/phpspec.xml
@@ -11,6 +11,9 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>
\ No newline at end of file

From 35ddecefa385cb252c2810703c7f99243fa43598 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 15 Apr 2024 20:55:27 +0200
Subject: [PATCH 1708/2811] Remove unused testing helper method

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 5ae702cfad8..8d3ee0e380d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1327,11 +1327,6 @@ public function getState(int $index): ?TestNavigationItem
         return $this->state()[$index] ?? null;
     }
 
-    public function ddState(): void
-    {
-        dd($this->state());
-    }
-
     /**
      * @param  array  $expected  The expected state format
      * @param  bool  $strict  If false, missing array keys are ignored

From 4542ebfbf6cd77e0393aa9f0c9a2aeb2113d2472 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 17 Apr 2024 14:40:21 +0200
Subject: [PATCH 1709/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5b0b17ed1c2..889880cae25 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -48,6 +48,10 @@ Please see the "Breaking changes & upgrade guide" section below for more informa
 
 Please read through this section to ensure your site upgrades smoothly.
 
+## Before you start
+
+Before you start, please upgrade your application to at least HydePHP v1.6 as that version contains helpers to make the upgrade process easier.
+
 ## High impact
 
 ### Navigation system rewrite

From 3ec072a566ba532dc53923159ecd010f513e98be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 13:53:25 +0200
Subject: [PATCH 1710/2811] Refactor `Filesystem::touch` to return void instead
 of bool

---
 packages/framework/src/Facades/Filesystem.php              | 6 +++---
 packages/framework/src/Foundation/Kernel/Filesystem.php    | 7 +++----
 .../framework/tests/Feature/Foundation/FilesystemTest.php  | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Facades/Filesystem.php b/packages/framework/src/Facades/Filesystem.php
index 3229bc584c3..8b6cc6fa4e9 100644
--- a/packages/framework/src/Facades/Filesystem.php
+++ b/packages/framework/src/Facades/Filesystem.php
@@ -73,11 +73,11 @@ public static function smartGlob(string $pattern, int $flags = 0): Collection
      * Touch one or more files in the project's directory.
      *
      * @param  string|array  $path
-     * @return bool
+     * @return void
      */
-    public static function touch(string|array $path): bool
+    public static function touch(string|array $path): void
     {
-        return self::kernel()->filesystem()->touch($path);
+        self::kernel()->filesystem()->touch($path);
     }
 
     /**
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 97fa11bec30..2d42301d2da 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -151,17 +151,16 @@ public function vendorPath(string $path = '', string $package = 'framework'): st
      *
      * @param  string|array<string>  $path
      */
-    public function touch(string|array $path): bool
+    public function touch(string|array $path): void
     {
         if (is_string($path)) {
-            return touch($this->path($path));
+            touch($this->path($path));
+            return;
         }
 
         foreach ($path as $p) {
             touch($this->path($p));
         }
-
-        return true;
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 6c2c2811cd8..7696fe61b97 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -180,14 +180,14 @@ public function testVendorPathCanRunInPhar()
 
     public function testTouchHelperCreatesFileAtGivenPath()
     {
-        $this->assertTrue($this->filesystem->touch('foo'));
+        $this->assertNull($this->filesystem->touch('foo'));
         $this->assertFileExists(Hyde::path('foo'));
         $this->filesystem->unlink('foo');
     }
 
     public function testTouchHelperCreatesMultipleFilesAtGivenPaths()
     {
-        $this->assertTrue($this->filesystem->touch(['foo', 'bar']));
+        $this->assertNull($this->filesystem->touch(['foo', 'bar']));
         $this->assertFileExists(Hyde::path('foo'));
         $this->assertFileExists(Hyde::path('bar'));
         $this->filesystem->unlink('foo');

From 342824dfa0bde09db37869dc57c7e34a61284270 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:14:15 +0200
Subject: [PATCH 1711/2811] Revert "Refactor `Filesystem::touch` to return void
 instead of bool"

This reverts commit 3ec072a566ba532dc53923159ecd010f513e98be.
---
 packages/framework/src/Facades/Filesystem.php              | 6 +++---
 packages/framework/src/Foundation/Kernel/Filesystem.php    | 7 ++++---
 .../framework/tests/Feature/Foundation/FilesystemTest.php  | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Facades/Filesystem.php b/packages/framework/src/Facades/Filesystem.php
index 8b6cc6fa4e9..3229bc584c3 100644
--- a/packages/framework/src/Facades/Filesystem.php
+++ b/packages/framework/src/Facades/Filesystem.php
@@ -73,11 +73,11 @@ public static function smartGlob(string $pattern, int $flags = 0): Collection
      * Touch one or more files in the project's directory.
      *
      * @param  string|array  $path
-     * @return void
+     * @return bool
      */
-    public static function touch(string|array $path): void
+    public static function touch(string|array $path): bool
     {
-        self::kernel()->filesystem()->touch($path);
+        return self::kernel()->filesystem()->touch($path);
     }
 
     /**
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 2d42301d2da..97fa11bec30 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -151,16 +151,17 @@ public function vendorPath(string $path = '', string $package = 'framework'): st
      *
      * @param  string|array<string>  $path
      */
-    public function touch(string|array $path): void
+    public function touch(string|array $path): bool
     {
         if (is_string($path)) {
-            touch($this->path($path));
-            return;
+            return touch($this->path($path));
         }
 
         foreach ($path as $p) {
             touch($this->path($p));
         }
+
+        return true;
     }
 
     /**
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 7696fe61b97..6c2c2811cd8 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -180,14 +180,14 @@ public function testVendorPathCanRunInPhar()
 
     public function testTouchHelperCreatesFileAtGivenPath()
     {
-        $this->assertNull($this->filesystem->touch('foo'));
+        $this->assertTrue($this->filesystem->touch('foo'));
         $this->assertFileExists(Hyde::path('foo'));
         $this->filesystem->unlink('foo');
     }
 
     public function testTouchHelperCreatesMultipleFilesAtGivenPaths()
     {
-        $this->assertNull($this->filesystem->touch(['foo', 'bar']));
+        $this->assertTrue($this->filesystem->touch(['foo', 'bar']));
         $this->assertFileExists(Hyde::path('foo'));
         $this->assertFileExists(Hyde::path('bar'));
         $this->filesystem->unlink('foo');

From e9b275e89ee0e5d7bfeca06e5d070089db1d6fac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:14:34 +0200
Subject: [PATCH 1712/2811] Refactor touch and unlink helpers to use a
 collection loop

---
 .../src/Foundation/Kernel/Filesystem.php      | 22 +++++--------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 97fa11bec30..92de9b3f60e 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -9,12 +9,12 @@
 use Hyde\Foundation\PharSupport;
 use Illuminate\Support\Collection;
 
+use function collect;
 use function Hyde\normalize_slashes;
 use function Hyde\path_join;
 use function file_exists;
 use function str_replace;
 use function array_map;
-use function is_string;
 use function is_array;
 use function str_starts_with;
 use function unslash;
@@ -153,15 +153,9 @@ public function vendorPath(string $path = '', string $package = 'framework'): st
      */
     public function touch(string|array $path): bool
     {
-        if (is_string($path)) {
+        return collect($path)->map(function (string $path): bool {
             return touch($this->path($path));
-        }
-
-        foreach ($path as $p) {
-            touch($this->path($p));
-        }
-
-        return true;
+        })->contains(false) === false;
     }
 
     /**
@@ -171,15 +165,9 @@ public function touch(string|array $path): bool
      */
     public function unlink(string|array $path): bool
     {
-        if (is_string($path)) {
+        return collect($path)->map(function (string $path): bool {
             return unlink($this->path($path));
-        }
-
-        foreach ($path as $p) {
-            unlink($this->path($p));
-        }
-
-        return true;
+        })->contains(false) === false;
     }
 
     /**

From 9b16ffe1400f8341ace518d17a1732643972e22d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:16:51 +0200
Subject: [PATCH 1713/2811] Simplify unlinking helper to use short circuit
 logic

---
 packages/framework/src/Foundation/Kernel/Filesystem.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 92de9b3f60e..00d3ab937cc 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -175,11 +175,7 @@ public function unlink(string|array $path): bool
      */
     public function unlinkIfExists(string $path): bool
     {
-        if (file_exists($this->path($path))) {
-            return unlink($this->path($path));
-        }
-
-        return false;
+        return file_exists($this->path($path)) && unlink($this->path($path));
     }
 
     /** @return \Illuminate\Support\Collection<int, string> */

From 2872b8ea7fc56437874418166ea6e6c2515793c7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:19:28 +0200
Subject: [PATCH 1714/2811] Refactor string assembly to use the path join
 function

---
 packages/framework/src/Foundation/Kernel/Filesystem.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 00d3ab937cc..b798b0f13e0 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -99,9 +99,7 @@ public function mediaPath(string $path = ''): string
             return $this->path(Hyde::getMediaDirectory());
         }
 
-        $path = unslash($path);
-
-        return $this->path(Hyde::getMediaDirectory()."/$path");
+        return $this->path(path_join(Hyde::getMediaDirectory(), unslash($path)));
     }
 
     /**
@@ -113,9 +111,7 @@ public function sitePath(string $path = ''): string
             return $this->path(Hyde::getOutputDirectory());
         }
 
-        $path = unslash($path);
-
-        return $this->path(Hyde::getOutputDirectory()."/$path");
+        return $this->path(path_join(Hyde::getOutputDirectory(), unslash($path)));
     }
 
     /**

From 242b3f0d3545a5538ff5f10580ac476794d0785e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:26:10 +0200
Subject: [PATCH 1715/2811] Annotate array return generics

---
 packages/framework/src/Foundation/Kernel/Filesystem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index b798b0f13e0..345a0f37199 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -70,6 +70,7 @@ public function path(string $path = ''): string
      * Input types are matched, meaning that if the input is a string so will the output be.
      *
      * @param  string|array<string>  $path
+     * @return string|array<string>
      */
     public function pathToAbsolute(string|array $path): string|array
     {

From d520dc0c22f7fb34d0c0b115656f343611a12d5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 29 Apr 2024 14:27:12 +0200
Subject: [PATCH 1716/2811] Use conditional array return generics

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

diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
index 345a0f37199..9b3cc6cc24c 100644
--- a/packages/framework/src/Foundation/Kernel/Filesystem.php
+++ b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -70,7 +70,7 @@ public function path(string $path = ''): string
      * Input types are matched, meaning that if the input is a string so will the output be.
      *
      * @param  string|array<string>  $path
-     * @return string|array<string>
+     * @return ($path is string ? string : array<string>)
      */
     public function pathToAbsolute(string|array $path): string|array
     {

From da080b8d68718e33b96228365805d94c8b79647e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 11:45:39 +0200
Subject: [PATCH 1717/2811] Fix test method order

---
 .../framework/tests/Feature/NavigationMenuTest.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 205104aba1f..f8920b5cebe 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -277,11 +277,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
-    protected function createNavigationMenu(): MainNavigationMenu
-    {
-        return NavigationMenuGenerator::handle(MainNavigationMenu::class);
-    }
-
     public function testHasDropdownsReturnsTrueWhenGroupIsExplicitlySetInFrontMatter()
     {
         config(['hyde.navigation.subdirectories' => 'hidden']);
@@ -315,4 +310,9 @@ public function testHasDropdownsReturnsFalseWhenGroupIsNotExplicitlySetInFrontMa
         $menu = NavigationMenu::create();
         $this->assertFalse($menu->hasDropdowns());
     }
+
+    protected function createNavigationMenu(): MainNavigationMenu
+    {
+        return NavigationMenuGenerator::handle(MainNavigationMenu::class);
+    }
 }

From b92841e5a6c5b6ae460286f45e3b0cc102f05f11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 11:45:45 +0200
Subject: [PATCH 1718/2811] Use new helper

---
 packages/framework/tests/Feature/NavigationMenuTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index f8920b5cebe..ffeacacca7a 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -283,7 +283,7 @@ public function testHasDropdownsReturnsTrueWhenGroupIsExplicitlySetInFrontMatter
 
         Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
 
-        $this->assertTrue(NavigationMenu::create()->hasDropdowns());
+        $this->assertTrue($this->createNavigationMenu()->hasDropdowns());
     }
 
     public function testGetDropdownsReturnsCorrectArrayWhenGroupIsExplicitlySetInFrontMatter()
@@ -292,7 +292,7 @@ public function testGetDropdownsReturnsCorrectArrayWhenGroupIsExplicitlySetInFro
 
         Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
 
-        $menu = NavigationMenu::create();
+        $menu = $this->createNavigationMenu();
         $this->assertCount(1, $menu->getDropdowns());
 
         $this->assertEquals([
@@ -307,7 +307,7 @@ public function testHasDropdownsReturnsFalseWhenGroupIsNotExplicitlySetInFrontMa
         config(['hyde.navigation.subdirectories' => 'hidden']);
 
         Routes::addRoute((new MarkdownPage('foo'))->getRoute());
-        $menu = NavigationMenu::create();
+        $menu = $this->createNavigationMenu();
         $this->assertFalse($menu->hasDropdowns());
     }
 

From eb81e6076d3a459e3882bb7d8ce769dd90faffd4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 11:47:31 +0200
Subject: [PATCH 1719/2811] Remove tests for methods not present in v2

---
 .../tests/Feature/NavigationMenuTest.php      | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index ffeacacca7a..7f6cb8b3ac7 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -277,40 +277,6 @@ public function testCanAddItemsToMainNavigationMenuResolvedFromContainer()
         $this->assertSame('Foo', $navigation->getItems()->last()->getLabel());
     }
 
-    public function testHasDropdownsReturnsTrueWhenGroupIsExplicitlySetInFrontMatter()
-    {
-        config(['hyde.navigation.subdirectories' => 'hidden']);
-
-        Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
-
-        $this->assertTrue($this->createNavigationMenu()->hasDropdowns());
-    }
-
-    public function testGetDropdownsReturnsCorrectArrayWhenGroupIsExplicitlySetInFrontMatter()
-    {
-        config(['hyde.navigation.subdirectories' => 'hidden']);
-
-        Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
-
-        $menu = $this->createNavigationMenu();
-        $this->assertCount(1, $menu->getDropdowns());
-
-        $this->assertEquals([
-            DropdownNavItem::fromArray('test-group', [
-                NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
-            ]),
-        ], $menu->getDropdowns());
-    }
-
-    public function testHasDropdownsReturnsFalseWhenGroupIsNotExplicitlySetInFrontMatter()
-    {
-        config(['hyde.navigation.subdirectories' => 'hidden']);
-
-        Routes::addRoute((new MarkdownPage('foo'))->getRoute());
-        $menu = $this->createNavigationMenu();
-        $this->assertFalse($menu->hasDropdowns());
-    }
-
     protected function createNavigationMenu(): MainNavigationMenu
     {
         return NavigationMenuGenerator::handle(MainNavigationMenu::class);

From b330ff516066551f596e7f3ea5e76cf4073742e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 11:59:56 +0200
Subject: [PATCH 1720/2811] Merge helper method into new code location

Merges https://github.com/hydephp/develop/commit/f612126e3743f071dbc8f84a22746710774c90f1
---
 .../Features/Navigation/NavigationMenuGenerator.php      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d2bd01921f8..4d787584c0c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -96,10 +96,17 @@ protected function usesGroups(): bool
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {
-            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown' || $this->hasGroupExplicitlySetInFrontMatter();
         }
     }
 
+    private function hasGroupExplicitlySetInFrontMatter(): bool
+    {
+        return $this->routes->contains(function (Route $item): bool {
+            return ($item->getPage()->navigationMenuGroup() !== null) && (! $item->getPage() instanceof DocumentationPage);
+        });
+    }
+
     protected function canAddRoute(Route $route): bool
     {
         if (! $route->getPage()->showInNavigation()) {

From 3ed045316892332a02dd76254ad9cb696d89b011 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 12:00:04 +0200
Subject: [PATCH 1721/2811] Revert "Merge helper method into new code location"

This reverts commit b330ff516066551f596e7f3ea5e76cf4073742e1.
---
 .../Features/Navigation/NavigationMenuGenerator.php      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 4d787584c0c..d2bd01921f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -96,17 +96,10 @@ protected function usesGroups(): bool
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {
-            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown' || $this->hasGroupExplicitlySetInFrontMatter();
+            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
         }
     }
 
-    private function hasGroupExplicitlySetInFrontMatter(): bool
-    {
-        return $this->routes->contains(function (Route $item): bool {
-            return ($item->getPage()->navigationMenuGroup() !== null) && (! $item->getPage() instanceof DocumentationPage);
-        });
-    }
-
     protected function canAddRoute(Route $route): bool
     {
         if (! $route->getPage()->showInNavigation()) {

From 8dc4a522f182193db2186f0ecc9f78a77640ced9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 15:04:52 +0200
Subject: [PATCH 1722/2811] Calling the `Include::path()` method will no longer
 create the directory

It feels weird that this creates the directory, and it violates the principle of least astonishment as it's surprising that this creates a directory when you just request the path. Fixes https://github.com/hydephp/develop/issues/1706
---
 RELEASE_NOTES.md                              |  2 ++
 packages/framework/src/Support/Includes.php   |  5 -----
 .../tests/Feature/IncludesFacadeTest.php      | 22 ++++++++++++-------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 889880cae25..1d99b7472e4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,6 +23,8 @@ This serves two purposes:
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
+- Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
+
 
 ### Deprecated
 - for soon-to-be removed features.
diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index c271475103e..21b0eab2620 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
-use Hyde\Framework\Concerns\InteractsWithDirectories;
 
 use function basename;
 use function file_exists;
@@ -20,8 +19,6 @@
  */
 class Includes
 {
-    use InteractsWithDirectories;
-
     /**
      * @var string The directory where includes are stored.
      */
@@ -35,8 +32,6 @@ class Includes
      */
     public static function path(?string $filename = null): string
     {
-        static::needsDirectory(static::$includesDirectory);
-
         return $filename === null
             ? Hyde::path(static::$includesDirectory)
             : Hyde::path(static::$includesDirectory.'/'.$filename);
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 75ada517c31..d29dcee2ec7 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -15,6 +15,20 @@
  */
 class IncludesFacadeTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        File::makeDirectory(Includes::path(), recursive: true);
+    }
+
+    public function tearDown(): void
+    {
+        File::deleteDirectory(Includes::path());
+
+        parent::tearDown();
+    }
+
     public function testPathReturnsTheIncludesDirectory()
     {
         $this->assertSame(
@@ -31,14 +45,6 @@ public function testPathReturnsAPartialWithinTheIncludesDirectory()
         );
     }
 
-    public function testPathCreatesDirectoryIfItDoesNotExist()
-    {
-        $path = Includes::path();
-        File::deleteDirectory($path);
-        $this->assertFalse(File::exists($path));
-        $this->assertTrue(File::exists(Includes::path()));
-    }
-
     public function testGetReturnsPartial()
     {
         $expected = 'foo bar';

From f745555f24f047818c269c171fe67bbc44fee1d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 15:27:19 +0200
Subject: [PATCH 1723/2811] Use testing helper to handle temporary directory
 cleanup

---
 .../framework/tests/Feature/IncludesFacadeTest.php     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index d29dcee2ec7..e2c95bc7c3d 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -8,7 +8,6 @@
 use Hyde\Support\Includes;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Facades\File;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -19,14 +18,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        File::makeDirectory(Includes::path(), recursive: true);
-    }
-
-    public function tearDown(): void
-    {
-        File::deleteDirectory(Includes::path());
-
-        parent::tearDown();
+        $this->directory('resources/includes');
     }
 
     public function testPathReturnsTheIncludesDirectory()

From 7e5a1c951a5ba70590f7bdf855d12d5dee1ce4bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 16:37:02 +0200
Subject: [PATCH 1724/2811] Create FilenamePrefixNavigationPriorityTest.php

---
 .../FilenamePrefixNavigationPriorityTest.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
new file mode 100644
index 00000000000..cd76aa492c4
--- /dev/null
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * High level test for the feature that allows navigation items to be sorted by filename prefix.
+ *
+ * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ */
+class FilenamePrefixNavigationPriorityTest extends TestCase
+{
+    //
+}

From 4950f8b86272b7ef4c29cdbaa088969a77566269 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 16:37:58 +0200
Subject: [PATCH 1725/2811] Spec out the test

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index cd76aa492c4..32451e7a4a2 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -9,6 +9,9 @@
 /**
  * High level test for the feature that allows navigation items to be sorted by filename prefix.
  *
+ * The feature can be disabled in the config. It also works within sidebar groups,
+ * so that multiple groups can have the same prefix independent of other groups.
+ *
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  */

From 37e74f9f775e9ce523b640c4870ee6f1a71154cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 16:40:16 +0200
Subject: [PATCH 1726/2811] Draft fixture helpers

---
 .../FilenamePrefixNavigationPriorityTest.php  | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 32451e7a4a2..f1a1cd801ea 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -17,5 +17,31 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
-    //
+    protected function fixtureFlatMain(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    protected function fixtureGroupedMain(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    protected function fixtureFlatSidebar(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    protected function fixtureGroupedSidebar(): array
+    {
+        return [
+            //
+        ];
+    }
 }

From 7f733e0ca089450373b73c73f3a14a1ddf381db1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 16:44:41 +0200
Subject: [PATCH 1727/2811] Define fixture data

---
 .../FilenamePrefixNavigationPriorityTest.php  | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index f1a1cd801ea..e26eb6bae55 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -20,28 +20,51 @@ class FilenamePrefixNavigationPriorityTest extends TestCase
     protected function fixtureFlatMain(): array
     {
         return [
-            //
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
         ];
     }
 
     protected function fixtureGroupedMain(): array
     {
         return [
-            //
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
+            '04-api' => [
+                '01-readme.md',
+                '02-installation.md',
+                '03-getting-started.md',
+            ],
         ];
     }
 
     protected function fixtureFlatSidebar(): array
     {
         return [
-            //
+            '01-readme.md',
+            '02-installation.md',
+            '03-getting-started.md',
         ];
     }
 
     protected function fixtureGroupedSidebar(): array
     {
         return [
-            //
+            '01-readme.md',
+            '02-installation.md',
+            '03-getting-started.md',
+            '04-introduction' => [
+                '01-features.md',
+                '02-extensions.md',
+                '03-configuration.md',
+            ],
+            '05-advanced' => [
+                '01-features.md',
+                '02-extensions.md',
+                '03-configuration.md',
+            ],
         ];
     }
 }

From d4b3829b8a286890dc8f152db8761874605002cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 16:47:13 +0200
Subject: [PATCH 1728/2811] Add more fixtures

---
 .../FilenamePrefixNavigationPriorityTest.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index e26eb6bae55..a2ec673c6e6 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -67,4 +67,32 @@ protected function fixtureGroupedSidebar(): array
             ],
         ];
     }
+
+    protected function fixturePrefixSyntaxes(): array
+    {
+        return [
+            [
+                '1-foo.md',
+                '2-bar.md',
+                '3-baz.md',
+            ], [
+                '01-foo.md',
+                '02-bar.md',
+                '03-baz.md',
+            ], [
+                '001-foo.md',
+                '002-bar.md',
+                '003-baz.md',
+            ],
+        ];
+    }
+
+    public function fixtureFileExtensions(): array
+    {
+        return [
+            '01-foo.md',
+            '02-bar.html',
+            '03-baz.blade.php',
+        ];
+    }
 }

From 1fa4ab2848c96b1c8d0bf32da854d98fa679ea2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:25:03 +0200
Subject: [PATCH 1729/2811] Draft new tests

---
 .../Feature/FilenamePrefixNavigationPriorityTest.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index a2ec673c6e6..442cd142872 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -17,6 +17,16 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
+    public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromIdentifiers()
+    {
+        //
+    }
+
+    public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromIdentifiersWhenFeatureIsDisabled()
+    {
+        //
+    }
+
     protected function fixtureFlatMain(): array
     {
         return [

From b2ca812d67bfedc4901edb83198130fe5ebe52cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:26:32 +0200
Subject: [PATCH 1730/2811] Create FilenamePrefixNavigationHelper.php

---
 .../Navigation/FilenamePrefixNavigationHelper.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
new file mode 100644
index 00000000000..03c565084a7
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+/**
+ * @internal Helper class for the new Filename Prefix Navigation feature.
+ *
+ * @experimental The code herein may be moved to more appropriate locations in the future.
+ */
+class FilenamePrefixNavigationHelper
+{
+    //
+}

From 7484d5627fd16b8d7c9688eb1330adecefa6412f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:43:38 +0200
Subject: [PATCH 1731/2811] Add helper to check if identifier is numbered

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 03c565084a7..5996b965958 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -11,5 +11,8 @@
  */
 class FilenamePrefixNavigationHelper
 {
-    //
+    public static function isIdentifierNumbered(string $identifier): bool
+    {
+        return preg_match('/^\d+-/', $identifier) === 1;
+    }
 }

From d05ee52031644f2d7b35b9f0fa0a4491771b4cad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:44:09 +0200
Subject: [PATCH 1732/2811] Create a temporary way to declare tests within the
 class

Allows Copilot to better generate tests, we will move these back to the test later
---
 .../FilenamePrefixNavigationHelper.php        | 22 +++++++++++++++++++
 .../FilenamePrefixNavigationPriorityTest.php  | 14 ++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 5996b965958..b219d388060 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Testing\UnitTestCase;
+
 /**
  * @internal Helper class for the new Filename Prefix Navigation feature.
  *
@@ -15,4 +17,24 @@ public static function isIdentifierNumbered(string $identifier): bool
     {
         return preg_match('/^\d+-/', $identifier) === 1;
     }
+
+    public static function getTest(): UnitTestCase
+    {
+        return new class('FilenamePrefixNavigationHelperTest') extends UnitTestCase
+        {
+            public function testIdentifiersWithNumericalPrefixesAreDetected()
+            {
+                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+            }
+
+            public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+            {
+                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+            }
+        };
+    }
 }
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 442cd142872..4b362ad3aff 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -5,6 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use PHPUnit\Framework\TestRunner;
+use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
 /**
  * High level test for the feature that allows navigation items to be sorted by filename prefix.
@@ -17,6 +19,18 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
+    public function testFilenamePrefixNavigationHelper()
+    {
+        $case = FilenamePrefixNavigationHelper::getTest();
+
+        // Get methods defined in the test case but not in the parent class.
+        $methods = array_diff(get_class_methods($case), get_class_methods(TestCase::class));
+
+        foreach ($methods as $method) {
+            (new TestRunner)->run(new $case($method));
+        }
+    }
+
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromIdentifiers()
     {
         //

From 3fc5752d3b3223faf43be98ed5e09fb9c50be665 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:44:20 +0200
Subject: [PATCH 1733/2811] Add coverage annotation

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 4b362ad3aff..c05d250d37b 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -14,6 +14,7 @@
  * The feature can be disabled in the config. It also works within sidebar groups,
  * so that multiple groups can have the same prefix independent of other groups.
  *
+ * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  */

From b87eee1e0cc40a5d9c48faa0c936c8df76c71258 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:45:51 +0200
Subject: [PATCH 1734/2811] Skip unimplemented tests

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index c05d250d37b..69f4977e70d 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -34,12 +34,12 @@ public function testFilenamePrefixNavigationHelper()
 
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromIdentifiers()
     {
-        //
+        $this->markTestSkipped('TODO');
     }
 
     public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromIdentifiersWhenFeatureIsDisabled()
     {
-        //
+        $this->markTestSkipped('TODO');
     }
 
     protected function fixtureFlatMain(): array

From 8d167bace0a99d110cee118d564007c3f078f38a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:49:14 +0200
Subject: [PATCH 1735/2811] Add enabled helper

---
 .../Navigation/FilenamePrefixNavigationHelper.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index b219d388060..82ea5752afc 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -13,6 +13,11 @@
  */
 class FilenamePrefixNavigationHelper
 {
+    public static function enabled(): bool
+    {
+        return true;
+    }
+
     public static function isIdentifierNumbered(string $identifier): bool
     {
         return preg_match('/^\d+-/', $identifier) === 1;
@@ -22,6 +27,16 @@ public static function getTest(): UnitTestCase
     {
         return new class('FilenamePrefixNavigationHelperTest') extends UnitTestCase
         {
+            public function testEnabledReturnsTrueWhenEnabled()
+            {
+                $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+            }
+
+            public function testEnabledReturnsFalseWhenDisabled()
+            {
+                $this->markTestSkipped('TODO: Support for disabling the feature.');
+            }
+
             public function testIdentifiersWithNumericalPrefixesAreDetected()
             {
                 $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));

From 3aa4247cb0044c69a7435a0ca51b235dec321235 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:50:42 +0200
Subject: [PATCH 1736/2811] Document methods

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 82ea5752afc..9e40081b6eb 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -13,11 +13,17 @@
  */
 class FilenamePrefixNavigationHelper
 {
+    /**
+     * Determines if the feature is enabled.
+     */
     public static function enabled(): bool
     {
         return true;
     }
 
+    /**
+     * Determines if a given identifier has a numerical prefix.
+     */
     public static function isIdentifierNumbered(string $identifier): bool
     {
         return preg_match('/^\d+-/', $identifier) === 1;

From 178255509a73cb799c9b834e20dce2f149e4434b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:51:31 +0200
Subject: [PATCH 1737/2811] Split number and identifier

---
 .../FilenamePrefixNavigationHelper.php        | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 9e40081b6eb..994377ca380 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -29,6 +29,16 @@ public static function isIdentifierNumbered(string $identifier): bool
         return preg_match('/^\d+-/', $identifier) === 1;
     }
 
+    /**
+     * Splits a numbered identifier into its numerical prefix and the rest of the identifier.
+     *
+     * @return array{numeric-string, string}
+     */
+    public static function splitNumberAndIdentifier(string $identifier): array
+    {
+        return explode('-', $identifier, 2);
+    }
+
     public static function getTest(): UnitTestCase
     {
         return new class('FilenamePrefixNavigationHelperTest') extends UnitTestCase
@@ -56,6 +66,20 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
                 $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
                 $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
             }
+
+            public function testSplitNumberAndIdentifier()
+            {
+                $this->assertSame(['01', 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+                $this->assertSame(['02', 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+                $this->assertSame(['03', 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+            }
+
+            public function testSplitNumberAndIdentifierWithMultipleDigits()
+            {
+                $this->assertSame(['123', 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+                $this->assertSame(['456', 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+                $this->assertSame(['789', 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+            }
         };
     }
 }

From 66fe07cd1b2cc4a05616fa2d7513ed3204ee5b9d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:52:11 +0200
Subject: [PATCH 1738/2811] Introduce local variable

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 994377ca380..ea65f7c54a8 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -36,7 +36,9 @@ public static function isIdentifierNumbered(string $identifier): bool
      */
     public static function splitNumberAndIdentifier(string $identifier): array
     {
-        return explode('-', $identifier, 2);
+        $parts = explode('-', $identifier, 2);
+
+        return $parts;
     }
 
     public static function getTest(): UnitTestCase

From a0c20eade66bbb4241f5e39284a95225362bae75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:53:48 +0200
Subject: [PATCH 1739/2811] Parse the number to an integer

---
 .../FilenamePrefixNavigationHelper.php           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index ea65f7c54a8..61c325807c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -32,12 +32,14 @@ public static function isIdentifierNumbered(string $identifier): bool
     /**
      * Splits a numbered identifier into its numerical prefix and the rest of the identifier.
      *
-     * @return array{numeric-string, string}
+     * @return array{integer, string}
      */
     public static function splitNumberAndIdentifier(string $identifier): array
     {
         $parts = explode('-', $identifier, 2);
 
+        $parts[0] = (int) $parts[0];
+
         return $parts;
     }
 
@@ -71,16 +73,16 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
 
             public function testSplitNumberAndIdentifier()
             {
-                $this->assertSame(['01', 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-                $this->assertSame(['02', 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-                $this->assertSame(['03', 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+                $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+                $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+                $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
             }
 
             public function testSplitNumberAndIdentifierWithMultipleDigits()
             {
-                $this->assertSame(['123', 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-                $this->assertSame(['456', 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-                $this->assertSame(['789', 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+                $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+                $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+                $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
             }
         };
     }

From df35e5a7e110ac9c14766c04a25ed482c4860ae9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 20:54:31 +0200
Subject: [PATCH 1740/2811] Assert type structure

---
 .../Navigation/FilenamePrefixNavigationHelper.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 61c325807c8..c461cafd86d 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -36,6 +36,8 @@ public static function isIdentifierNumbered(string $identifier): bool
      */
     public static function splitNumberAndIdentifier(string $identifier): array
     {
+        assert(self::isIdentifierNumbered($identifier));
+
         $parts = explode('-', $identifier, 2);
 
         $parts[0] = (int) $parts[0];
@@ -84,6 +86,14 @@ public function testSplitNumberAndIdentifierWithMultipleDigits()
                 $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
                 $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
             }
+
+            public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+            {
+                $this->expectException(\AssertionError::class);
+                // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+                FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+            }
         };
     }
 }

From ae17392a42094284abc3aa65c246e289d1848864 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:19:20 +0200
Subject: [PATCH 1741/2811] Annotate method

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index c461cafd86d..4c9d2011a69 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -45,6 +45,9 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 
+    /**
+     * Returns the test case for the FilenamePrefixNavigationHelper.
+     */
     public static function getTest(): UnitTestCase
     {
         return new class('FilenamePrefixNavigationHelperTest') extends UnitTestCase

From 7a9fd6372f37ce2913706f2c361773dfed1d32bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:23:21 +0200
Subject: [PATCH 1742/2811] Refactor inline test hack to load full class

---
 .../FilenamePrefixNavigationHelper.php        | 100 ++++++++----------
 .../FilenamePrefixNavigationPriorityTest.php  |   6 +-
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 4c9d2011a69..f5ecd31576a 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -44,59 +44,53 @@ public static function splitNumberAndIdentifier(string $identifier): array
 
         return $parts;
     }
+}
 
-    /**
-     * Returns the test case for the FilenamePrefixNavigationHelper.
-     */
-    public static function getTest(): UnitTestCase
+class FilenamePrefixNavigationHelperTest extends UnitTestCase
+{
+    public function testEnabledReturnsTrueWhenEnabled()
     {
-        return new class('FilenamePrefixNavigationHelperTest') extends UnitTestCase
-        {
-            public function testEnabledReturnsTrueWhenEnabled()
-            {
-                $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-            }
-
-            public function testEnabledReturnsFalseWhenDisabled()
-            {
-                $this->markTestSkipped('TODO: Support for disabling the feature.');
-            }
-
-            public function testIdentifiersWithNumericalPrefixesAreDetected()
-            {
-                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-                $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-            }
-
-            public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-            {
-                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-                $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-            }
-
-            public function testSplitNumberAndIdentifier()
-            {
-                $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-                $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-                $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-            }
-
-            public function testSplitNumberAndIdentifierWithMultipleDigits()
-            {
-                $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-                $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-                $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-            }
-
-            public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-            {
-                $this->expectException(\AssertionError::class);
-                // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-                FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-            }
-        };
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
     }
-}
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        $this->markTestSkipped('TODO: Support for disabling the feature.');
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->expectException(\AssertionError::class);
+        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 69f4977e70d..fbccf1defa4 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -7,6 +7,7 @@
 use Hyde\Testing\TestCase;
 use PHPUnit\Framework\TestRunner;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
+use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelperTest;
 
 /**
  * High level test for the feature that allows navigation items to be sorted by filename prefix.
@@ -22,7 +23,10 @@ class FilenamePrefixNavigationPriorityTest extends TestCase
 {
     public function testFilenamePrefixNavigationHelper()
     {
-        $case = FilenamePrefixNavigationHelper::getTest();
+        // Manually load test as it does not conform to PSR-4 autoloading.
+        require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
+
+        $case = FilenamePrefixNavigationHelperTest::class;
 
         // Get methods defined in the test case but not in the parent class.
         $methods = array_diff(get_class_methods($case), get_class_methods(TestCase::class));

From 9795e0d9172a660a031aae20d1e4ec6549282445 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:23:52 +0200
Subject: [PATCH 1743/2811] Import used functions

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index f5ecd31576a..e3cde2b5234 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -6,6 +6,10 @@
 
 use Hyde\Testing\UnitTestCase;
 
+use function assert;
+use function explode;
+use function preg_match;
+
 /**
  * @internal Helper class for the new Filename Prefix Navigation feature.
  *

From 9c5fa9891f621381e584b5a5ee42b222d081b3f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:25:17 +0200
Subject: [PATCH 1744/2811] Check the config for enabled state

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index e3cde2b5234..09ff5ad6eb9 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use Hyde\Facades\Config;
 use Hyde\Testing\UnitTestCase;
 
 use function assert;
@@ -22,7 +23,7 @@ class FilenamePrefixNavigationHelper
      */
     public static function enabled(): bool
     {
-        return true;
+        return Config::getBool('hyde.filename_page_ordering', true);
     }
 
     /**
@@ -59,7 +60,9 @@ public function testEnabledReturnsTrueWhenEnabled()
 
     public function testEnabledReturnsFalseWhenDisabled()
     {
-        $this->markTestSkipped('TODO: Support for disabling the feature.');
+        self::mockConfig(['hyde.filename_page_ordering' => false]);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
     }
 
     public function testIdentifiersWithNumericalPrefixesAreDetected()

From bfa6642886e7f474080532a0b2eaf51998b8ac5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:30:17 +0200
Subject: [PATCH 1745/2811] Rename tests for new design plan

See https://github.com/hydephp/develop/pull/1709#issuecomment-2086420773 (edit 2 and 3)
---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index fbccf1defa4..c12cc27e41e 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -36,12 +36,12 @@ public function testFilenamePrefixNavigationHelper()
         }
     }
 
-    public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromIdentifiers()
+    public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
         $this->markTestSkipped('TODO');
     }
 
-    public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromIdentifiersWhenFeatureIsDisabled()
+    public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeysWhenFeatureIsDisabled()
     {
         $this->markTestSkipped('TODO');
     }

From c05e72ec937bb35544d5e6bdddf9b0f5a7103634 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:35:23 +0200
Subject: [PATCH 1746/2811] Implement the tests

---
 .../FilenamePrefixNavigationPriorityTest.php  | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index c12cc27e41e..5369f1ae994 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
+use Hyde\Pages\MarkdownPage;
 use PHPUnit\Framework\TestRunner;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelperTest;
@@ -38,12 +40,62 @@ public function testFilenamePrefixNavigationHelper()
 
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
-        $this->markTestSkipped('TODO');
+        $this->file('_pages/01-home.md');
+
+        $identifier = '01-home';
+
+        // Assert it is discovered.
+        $discovered = MarkdownPage::get($identifier);
+        $this->assertNotNull($discovered, 'The page was not discovered.');
+
+        // Assert it is parsable
+        $parsed = MarkdownPage::parse($identifier);
+        $this->assertNotNull($parsed, 'The page was not parsable.');
+
+        // Sanity check
+        $this->assertEquals($discovered, $parsed);
+
+        $page = $discovered;
+
+        // Assert identifier is the same.
+        $this->assertSame($identifier, $page->getIdentifier());
+
+        // Assert the route key is trimmed.
+        $this->assertSame('home', $page->getRouteKey());
+
+        // Assert route key dependents are trimmed.
+        $this->assertSame('home.html', $page->getOutputPath());
     }
 
     public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeysWhenFeatureIsDisabled()
     {
-        $this->markTestSkipped('TODO');
+        Config::set('hyde.filename_page_ordering', false);
+
+        $this->file('_pages/01-home.md');
+
+        $identifier = '01-home';
+
+        // Assert it is discovered.
+        $discovered = MarkdownPage::get($identifier);
+        $this->assertNotNull($discovered, 'The page was not discovered.');
+
+        // Assert it is parsable
+        $parsed = MarkdownPage::parse($identifier);
+        $this->assertNotNull($parsed, 'The page was not parsable.');
+
+        // Sanity check
+        $this->assertEquals($discovered, $parsed);
+
+        $page = $discovered;
+
+        // Assert identifier is the same.
+        $this->assertSame($identifier, $page->getIdentifier());
+
+        // Assert the route key is trimmed.
+        $this->assertSame($identifier, $page->getRouteKey());
+
+        // Assert route key dependents are trimmed.
+        $this->assertSame("$identifier.html", $page->getOutputPath());
     }
 
     protected function fixtureFlatMain(): array

From 9271e403e884b7adffa87dd0bd751dcc106242de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:40:26 +0200
Subject: [PATCH 1747/2811] Update route key creation to split numbered
 identifiers

---
 packages/framework/src/Support/Models/RouteKey.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 1ec5ae2bc7d..1254aa396fc 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -5,6 +5,7 @@
 namespace Hyde\Support\Models;
 
 use Stringable;
+use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
 use function unslash;
 
@@ -47,6 +48,10 @@ public function get(): string
     /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
     public static function fromPage(string $pageClass, string $identifier): self
     {
+        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
+            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
+        }
+
         return new self(unslash("{$pageClass::baseRouteKey()}/$identifier"));
     }
 }

From 777ac9d424ba6ab6998afc3fad3f3928a15f36df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:41:33 +0200
Subject: [PATCH 1748/2811] Extract experimental helper method

---
 packages/framework/src/Support/Models/RouteKey.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 1254aa396fc..f7e7a140023 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -30,6 +30,16 @@ public static function make(string $key): self
         return new self($key);
     }
 
+    /** @experimental */
+    protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
+    {
+        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
+            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
+        }
+
+        return $identifier;
+    }
+
     public function __construct(string $key)
     {
         $this->key = $key;
@@ -48,9 +58,7 @@ public function get(): string
     /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
     public static function fromPage(string $pageClass, string $identifier): self
     {
-        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
-            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
-        }
+        $identifier = self::splitNumberedIdentifiersIfNeeded($identifier);
 
         return new self(unslash("{$pageClass::baseRouteKey()}/$identifier"));
     }

From 09a828ef1f908439a330af33f60d04ba34ef04d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:41:46 +0200
Subject: [PATCH 1749/2811] Move down helper method

---
 .../framework/src/Support/Models/RouteKey.php | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index f7e7a140023..ecf98145996 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -30,16 +30,6 @@ public static function make(string $key): self
         return new self($key);
     }
 
-    /** @experimental */
-    protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
-    {
-        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
-            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
-        }
-
-        return $identifier;
-    }
-
     public function __construct(string $key)
     {
         $this->key = $key;
@@ -62,4 +52,14 @@ public static function fromPage(string $pageClass, string $identifier): self
 
         return new self(unslash("{$pageClass::baseRouteKey()}/$identifier"));
     }
+
+    /** @experimental */
+    protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
+    {
+        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
+            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
+        }
+
+        return $identifier;
+    }
 }

From 8b7ce81c1cea333cef864d4a60a5096c6882508d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:43:16 +0200
Subject: [PATCH 1750/2811] Merge inline test into test case

---
 .../FilenamePrefixNavigationHelper.php        | 52 -------------------
 .../FilenamePrefixNavigationPriorityTest.php  | 52 +++++++++++++++++++
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 09ff5ad6eb9..e9059d2f344 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Testing\UnitTestCase;
 
 use function assert;
 use function explode;
@@ -50,54 +49,3 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 }
-
-class FilenamePrefixNavigationHelperTest extends UnitTestCase
-{
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        self::mockConfig(['hyde.filename_page_ordering' => false]);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->expectException(\AssertionError::class);
-        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-    }
-}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 5369f1ae994..6845afd8ed4 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -25,6 +25,8 @@ class FilenamePrefixNavigationPriorityTest extends TestCase
 {
     public function testFilenamePrefixNavigationHelper()
     {
+        $this->markTestSkipped('Disabled in CI');
+
         // Manually load test as it does not conform to PSR-4 autoloading.
         require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
 
@@ -38,6 +40,56 @@ public function testFilenamePrefixNavigationHelper()
         }
     }
 
+    // Helper test
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        Config::set('hyde.filename_page_ordering', false);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->expectException(\AssertionError::class);
+        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+    // End helper test
+
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
         $this->file('_pages/01-home.md');

From c5e0433b2c206508be0fb0a27743e675fe265e7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:59:23 +0200
Subject: [PATCH 1751/2811] Revert "Merge inline test into test case"

This reverts commit 8b7ce81c1cea333cef864d4a60a5096c6882508d.
---
 .../FilenamePrefixNavigationHelper.php        | 52 +++++++++++++++++++
 .../FilenamePrefixNavigationPriorityTest.php  | 52 -------------------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index e9059d2f344..09ff5ad6eb9 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Hyde\Testing\UnitTestCase;
 
 use function assert;
 use function explode;
@@ -49,3 +50,54 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 }
+
+class FilenamePrefixNavigationHelperTest extends UnitTestCase
+{
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        self::mockConfig(['hyde.filename_page_ordering' => false]);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->expectException(\AssertionError::class);
+        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 6845afd8ed4..5369f1ae994 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -25,8 +25,6 @@ class FilenamePrefixNavigationPriorityTest extends TestCase
 {
     public function testFilenamePrefixNavigationHelper()
     {
-        $this->markTestSkipped('Disabled in CI');
-
         // Manually load test as it does not conform to PSR-4 autoloading.
         require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
 
@@ -40,56 +38,6 @@ public function testFilenamePrefixNavigationHelper()
         }
     }
 
-    // Helper test
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        Config::set('hyde.filename_page_ordering', false);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->expectException(\AssertionError::class);
-        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-    }
-    // End helper test
-
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
         $this->file('_pages/01-home.md');

From 2936b349f6fae15bfb7653c372dbdd1d41d6d143 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 21:59:48 +0200
Subject: [PATCH 1752/2811] Change mock syntax

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 09ff5ad6eb9..6f1195518ce 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -60,7 +60,7 @@ public function testEnabledReturnsTrueWhenEnabled()
 
     public function testEnabledReturnsFalseWhenDisabled()
     {
-        self::mockConfig(['hyde.filename_page_ordering' => false]);
+        Config::set('hyde.filename_page_ordering', false);
 
         $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
     }

From fe2c1577d0c1baf1fa7da55cab03db3bfca96e10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 22:01:15 +0200
Subject: [PATCH 1753/2811] Skip assertion test

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 6f1195518ce..fa6201f521f 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -95,8 +95,10 @@ public function testSplitNumberAndIdentifierWithMultipleDigits()
 
     public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
     {
+        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
         $this->expectException(\AssertionError::class);
-        // $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
 
         FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
     }

From 14757ab3c22eb483e4ebaef11eaf5fdf38f96813 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Apr 2024 22:02:02 +0200
Subject: [PATCH 1754/2811] Reapply "Merge inline test into test case"

This reverts commit c5e0433b2c206508be0fb0a27743e675fe265e7b.
---
 .../FilenamePrefixNavigationHelper.php        | 53 -------------------
 .../FilenamePrefixNavigationPriorityTest.php  | 53 +++++++++++++++----
 2 files changed, 44 insertions(+), 62 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index fa6201f521f..8c94875b950 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -50,56 +50,3 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 }
-
-class FilenamePrefixNavigationHelperTest extends UnitTestCase
-{
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        Config::set('hyde.filename_page_ordering', false);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-    }
-}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 5369f1ae994..2cf7879569e 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -23,19 +23,54 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
-    public function testFilenamePrefixNavigationHelper()
+    public function testEnabledReturnsTrueWhenEnabled()
     {
-        // Manually load test as it does not conform to PSR-4 autoloading.
-        require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        Config::set('hyde.filename_page_ordering', false);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
 
-        $case = FilenamePrefixNavigationHelperTest::class;
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
 
-        // Get methods defined in the test case but not in the parent class.
-        $methods = array_diff(get_class_methods($case), get_class_methods(TestCase::class));
+        $this->expectException(\AssertionError::class);
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
 
-        foreach ($methods as $method) {
-            (new TestRunner)->run(new $case($method));
-        }
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
     }
 
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()

From e947a62f7e12257871e9dc723544c49ed0232eae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 10:00:36 +0200
Subject: [PATCH 1755/2811] Revert "Reapply "Merge inline test into test case""

This reverts commit 14757ab3c22eb483e4ebaef11eaf5fdf38f96813.
---
 .../FilenamePrefixNavigationHelper.php        | 53 +++++++++++++++++++
 .../FilenamePrefixNavigationPriorityTest.php  | 53 ++++---------------
 2 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 8c94875b950..fa6201f521f 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -50,3 +50,56 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 }
+
+class FilenamePrefixNavigationHelperTest extends UnitTestCase
+{
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        Config::set('hyde.filename_page_ordering', false);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
+        $this->expectException(\AssertionError::class);
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 2cf7879569e..5369f1ae994 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -23,54 +23,19 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
-    public function testEnabledReturnsTrueWhenEnabled()
+    public function testFilenamePrefixNavigationHelper()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        Config::set('hyde.filename_page_ordering', false);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
+        // Manually load test as it does not conform to PSR-4 autoloading.
+        require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
 
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+        $case = FilenamePrefixNavigationHelperTest::class;
 
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+        // Get methods defined in the test case but not in the parent class.
+        $methods = array_diff(get_class_methods($case), get_class_methods(TestCase::class));
 
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+        foreach ($methods as $method) {
+            (new TestRunner)->run(new $case($method));
+        }
     }
 
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()

From 0792b8682e0c85051ceb19d52e35660bfc3b56ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 10:03:40 +0200
Subject: [PATCH 1756/2811] Extract proper test file

---
 .../FilenamePrefixNavigationHelper.php        | 54 ----------------
 .../FilenamePrefixNavigationPriorityTest.php  | 18 ------
 ...lenamePrefixNavigationPriorityUnitTest.php | 63 +++++++++++++++++++
 3 files changed, 63 insertions(+), 72 deletions(-)
 create mode 100644 packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index fa6201f521f..e9059d2f344 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
-use Hyde\Testing\UnitTestCase;
 
 use function assert;
 use function explode;
@@ -50,56 +49,3 @@ public static function splitNumberAndIdentifier(string $identifier): array
         return $parts;
     }
 }
-
-class FilenamePrefixNavigationHelperTest extends UnitTestCase
-{
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        Config::set('hyde.filename_page_ordering', false);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-    }
-}
\ No newline at end of file
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 5369f1ae994..380c400f93a 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -7,9 +7,6 @@
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
-use PHPUnit\Framework\TestRunner;
-use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
-use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelperTest;
 
 /**
  * High level test for the feature that allows navigation items to be sorted by filename prefix.
@@ -23,21 +20,6 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
-    public function testFilenamePrefixNavigationHelper()
-    {
-        // Manually load test as it does not conform to PSR-4 autoloading.
-        require_once __DIR__ . '/../../src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php';
-
-        $case = FilenamePrefixNavigationHelperTest::class;
-
-        // Get methods defined in the test case but not in the parent class.
-        $methods = array_diff(get_class_methods($case), get_class_methods(TestCase::class));
-
-        foreach ($methods as $method) {
-            (new TestRunner)->run(new $case($method));
-        }
-    }
-
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
         $this->file('_pages/01-home.md');
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
new file mode 100644
index 00000000000..2e74b51cc9d
--- /dev/null
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
+
+class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
+{
+    protected static bool $needsConfig = true;
+
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        self::mockConfig(['hyde.filename_page_ordering' => false]);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
+        $this->expectException(\AssertionError::class);
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+}

From 59a8a81c059f4c7e4f5d45800f0d3cc8f844df87 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 10:08:16 +0200
Subject: [PATCH 1757/2811] Disable page ordering in unrelated test

---
 .../framework/tests/Feature/Services/SitemapServiceTest.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index d54b9711dfa..f718fe3d223 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -7,6 +7,7 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use SimpleXMLElement;
+use Hyde\Facades\Config;
 use Hyde\Facades\Filesystem;
 use Hyde\Framework\Features\XmlGenerators\SitemapGenerator;
 use Hyde\Hyde;
@@ -28,6 +29,8 @@ protected function setUp(): void
 
         copy(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'), Hyde::path('_pages/index.blade.php'));
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
+
+        Config::set(['hyde.filename_page_ordering' => false]);
     }
 
     public function testServiceInstantiatesXmlElement()

From 9c1507d822c90dd48f23a3735596652683bee1d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 10:14:40 +0200
Subject: [PATCH 1758/2811] Set up coverage

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 1 +
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 380c400f93a..41316de0c13 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -17,6 +17,7 @@
  * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 2e74b51cc9d..d614b73f735 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -7,6 +7,9 @@
 use Hyde\Testing\UnitTestCase;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
+/**
+ * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
+ */
 class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
 {
     protected static bool $needsConfig = true;

From e936b9cade62af9a9230bc968a4f60af18e8f4f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 11:32:00 +0200
Subject: [PATCH 1759/2811] Create initial fixture setup helper

Takes about 7ms for 3 pages so really needs to be optimized to use the VFS
---
 .../Feature/FilenamePrefixNavigationPriorityTest.php     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 41316de0c13..1ac93b6e013 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -81,6 +81,15 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
         $this->assertSame("$identifier.html", $page->getOutputPath());
     }
 
+    protected function setUpFixture(array $files): array
+    {
+        foreach ($files as $file) {
+            $this->file("_pages/$file");
+        }
+
+        return MarkdownPage::all()->all();
+    }
+
     protected function fixtureFlatMain(): array
     {
         return [

From e248e6776fc6f6726cb18003f0eaf476003a564e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:37:48 +0200
Subject: [PATCH 1760/2811] Add pages to kernel directly without the filesystem

Much faster to do it this way
---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 1ac93b6e013..fae0a772c7c 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
@@ -84,7 +85,7 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
     protected function setUpFixture(array $files): array
     {
         foreach ($files as $file) {
-            $this->file("_pages/$file");
+            Hyde::pages()->addPage(new MarkdownPage(basename($file, '.md')));
         }
 
         return MarkdownPage::all()->all();

From 4140df178566945ae97b8c044657ea1a64e58c23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:38:09 +0200
Subject: [PATCH 1761/2811] Generate some content for the page

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index fae0a772c7c..d8dad8e90ba 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -85,7 +85,7 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
     protected function setUpFixture(array $files): array
     {
         foreach ($files as $file) {
-            Hyde::pages()->addPage(new MarkdownPage(basename($file, '.md')));
+            Hyde::pages()->addPage(new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n"));
         }
 
         return MarkdownPage::all()->all();

From bfd8cac37cab5492def4685969ac34d3f9bdedeb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:38:19 +0200
Subject: [PATCH 1762/2811] Draft first test

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index d8dad8e90ba..329a6e936cf 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -82,6 +82,11 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
         $this->assertSame("$identifier.html", $page->getOutputPath());
     }
 
+    public function test_fixtureFlatMain_ordering()
+    {
+        $pages = $this->setUpFixture($this->fixtureFlatMain());
+    }
+
     protected function setUpFixture(array $files): array
     {
         foreach ($files as $file) {

From 4b597602dc9cc51b93abfeaf59f86a6b1506d462 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:41:05 +0200
Subject: [PATCH 1763/2811] Add the page to kernel routes

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 329a6e936cf..56e65da3f3a 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -90,7 +90,9 @@ public function test_fixtureFlatMain_ordering()
     protected function setUpFixture(array $files): array
     {
         foreach ($files as $file) {
-            Hyde::pages()->addPage(new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n"));
+            $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+            Hyde::pages()->addPage($page);
+            Hyde::routes()->addRoute($page->getRoute());
         }
 
         return MarkdownPage::all()->all();

From b59f73eabaca9c056c9041fe4d616ff2578f086f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:45:12 +0200
Subject: [PATCH 1764/2811] Run without default pages

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 56e65da3f3a..b39f3b82d42 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -89,6 +89,8 @@ public function test_fixtureFlatMain_ordering()
 
     protected function setUpFixture(array $files): array
     {
+        $this->withoutDefaultPages();
+
         foreach ($files as $file) {
             $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
             Hyde::pages()->addPage($page);

From 61c484ed3976679afec6d04d526117e7ab9cd792 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:45:25 +0200
Subject: [PATCH 1765/2811] Add todo

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index b39f3b82d42..0e57c2d350f 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -89,6 +89,7 @@ public function test_fixtureFlatMain_ordering()
 
     protected function setUpFixture(array $files): array
     {
+        // Todo: Replace kernel with mock class
         $this->withoutDefaultPages();
 
         foreach ($files as $file) {

From 9b01811c637c8e83226fc529eb7dff50550c2dc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:48:27 +0200
Subject: [PATCH 1766/2811] Set up clean environment in setup

---
 .../FilenamePrefixNavigationPriorityTest.php   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 0e57c2d350f..ec55a3b856b 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -22,6 +22,21 @@
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Todo: Replace kernel with mock class
+        $this->withoutDefaultPages();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->restoreDefaultPages();
+
+        parent::tearDown();
+    }
+
     public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
     {
         $this->file('_pages/01-home.md');
@@ -89,9 +104,6 @@ public function test_fixtureFlatMain_ordering()
 
     protected function setUpFixture(array $files): array
     {
-        // Todo: Replace kernel with mock class
-        $this->withoutDefaultPages();
-
         foreach ($files as $file) {
             $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
             Hyde::pages()->addPage($page);

From 3047f96ba5033127da7e45e88b40504d30fbebd0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:48:55 +0200
Subject: [PATCH 1767/2811] Add helper to assert order

---
 .../FilenamePrefixNavigationPriorityTest.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index ec55a3b856b..501ca321e85 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -8,6 +8,9 @@
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * High level test for the feature that allows navigation items to be sorted by filename prefix.
@@ -113,6 +116,18 @@ protected function setUpFixture(array $files): array
         return MarkdownPage::all()->all();
     }
 
+    /**
+     * @param array<\Hyde\Pages\Concerns\HydePage> $pages
+     * @param array<string> $expected
+     */
+    protected function assertOrder(array $pages, array $expected): void
+    {
+        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
+        $actual = $menu->getItems()->map(fn (NavigationItem $item) => $item->getPage()->getRouteKey())->all();
+
+        $this->assertSame($expected, $actual);
+    }
+
     protected function fixtureFlatMain(): array
     {
         return [

From f7303d8654df6d599b319a4fe2ee079cfe3b48e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:49:02 +0200
Subject: [PATCH 1768/2811] Assert order

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 501ca321e85..f968981974e 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -103,6 +103,8 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
     public function test_fixtureFlatMain_ordering()
     {
         $pages = $this->setUpFixture($this->fixtureFlatMain());
+
+        $this->assertOrder($pages, ['home', 'about', 'contact']);
     }
 
     protected function setUpFixture(array $files): array

From 31841599970a3190aa3dcbcfd26aea6b6edd2eb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:49:17 +0200
Subject: [PATCH 1769/2811] Remove unused parameter

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index f968981974e..8d20432f4d0 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -104,7 +104,7 @@ public function test_fixtureFlatMain_ordering()
     {
         $pages = $this->setUpFixture($this->fixtureFlatMain());
 
-        $this->assertOrder($pages, ['home', 'about', 'contact']);
+        $this->assertOrder(['home', 'about', 'contact']);
     }
 
     protected function setUpFixture(array $files): array
@@ -119,10 +119,9 @@ protected function setUpFixture(array $files): array
     }
 
     /**
-     * @param array<\Hyde\Pages\Concerns\HydePage> $pages
      * @param array<string> $expected
      */
-    protected function assertOrder(array $pages, array $expected): void
+    protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         $actual = $menu->getItems()->map(fn (NavigationItem $item) => $item->getPage()->getRouteKey())->all();

From 7a8f478cfd8a0335a43027ebc670549d5137ce92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:49:30 +0200
Subject: [PATCH 1770/2811] Fix formatting

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 8d20432f4d0..7b7fc5e2558 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -118,9 +118,7 @@ protected function setUpFixture(array $files): array
         return MarkdownPage::all()->all();
     }
 
-    /**
-     * @param array<string> $expected
-     */
+    /** @param array<string> $expected */
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);

From 0102377e14268830b4cdebd99caa01a593cdbed4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:52:36 +0200
Subject: [PATCH 1771/2811] Remove unused variable

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 7b7fc5e2558..de5a37cfb4f 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -102,7 +102,7 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
 
     public function test_fixtureFlatMain_ordering()
     {
-        $pages = $this->setUpFixture($this->fixtureFlatMain());
+        $this->setUpFixture($this->fixtureFlatMain());
 
         $this->assertOrder(['home', 'about', 'contact']);
     }

From 9ae4ebd367d14d52e1d3787c149ee52b09c5a354 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:53:53 +0200
Subject: [PATCH 1772/2811] Test the reverse order

---
 .../Feature/FilenamePrefixNavigationPriorityTest.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index de5a37cfb4f..58b2a02a45f 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -107,6 +107,14 @@ public function test_fixtureFlatMain_ordering()
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
+    public function test_fixtureFlatMain_reverse_ordering()
+    {
+        // This is just a sanity check to make sure the helper is working, so we only need one of these.
+        $this->setUpFixture(array_reverse($this->fixtureFlatMain()));
+
+        $this->assertOrder(['home', 'about', 'contact']);
+    }
+
     protected function setUpFixture(array $files): array
     {
         foreach ($files as $file) {

From f9290c0f63fb2ae9bdd4288a2e8e0883bd5569f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:54:11 +0200
Subject: [PATCH 1773/2811] Return this instead of array

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 58b2a02a45f..750c5d85106 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -115,7 +115,7 @@ public function test_fixtureFlatMain_reverse_ordering()
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
-    protected function setUpFixture(array $files): array
+    protected function setUpFixture(array $files): self
     {
         foreach ($files as $file) {
             $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
@@ -123,7 +123,7 @@ protected function setUpFixture(array $files): array
             Hyde::routes()->addRoute($page->getRoute());
         }
 
-        return MarkdownPage::all()->all();
+        return $this;
     }
 
     /** @param array<string> $expected */

From b08bc08e34be5851b5e9ced8e57af5fc9d4bfd9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 13:58:32 +0200
Subject: [PATCH 1774/2811] Add todo

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 750c5d85106..a1c10dbf8e5 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -22,6 +22,8 @@
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
+ *
+ * Todo: Add test to ensure explicitly set priority overrides filename prefix.
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
 {

From b61d82175c64415bc1e520d0d1a978dbf977a86c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 16:59:34 +0200
Subject: [PATCH 1775/2811] Draft new helper to check file prefix for priority

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 ++++++
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index b7d4b905faf..ee1821b1a36 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -97,6 +97,7 @@ protected function makePriority(): int
     {
         return $this->searchForPriorityInFrontMatter()
             ?? $this->searchForPriorityInConfigs()
+            ?? $this->checkFilePrefixForOrder()
             ?? NavigationMenu::LAST;
     }
 
@@ -239,6 +240,11 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
         return $config[$pageKey] ?? null;
     }
 
+    private function checkFilePrefixForOrder(): ?int
+    {
+        return null;
+    }
+
     private function canUseSubdirectoryForGroups(): bool
     {
         return $this->getSubdirectoryConfiguration() === 'dropdown'
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index a1c10dbf8e5..793e600e66d 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -21,6 +21,7 @@
  * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory // Todo: Update the unit test for this class.
  * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
  *
  * Todo: Add test to ensure explicitly set priority overrides filename prefix.

From a2fce9285cb23f3c26ac5e926632c51829bf9135 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:00:19 +0200
Subject: [PATCH 1776/2811] Early return to null when not enabled

---
 .../src/Framework/Factories/NavigationDataFactory.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index ee1821b1a36..40a09efe8d2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -12,6 +12,7 @@
 use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
 use function basename;
 use function array_flip;
@@ -242,6 +243,10 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
     private function checkFilePrefixForOrder(): ?int
     {
+        if (! FilenamePrefixNavigationHelper::enabled()) {
+            return null;
+        }
+
         return null;
     }
 

From 78c486f7af7cfe6e56ec18a7a22b8ee01fa90536 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:00:49 +0200
Subject: [PATCH 1777/2811] Early return to null when not numbered

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 40a09efe8d2..f9fadff17ec 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -247,6 +247,10 @@ private function checkFilePrefixForOrder(): ?int
             return null;
         }
 
+        if (! FilenamePrefixNavigationHelper::isIdentifierNumbered($this->identifier)) {
+            return null;
+        }
+
         return null;
     }
 

From 9853fce5e11880ac90c9a271f29854d34d2901a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:01:29 +0200
Subject: [PATCH 1778/2811] Return the parsed number

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index f9fadff17ec..42679f3d1cc 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -251,7 +251,7 @@ private function checkFilePrefixForOrder(): ?int
             return null;
         }
 
-        return null;
+        return FilenamePrefixNavigationHelper::splitNumberAndIdentifier($this->identifier)[0];
     }
 
     private function canUseSubdirectoryForGroups(): bool

From 5b3a7dd6e8a15eaa174315dccebf339648e4eedd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:38:29 +0200
Subject: [PATCH 1779/2811] Set dropdown config setting for test

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 793e600e66d..c6a7bb8d5e9 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -32,6 +32,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        Config::set('hyde.navigation.subdirectories', 'dropdown');
+
         // Todo: Replace kernel with mock class
         $this->withoutDefaultPages();
     }

From 4c1d886dca6f58a3cd1cb84a01c1fff4dbc7c822 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:38:44 +0200
Subject: [PATCH 1780/2811] Create subpages when setting up the fixture

---
 .../FilenamePrefixNavigationPriorityTest.php    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index c6a7bb8d5e9..fc47b1378a4 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -122,10 +122,19 @@ public function test_fixtureFlatMain_reverse_ordering()
 
     protected function setUpFixture(array $files): self
     {
-        foreach ($files as $file) {
-            $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
-            Hyde::pages()->addPage($page);
-            Hyde::routes()->addRoute($page->getRoute());
+        foreach ($files as $key => $file) {
+            if (is_string($file)) {
+                $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                Hyde::pages()->addPage($page);
+                Hyde::routes()->addRoute($page->getRoute());
+            } else {
+                foreach ($file as $child) {
+                    $group = str($key)->after('-');
+                    $page = new MarkdownPage($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                    Hyde::pages()->addPage($page);
+                    Hyde::routes()->addRoute($page->getRoute());
+                }
+            }
         }
 
         return $this;

From 12d5b7455f8311cb772a9d5384ac4697481dab21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:52:19 +0200
Subject: [PATCH 1781/2811] Convert the arrow function to a traditional closure

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index fc47b1378a4..4eb58132244 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -144,7 +144,9 @@ protected function setUpFixture(array $files): self
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        $actual = $menu->getItems()->map(fn (NavigationItem $item) => $item->getPage()->getRouteKey())->all();
+        $actual = $menu->getItems()->map(function (NavigationItem $item) {
+            return $item->getPage()->getRouteKey();
+        })->all();
 
         $this->assertSame($expected, $actual);
     }

From 9c3fd646ad4cb49443ac5879d56a1cadf0912ee9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:53:36 +0200
Subject: [PATCH 1782/2811] Handle groups when creating comparison structure

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 4eb58132244..2ac28e8b36b 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\TestCase;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
@@ -144,7 +145,10 @@ protected function setUpFixture(array $files): self
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        $actual = $menu->getItems()->map(function (NavigationItem $item) {
+        $actual = $menu->getItems()->map(function (NavigationItem|NavigationGroup $item) {
+            if ($item instanceof NavigationGroup) {
+                return $item->getItems()->map(fn ($item) => $item->getPage()->getRouteKey())->all();
+            }
             return $item->getPage()->getRouteKey();
         })->all();
 

From c5aaa2f9824563efb2b45d2a54452696613c7834 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:56:22 +0200
Subject: [PATCH 1783/2811] Add helper to check if identifier is nested

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index e9059d2f344..08e2b3bca48 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -48,4 +48,9 @@ public static function splitNumberAndIdentifier(string $identifier): array
 
         return $parts;
     }
+
+    protected static function isIdentifierNested(string $identifier): bool
+    {
+        return str_contains($identifier, '/');
+    }
 }

From 21e2dc7b9e4be63ba46d388d4feb20b73605fc6e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:57:28 +0200
Subject: [PATCH 1784/2811] Add helper to get core part of identifier

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 08e2b3bca48..df3d1fe34a4 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -53,4 +53,11 @@ protected static function isIdentifierNested(string $identifier): bool
     {
         return str_contains($identifier, '/');
     }
+
+    protected static function getCoreIdentifierPart(string $identifier): string
+    {
+        assert(self::isIdentifierNested($identifier));
+
+        return explode('/', $identifier)[1];
+    }
 }

From 293463054dd7d12a44b5e1a025bd7b4c9ab05d93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:58:09 +0200
Subject: [PATCH 1785/2811] Add helper to get nested identifier prefix

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index df3d1fe34a4..89e19354a69 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -60,4 +60,11 @@ protected static function getCoreIdentifierPart(string $identifier): string
 
         return explode('/', $identifier)[1];
     }
+
+    protected static function getNestedIdentifierPrefix(string $identifier): string
+    {
+        assert(self::isIdentifierNested($identifier));
+
+        return explode('/', $identifier)[0];
+    }
 }

From ef05a5260212327b0db52df86e7ac2ffb7a41123 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:58:25 +0200
Subject: [PATCH 1786/2811] Test parsing for nested identifiers

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index d614b73f735..c0d081441d4 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -63,4 +63,25 @@ public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNu
 
         FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
     }
+
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'));
+    }
+
+    public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForNestedPages()
+    {
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
+    }
 }

From abadc4fbc5686fa1eb1c76b0cc9d4ea5692c0967 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:59:02 +0200
Subject: [PATCH 1787/2811] Test parsing for deeply nested identifiers

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index c0d081441d4..f4b48df55c9 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -84,4 +84,25 @@ public function testSplitNumberAndIdentifierForNestedPages()
         $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'));
         $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
     }
+
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForDeeplyNestedPages()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'));
+    }
 }

From a0d8de5705ec1f48d04af4cb01506eb1de6d4857 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 17:59:51 +0200
Subject: [PATCH 1788/2811] Get core identifier part when nested

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 89e19354a69..d0f5b68b108 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -30,6 +30,10 @@ public static function enabled(): bool
      */
     public static function isIdentifierNumbered(string $identifier): bool
     {
+        if (self::isIdentifierNested($identifier)) {
+            $identifier = self::getCoreIdentifierPart($identifier);
+        }
+
         return preg_match('/^\d+-/', $identifier) === 1;
     }
 

From daf674c20db067d304b6aa05c91ee4a67e9473de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:03:10 +0200
Subject: [PATCH 1789/2811] If identifier is nested then split out its parts

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index d0f5b68b108..9621e6e6034 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -44,6 +44,11 @@ public static function isIdentifierNumbered(string $identifier): bool
      */
     public static function splitNumberAndIdentifier(string $identifier): array
     {
+        if (self::isIdentifierNested($identifier)) {
+            $parentPath = self::getNestedIdentifierPrefix($identifier);
+            $identifier = self::getCoreIdentifierPart($identifier);
+        }
+
         assert(self::isIdentifierNumbered($identifier));
 
         $parts = explode('-', $identifier, 2);

From 414c328d171f5f165f6b7ee74dd3f222c2c62573 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:03:21 +0200
Subject: [PATCH 1790/2811] Reassemble identifier when split

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 9621e6e6034..34fcafa482c 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -55,6 +55,10 @@ public static function splitNumberAndIdentifier(string $identifier): array
 
         $parts[0] = (int) $parts[0];
 
+        if (isset($parentPath)) {
+            $parts[1] = $parentPath . '/' . $parts[1];
+        }
+
         return $parts;
     }
 

From 468caac4ae265adba47ff82e390383069dc344cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:05:56 +0200
Subject: [PATCH 1791/2811] Properly support nested identifiers

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 34fcafa482c..a45b781d001 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Facades\Config;
+use Illuminate\Support\Str;
 
 use function assert;
 use function explode;
@@ -71,13 +72,13 @@ protected static function getCoreIdentifierPart(string $identifier): string
     {
         assert(self::isIdentifierNested($identifier));
 
-        return explode('/', $identifier)[1];
+        return Str::afterLast($identifier, '/');
     }
 
     protected static function getNestedIdentifierPrefix(string $identifier): string
     {
         assert(self::isIdentifierNested($identifier));
 
-        return explode('/', $identifier)[0];
+        return Str::beforeLast($identifier, '/');
     }
 }

From 888902cf2962690b633377d9fe399b302488f4a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:06:21 +0200
Subject: [PATCH 1792/2811] Swap method order for more logical class structure

---
 .../Navigation/FilenamePrefixNavigationHelper.php         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index a45b781d001..f957ddf6ca1 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -68,17 +68,17 @@ protected static function isIdentifierNested(string $identifier): bool
         return str_contains($identifier, '/');
     }
 
-    protected static function getCoreIdentifierPart(string $identifier): string
+    protected static function getNestedIdentifierPrefix(string $identifier): string
     {
         assert(self::isIdentifierNested($identifier));
 
-        return Str::afterLast($identifier, '/');
+        return Str::beforeLast($identifier, '/');
     }
 
-    protected static function getNestedIdentifierPrefix(string $identifier): string
+    protected static function getCoreIdentifierPart(string $identifier): string
     {
         assert(self::isIdentifierNested($identifier));
 
-        return Str::beforeLast($identifier, '/');
+        return Str::afterLast($identifier, '/');
     }
 }

From 9bcb09f5b8f997aed5e72662304e01062209bdcf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:07:28 +0200
Subject: [PATCH 1793/2811] Add crosslink annotations between related tests

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 ++
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 2ac28e8b36b..e3d374569fb 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -25,6 +25,8 @@
  * @covers \Hyde\Framework\Factories\NavigationDataFactory // Todo: Update the unit test for this class.
  * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
  *
+ * @see \Hyde\Framework\Testing\Unit\FilenamePrefixNavigationPriorityUnitTest
+ *
  * Todo: Add test to ensure explicitly set priority overrides filename prefix.
  */
 class FilenamePrefixNavigationPriorityTest extends TestCase
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index f4b48df55c9..561c9f00e96 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -9,6 +9,8 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
+ *
+ * @see \Hyde\Framework\Testing\Feature\FilenamePrefixNavigationPriorityTest
  */
 class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
 {

From 8a1bfe945690bca5e78340d08808e5ecf178f925 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 1 May 2024 16:07:39 +0000
Subject: [PATCH 1794/2811] Apply fixes from StyleCI

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php      | 2 +-
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index f957ddf6ca1..6e7dd12aba2 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -57,7 +57,7 @@ public static function splitNumberAndIdentifier(string $identifier): array
         $parts[0] = (int) $parts[0];
 
         if (isset($parentPath)) {
-            $parts[1] = $parentPath . '/' . $parts[1];
+            $parts[1] = $parentPath.'/'.$parts[1];
         }
 
         return $parts;
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index e3d374569fb..9bb28853fac 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -151,6 +151,7 @@ protected function assertOrder(array $expected): void
             if ($item instanceof NavigationGroup) {
                 return $item->getItems()->map(fn ($item) => $item->getPage()->getRouteKey())->all();
             }
+
             return $item->getPage()->getRouteKey();
         })->all();
 

From 8e929965574a853d0c91a3f744a466579d25b223 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:18:01 +0200
Subject: [PATCH 1795/2811] Map with keys

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 9bb28853fac..3b5bac557d6 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -147,12 +147,12 @@ protected function setUpFixture(array $files): self
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        $actual = $menu->getItems()->map(function (NavigationItem|NavigationGroup $item) {
+        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) {
             if ($item instanceof NavigationGroup) {
-                return $item->getItems()->map(fn ($item) => $item->getPage()->getRouteKey())->all();
+                return [$item->getGroupKey() => $item->getItems()->map(fn ($item) => $item->getPage()->getRouteKey())->all()];
             }
 
-            return $item->getPage()->getRouteKey();
+            return [$key => $item->getPage()->getRouteKey()];
         })->all();
 
         $this->assertSame($expected, $actual);

From f25f53bfa638947221db9c55bdf94dc091463c7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:18:34 +0200
Subject: [PATCH 1796/2811] Convert the arrow function to a traditional closure

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 3b5bac557d6..171fac76c63 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -149,7 +149,9 @@ protected function assertOrder(array $expected): void
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
         $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) {
             if ($item instanceof NavigationGroup) {
-                return [$item->getGroupKey() => $item->getItems()->map(fn ($item) => $item->getPage()->getRouteKey())->all()];
+                return [$item->getGroupKey() => $item->getItems()->map(function ($item) {
+                    return $item->getPage()->getRouteKey();
+                })->all()];
             }
 
             return [$key => $item->getPage()->getRouteKey()];

From a326e027754df1e3f433bb4404c3acac0570c1b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:19:29 +0200
Subject: [PATCH 1797/2811] Get only core part for comparison

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 171fac76c63..a6e04a26394 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
@@ -150,7 +151,7 @@ protected function assertOrder(array $expected): void
         $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) {
             if ($item instanceof NavigationGroup) {
                 return [$item->getGroupKey() => $item->getItems()->map(function ($item) {
-                    return $item->getPage()->getRouteKey();
+                    return Str::afterLast($item->getPage()->getRouteKey(), '/');
                 })->all()];
             }
 

From c5ab6b8d2271514d17b45fbeebc0dedfa4f51c09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:19:47 +0200
Subject: [PATCH 1798/2811] Use basename function

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index a6e04a26394..ec76706c7b1 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -7,7 +7,6 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
@@ -151,7 +150,7 @@ protected function assertOrder(array $expected): void
         $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) {
             if ($item instanceof NavigationGroup) {
                 return [$item->getGroupKey() => $item->getItems()->map(function ($item) {
-                    return Str::afterLast($item->getPage()->getRouteKey(), '/');
+                    return basename($item->getPage()->getRouteKey());
                 })->all()];
             }
 

From 8c642945dd23f9daa5ea95f72b12c3e157ade328 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:20:33 +0200
Subject: [PATCH 1799/2811] Add closure types

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index ec76706c7b1..26c3fa92db6 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -147,9 +147,9 @@ protected function setUpFixture(array $files): self
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
-        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) {
+        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key): array {
             if ($item instanceof NavigationGroup) {
-                return [$item->getGroupKey() => $item->getItems()->map(function ($item) {
+                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item): string {
                     return basename($item->getPage()->getRouteKey());
                 })->all()];
             }

From 3d09881475852078ff3316201fb5dbd993c146f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:21:00 +0200
Subject: [PATCH 1800/2811] Add a newline

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 26c3fa92db6..fd6699386a7 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -147,6 +147,7 @@ protected function setUpFixture(array $files): self
     protected function assertOrder(array $expected): void
     {
         $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
+
         $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key): array {
             if ($item instanceof NavigationGroup) {
                 return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item): string {

From 43bc4954c1fcc99a75e7216bc3ea6aeaa139253c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:21:25 +0200
Subject: [PATCH 1801/2811] Test grouped menu ordering

---
 .../Feature/FilenamePrefixNavigationPriorityTest.php     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index fd6699386a7..1119a0aa20f 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -123,6 +123,15 @@ public function test_fixtureFlatMain_reverse_ordering()
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
+    public function test_fixtureGroupedMain_ordering()
+    {
+        $this->setUpFixture($this->fixtureGroupedMain());
+
+        $this->assertOrder(['home', 'about', 'contact', 'api' => [
+            'readme', 'installation', 'getting-started',
+        ]]);
+    }
+
     protected function setUpFixture(array $files): self
     {
         foreach ($files as $key => $file) {

From ead9d9584f05a78aeb8fc406be642ad59bb225d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:43:32 +0200
Subject: [PATCH 1802/2811] Fix testing helper visibility

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 1119a0aa20f..f3c4db04688 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -240,7 +240,7 @@ protected function fixturePrefixSyntaxes(): array
         ];
     }
 
-    public function fixtureFileExtensions(): array
+    protected function fixtureFileExtensions(): array
     {
         return [
             '01-foo.md',

From 543cd9fe6ed79dd7fd378e86ac2e26480564b044 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:44:50 +0200
Subject: [PATCH 1803/2811] Add recursive array reverser

---
 .../FilenamePrefixNavigationPriorityTest.php        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index f3c4db04688..acbd1eebd18 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -248,4 +248,17 @@ protected function fixtureFileExtensions(): array
             '03-baz.blade.php',
         ];
     }
+
+    protected function arrayReverseRecursive(array $array): array
+    {
+        $reversed = array_reverse($array);
+
+        foreach ($reversed as $key => $value) {
+            if (is_array($value)) {
+                $reversed[$key] = $this->arrayReverseRecursive($value);
+            }
+        }
+
+        return $reversed;
+    }
 }

From 16a8c6a2409e2fa9fae5b804d5f22a84f71a7194 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:46:23 +0200
Subject: [PATCH 1804/2811] Test reverse ordering for grouped fixture

---
 .../Feature/FilenamePrefixNavigationPriorityTest.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index acbd1eebd18..1a3cb14fa3a 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -132,6 +132,16 @@ public function test_fixtureGroupedMain_ordering()
         ]]);
     }
 
+    public function test_fixtureGroupedMain_reverse_ordering()
+    {
+        // Also a sanity check but for the inner group as well.
+        $this->setUpFixture($this->arrayReverseRecursive($this->fixtureGroupedMain()));
+
+        $this->assertOrder(['home', 'about', 'contact', 'api' => [
+            'readme', 'installation', 'getting-started',
+        ]]);
+    }
+
     protected function setUpFixture(array $files): self
     {
         foreach ($files as $key => $file) {

From c2e47451ba18ef5ac6d8d164725ec11fb356da10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:57:39 +0200
Subject: [PATCH 1805/2811] Generate base sidebar tests

---
 .../FilenamePrefixNavigationPriorityTest.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 1a3cb14fa3a..0121d1bea5d 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -142,6 +142,24 @@ public function test_fixtureGroupedMain_reverse_ordering()
         ]]);
     }
 
+    public function test_fixtureFlatSidebar_ordering()
+    {
+        $this->setUpFixture($this->fixtureFlatSidebar());
+
+        $this->assertOrder(['readme', 'installation', 'getting-started']);
+    }
+
+    public function test_fixtureGroupedSidebar_ordering()
+    {
+        $this->setUpFixture($this->fixtureGroupedSidebar());
+
+        $this->assertOrder(['readme', 'installation', 'getting-started', 'introduction' => [
+            'features', 'extensions', 'configuration',
+        ], 'advanced' => [
+            'features', 'extensions', 'configuration',
+        ]]);
+    }
+
     protected function setUpFixture(array $files): self
     {
         foreach ($files as $key => $file) {

From b548bf39da16c0bb79434b64075d57d449e325b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 18:59:12 +0200
Subject: [PATCH 1806/2811] Create scaffolding to test sidebar orders

---
 .../FilenamePrefixNavigationPriorityTest.php  | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 0121d1bea5d..286251964c1 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -7,10 +7,13 @@
 use Hyde\Hyde;
 use Hyde\Facades\Config;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -144,33 +147,39 @@ public function test_fixtureGroupedMain_reverse_ordering()
 
     public function test_fixtureFlatSidebar_ordering()
     {
-        $this->setUpFixture($this->fixtureFlatSidebar());
+        $this->setUpSidebarFixture($this->fixtureFlatSidebar());
 
-        $this->assertOrder(['readme', 'installation', 'getting-started']);
+        $this->assertSidebarOrder(['readme', 'installation', 'getting-started']);
     }
 
     public function test_fixtureGroupedSidebar_ordering()
     {
-        $this->setUpFixture($this->fixtureGroupedSidebar());
+        $this->setUpSidebarFixture($this->fixtureGroupedSidebar());
 
-        $this->assertOrder(['readme', 'installation', 'getting-started', 'introduction' => [
+        $this->assertSidebarOrder(['readme', 'installation', 'getting-started', 'introduction' => [
             'features', 'extensions', 'configuration',
         ], 'advanced' => [
             'features', 'extensions', 'configuration',
         ]]);
     }
 
-    protected function setUpFixture(array $files): self
+    protected function setUpSidebarFixture(array $files): self
+    {
+        return $this->setUpFixture($files, sidebar: true);
+    }
+
+    protected function setUpFixture(array $files, bool $sidebar = false): self
     {
         foreach ($files as $key => $file) {
+            $class = $sidebar ? DocumentationPage::class : MarkdownPage::class;
             if (is_string($file)) {
-                $page = new MarkdownPage(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                $page = new $class(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
                 Hyde::pages()->addPage($page);
                 Hyde::routes()->addRoute($page->getRoute());
             } else {
                 foreach ($file as $child) {
                     $group = str($key)->after('-');
-                    $page = new MarkdownPage($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                    $page = new $class($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
                     Hyde::pages()->addPage($page);
                     Hyde::routes()->addRoute($page->getRoute());
                 }
@@ -180,19 +189,27 @@ protected function setUpFixture(array $files): self
         return $this;
     }
 
+    protected function assertSidebarOrder(array $expected): void
+    {
+        $this->assertOrder($expected, sidebar: true);
+    }
+
     /** @param array<string> $expected */
-    protected function assertOrder(array $expected): void
+    protected function assertOrder(array $expected, bool $sidebar = false): void
     {
-        $menu = NavigationMenuGenerator::handle(MainNavigationMenu::class);
+        $type = $sidebar ? DocumentationSidebar::class : MainNavigationMenu::class;
+        $menu = NavigationMenuGenerator::handle($type);
+
+        $formatRouteKey = fn (string $routeKey): string => $sidebar ? Str::after($routeKey, 'docs/') : $routeKey;
 
-        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key): array {
+        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) use ($formatRouteKey): array {
             if ($item instanceof NavigationGroup) {
-                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item): string {
-                    return basename($item->getPage()->getRouteKey());
+                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item) use ($formatRouteKey): string {
+                    return basename($formatRouteKey($item->getPage()->getRouteKey()));
                 })->all()];
             }
 
-            return [$key => $item->getPage()->getRouteKey()];
+            return [$key => $formatRouteKey($item->getPage()->getRouteKey())];
         })->all();
 
         $this->assertSame($expected, $actual);

From 1f5fb15f11616ded6d2384438253c31473a4bcf6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 20:59:51 +0200
Subject: [PATCH 1807/2811] Fix duplicated fixture data

Not allowed when using flattened output paths
---
 .../Feature/FilenamePrefixNavigationPriorityTest.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 286251964c1..6f4a4cdff44 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -157,7 +157,7 @@ public function test_fixtureGroupedSidebar_ordering()
         $this->setUpSidebarFixture($this->fixtureGroupedSidebar());
 
         $this->assertSidebarOrder(['readme', 'installation', 'getting-started', 'introduction' => [
-            'features', 'extensions', 'configuration',
+            'general', 'resources', 'requirements',
         ], 'advanced' => [
             'features', 'extensions', 'configuration',
         ]]);
@@ -254,9 +254,9 @@ protected function fixtureGroupedSidebar(): array
             '02-installation.md',
             '03-getting-started.md',
             '04-introduction' => [
-                '01-features.md',
-                '02-extensions.md',
-                '03-configuration.md',
+                '01-general.md',
+                '02-resources.md',
+                '03-requirements.md',
             ],
             '05-advanced' => [
                 '01-features.md',

From 306b33619f81ba9a19c650b43c1f84a9d068c8b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 21:01:20 +0200
Subject: [PATCH 1808/2811] Expect other pages to be in other group

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 6f4a4cdff44..7531017af89 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -156,7 +156,8 @@ public function test_fixtureGroupedSidebar_ordering()
     {
         $this->setUpSidebarFixture($this->fixtureGroupedSidebar());
 
-        $this->assertSidebarOrder(['readme', 'installation', 'getting-started', 'introduction' => [
+        $this->assertSidebarOrder(['other' => ['readme', 'installation', 'getting-started'],
+        'introduction' => [
             'general', 'resources', 'requirements',
         ], 'advanced' => [
             'features', 'extensions', 'configuration',

From 2f82b49dd4711adff10580a1e44636e772826f9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 21:01:45 +0200
Subject: [PATCH 1809/2811] Reformat array

---
 .../Feature/FilenamePrefixNavigationPriorityTest.php  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 7531017af89..25898803f61 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -156,12 +156,11 @@ public function test_fixtureGroupedSidebar_ordering()
     {
         $this->setUpSidebarFixture($this->fixtureGroupedSidebar());
 
-        $this->assertSidebarOrder(['other' => ['readme', 'installation', 'getting-started'],
-        'introduction' => [
-            'general', 'resources', 'requirements',
-        ], 'advanced' => [
-            'features', 'extensions', 'configuration',
-        ]]);
+        $this->assertSidebarOrder([
+            'other' => ['readme', 'installation', 'getting-started'],
+            'introduction' => ['general', 'resources', 'requirements'],
+            'advanced' => ['features', 'extensions', 'configuration'],
+        ]);
     }
 
     protected function setUpSidebarFixture(array $files): self

From 8c181f26c8d6aa445fbcf30f2127e76cdddbc98d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 1 May 2024 21:08:29 +0200
Subject: [PATCH 1810/2811] Update documentation page route key formatting to
 use normalized parent

This should generally have the same semantics, however, it allows us to use the numbering prefix normalization provided by https://github.com/hydephp/develop/pull/1709
---
 packages/framework/src/Pages/DocumentationPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 6ca14b5b9b8..db95989e938 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -70,7 +70,7 @@ public function getTableOfContents(): string
     public function getRouteKey(): string
     {
         return Config::getBool('docs.flattened_output_paths', true)
-            ? unslash(static::outputDirectory().'/'.basename($this->identifier))
+            ? unslash(static::outputDirectory().'/'.basename(parent::getRouteKey()))
             : parent::getRouteKey();
     }
 

From 87af9b74afd6508b39ab8fe8f491547cc637a422 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 11:58:44 +0200
Subject: [PATCH 1811/2811] Extract testing helper class for complex testing
 helper methods

---
 .../FilenamePrefixNavigationPriorityTest.php  | 80 ++++++++++++-------
 1 file changed, 51 insertions(+), 29 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 25898803f61..d27d9284cd4 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -38,6 +38,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->helper = new FilenamePrefixNavigationPriorityTestingHelper($this);
+
         Config::set('hyde.navigation.subdirectories', 'dropdown');
 
         // Todo: Replace kernel with mock class
@@ -170,21 +172,7 @@ protected function setUpSidebarFixture(array $files): self
 
     protected function setUpFixture(array $files, bool $sidebar = false): self
     {
-        foreach ($files as $key => $file) {
-            $class = $sidebar ? DocumentationPage::class : MarkdownPage::class;
-            if (is_string($file)) {
-                $page = new $class(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
-                Hyde::pages()->addPage($page);
-                Hyde::routes()->addRoute($page->getRoute());
-            } else {
-                foreach ($file as $child) {
-                    $group = str($key)->after('-');
-                    $page = new $class($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
-                    Hyde::pages()->addPage($page);
-                    Hyde::routes()->addRoute($page->getRoute());
-                }
-            }
-        }
+        $this->helper->setUpFixture($files, $sidebar);
 
         return $this;
     }
@@ -197,20 +185,7 @@ protected function assertSidebarOrder(array $expected): void
     /** @param array<string> $expected */
     protected function assertOrder(array $expected, bool $sidebar = false): void
     {
-        $type = $sidebar ? DocumentationSidebar::class : MainNavigationMenu::class;
-        $menu = NavigationMenuGenerator::handle($type);
-
-        $formatRouteKey = fn (string $routeKey): string => $sidebar ? Str::after($routeKey, 'docs/') : $routeKey;
-
-        $actual = $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) use ($formatRouteKey): array {
-            if ($item instanceof NavigationGroup) {
-                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item) use ($formatRouteKey): string {
-                    return basename($formatRouteKey($item->getPage()->getRouteKey()));
-                })->all()];
-            }
-
-            return [$key => $formatRouteKey($item->getPage()->getRouteKey())];
-        })->all();
+        $actual = $this->helper->createComparisonFormat($sidebar);
 
         $this->assertSame($expected, $actual);
     }
@@ -307,3 +282,50 @@ protected function arrayReverseRecursive(array $array): array
         return $reversed;
     }
 }
+
+class FilenamePrefixNavigationPriorityTestingHelper
+{
+    protected FilenamePrefixNavigationPriorityTest $test;
+
+    public function __construct(FilenamePrefixNavigationPriorityTest $test)
+    {
+        $this->test = $test;
+    }
+
+    public function setUpFixture(array $files, bool $sidebar = false): void
+    {
+        foreach ($files as $key => $file) {
+            $class = $sidebar ? DocumentationPage::class : MarkdownPage::class;
+            if (is_string($file)) {
+                $page = new $class(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                Hyde::pages()->addPage($page);
+                Hyde::routes()->addRoute($page->getRoute());
+            } else {
+                foreach ($file as $child) {
+                    $group = str($key)->after('-');
+                    $page = new $class($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
+                    Hyde::pages()->addPage($page);
+                    Hyde::routes()->addRoute($page->getRoute());
+                }
+            }
+        }
+    }
+
+    public function createComparisonFormat(bool $sidebar): array
+    {
+        $type = $sidebar ? DocumentationSidebar::class : MainNavigationMenu::class;
+        $menu = NavigationMenuGenerator::handle($type);
+
+        $formatRouteKey = fn (string $routeKey): string => $sidebar ? Str::after($routeKey, 'docs/') : $routeKey;
+
+        return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) use ($formatRouteKey): array {
+            if ($item instanceof NavigationGroup) {
+                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item) use ($formatRouteKey): string {
+                    return basename($formatRouteKey($item->getPage()->getRouteKey()));
+                })->all()];
+            }
+
+            return [$key => $formatRouteKey($item->getPage()->getRouteKey())];
+        })->all();
+    }
+}

From 401063295fc2fe30b201e164684d0f54cc30421d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 12:07:34 +0200
Subject: [PATCH 1812/2811] Refactor and clean up testing helpers

---
 .../FilenamePrefixNavigationPriorityTest.php  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index d27d9284cd4..c6a3af1051a 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -182,7 +182,6 @@ protected function assertSidebarOrder(array $expected): void
         $this->assertOrder($expected, sidebar: true);
     }
 
-    /** @param array<string> $expected */
     protected function assertOrder(array $expected, bool $sidebar = false): void
     {
         $actual = $this->helper->createComparisonFormat($sidebar);
@@ -316,16 +315,25 @@ public function createComparisonFormat(bool $sidebar): array
         $type = $sidebar ? DocumentationSidebar::class : MainNavigationMenu::class;
         $menu = NavigationMenuGenerator::handle($type);
 
-        $formatRouteKey = fn (string $routeKey): string => $sidebar ? Str::after($routeKey, 'docs/') : $routeKey;
+        return $this->mapItemsToStrings($menu, $sidebar)->all();
+    }
 
-        return $menu->getItems()->mapWithKeys(function (NavigationItem|NavigationGroup $item, int $key) use ($formatRouteKey): array {
-            if ($item instanceof NavigationGroup) {
-                return [$item->getGroupKey() => $item->getItems()->map(function (NavigationItem $item) use ($formatRouteKey): string {
-                    return basename($formatRouteKey($item->getPage()->getRouteKey()));
-                })->all()];
-            }
+    protected function mapItemsToStrings(MainNavigationMenu|DocumentationSidebar $menu, bool $sidebar)
+    {
+        return $menu->getItems()->mapWithKeys(fn ($item, $key) => $item instanceof NavigationItem
+            ? [$key => $this->formatRouteKey($item->getPage()->getRouteKey(), $sidebar)]
+            : [$item->getGroupKey() => $this->mapChildItems($item, $sidebar)]);
+    }
 
-            return [$key => $formatRouteKey($item->getPage()->getRouteKey())];
+    protected function mapChildItems(NavigationGroup $item, bool $sidebar)
+    {
+        return $item->getItems()->map(function (NavigationItem $item) use ($sidebar) {
+            return basename($this->formatRouteKey($item->getPage()->getRouteKey(), $sidebar));
         })->all();
     }
+
+    protected function formatRouteKey(string $routeKey, bool $sidebar): string
+    {
+        return $sidebar ? Str::after($routeKey, 'docs/') : $routeKey;
+    }
 }

From f00a66e337dfbe4e64a28831afc7fbff741ce08b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 12:15:58 +0200
Subject: [PATCH 1813/2811] Refactor testing helpers

---
 .../FilenamePrefixNavigationPriorityTest.php  | 54 ++++++++++++-------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index c6a3af1051a..66147c35fb5 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -115,7 +115,7 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
 
     public function test_fixtureFlatMain_ordering()
     {
-        $this->setUpFixture($this->fixtureFlatMain());
+        $this->setupFixture($this->fixtureFlatMain());
 
         $this->assertOrder(['home', 'about', 'contact']);
     }
@@ -123,14 +123,14 @@ public function test_fixtureFlatMain_ordering()
     public function test_fixtureFlatMain_reverse_ordering()
     {
         // This is just a sanity check to make sure the helper is working, so we only need one of these.
-        $this->setUpFixture(array_reverse($this->fixtureFlatMain()));
+        $this->setupFixture(array_reverse($this->fixtureFlatMain()));
 
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
     public function test_fixtureGroupedMain_ordering()
     {
-        $this->setUpFixture($this->fixtureGroupedMain());
+        $this->setupFixture($this->fixtureGroupedMain());
 
         $this->assertOrder(['home', 'about', 'contact', 'api' => [
             'readme', 'installation', 'getting-started',
@@ -140,7 +140,7 @@ public function test_fixtureGroupedMain_ordering()
     public function test_fixtureGroupedMain_reverse_ordering()
     {
         // Also a sanity check but for the inner group as well.
-        $this->setUpFixture($this->arrayReverseRecursive($this->fixtureGroupedMain()));
+        $this->setupFixture($this->arrayReverseRecursive($this->fixtureGroupedMain()));
 
         $this->assertOrder(['home', 'about', 'contact', 'api' => [
             'readme', 'installation', 'getting-started',
@@ -167,12 +167,12 @@ public function test_fixtureGroupedSidebar_ordering()
 
     protected function setUpSidebarFixture(array $files): self
     {
-        return $this->setUpFixture($files, sidebar: true);
+        return $this->setupFixture($files, sidebar: true);
     }
 
-    protected function setUpFixture(array $files, bool $sidebar = false): self
+    protected function setupFixture(array $files, bool $sidebar = false): self
     {
-        $this->helper->setUpFixture($files, $sidebar);
+        $this->helper->setupFixture($files, $sidebar);
 
         return $this;
     }
@@ -291,25 +291,39 @@ public function __construct(FilenamePrefixNavigationPriorityTest $test)
         $this->test = $test;
     }
 
-    public function setUpFixture(array $files, bool $sidebar = false): void
+    public function setupFixture(array $files, bool $sidebar = false): void
     {
         foreach ($files as $key => $file) {
             $class = $sidebar ? DocumentationPage::class : MarkdownPage::class;
-            if (is_string($file)) {
-                $page = new $class(basename($file, '.md'), markdown: '# '.str($file)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
-                Hyde::pages()->addPage($page);
-                Hyde::routes()->addRoute($page->getRoute());
-            } else {
-                foreach ($file as $child) {
-                    $group = str($key)->after('-');
-                    $page = new $class($group.'/'.basename($child, '.md'), markdown: '# '.str($child)->after('-')->before('.')->ucfirst()."\n\nHello, world!\n");
-                    Hyde::pages()->addPage($page);
-                    Hyde::routes()->addRoute($page->getRoute());
-                }
-            }
+
+            is_string($file)
+                ? $this->setupFixtureItem($class, $file)
+                : $this->setupNestedFixtureItems($file, $key, $class);
+        }
+    }
+
+    protected function setupFixtureItem(string $class, string $file): void
+    {
+        $page = new $class(basename($file, '.md'), [], $this->generateMarkdown($file));
+        Hyde::pages()->addPage($page);
+        Hyde::routes()->addRoute($page->getRoute());
+    }
+
+    protected function setupNestedFixtureItems(array $files, string $key, string $class): void
+    {
+        foreach ($files as $file) {
+            $group = str($key)->after('-');
+            $page = new $class($group.'/'.basename($file, '.md'), [], $this->generateMarkdown($file));
+            Hyde::pages()->addPage($page);
+            Hyde::routes()->addRoute($page->getRoute());
         }
     }
 
+    protected function generateMarkdown(string $file): string
+    {
+        return sprintf("# %s\n\nHello, world!\n", str($file)->after('-')->before('.')->ucfirst());
+    }
+
     public function createComparisonFormat(bool $sidebar): array
     {
         $type = $sidebar ? DocumentationSidebar::class : MainNavigationMenu::class;

From f94bd4c992a184d25c2c755c4f2e80e517a32433 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 14:11:59 +0200
Subject: [PATCH 1814/2811] Use extension agnostic basename

---
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 66147c35fb5..c67fc20dbd7 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -304,7 +304,7 @@ public function setupFixture(array $files, bool $sidebar = false): void
 
     protected function setupFixtureItem(string $class, string $file): void
     {
-        $page = new $class(basename($file, '.md'), [], $this->generateMarkdown($file));
+        $page = new $class(Str::before($file, '.'), [], $this->generateMarkdown($file));
         Hyde::pages()->addPage($page);
         Hyde::routes()->addRoute($page->getRoute());
     }
@@ -313,7 +313,7 @@ protected function setupNestedFixtureItems(array $files, string $key, string $cl
     {
         foreach ($files as $file) {
             $group = str($key)->after('-');
-            $page = new $class($group.'/'.basename($file, '.md'), [], $this->generateMarkdown($file));
+            $page = new $class($group.'/'.Str::before($file, '.'), [], $this->generateMarkdown($file));
             Hyde::pages()->addPage($page);
             Hyde::routes()->addRoute($page->getRoute());
         }

From c3503114d24a3485f7a0f362dbc657a357162c68 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 14:23:52 +0200
Subject: [PATCH 1815/2811] Add additional fixture tests

---
 .../FilenamePrefixNavigationPriorityTest.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index c67fc20dbd7..4ece1c0b2fe 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -165,6 +165,28 @@ public function test_fixtureGroupedSidebar_ordering()
         ]);
     }
 
+    public function test_fixturePrefixSyntaxes_ordering()
+    {
+        foreach ($this->fixturePrefixSyntaxes() as $fixture) {
+            $this->setupFixture($fixture);
+
+            $this->assertOrder(['foo', 'bar', 'baz']);
+        }
+
+        foreach ($this->fixturePrefixSyntaxes() as $fixture) {
+            $this->setupFixture(array_reverse($fixture));
+
+            $this->assertOrder(['foo', 'bar', 'baz']);
+        }
+    }
+
+    public function test_fixtureFileExtensions_ordering()
+    {
+        $this->setupFixture($this->fixtureFileExtensions());
+
+        $this->assertOrder(['foo', 'bar', 'baz']);
+    }
+
     protected function setUpSidebarFixture(array $files): self
     {
         return $this->setupFixture($files, sidebar: true);

From 6d979953bb28ebc46d5a3db6861cad912e23f979 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 21:04:37 +0200
Subject: [PATCH 1816/2811] Inline fixtures to make tests clearer

---
 .../FilenamePrefixNavigationPriorityTest.php  | 161 ++++++++----------
 1 file changed, 73 insertions(+), 88 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 4ece1c0b2fe..d0a61e3b674 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -115,7 +115,11 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
 
     public function test_fixtureFlatMain_ordering()
     {
-        $this->setupFixture($this->fixtureFlatMain());
+        $this->setupFixture([
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
+        ]);
 
         $this->assertOrder(['home', 'about', 'contact']);
     }
@@ -123,14 +127,27 @@ public function test_fixtureFlatMain_ordering()
     public function test_fixtureFlatMain_reverse_ordering()
     {
         // This is just a sanity check to make sure the helper is working, so we only need one of these.
-        $this->setupFixture(array_reverse($this->fixtureFlatMain()));
+        $this->setupFixture(array_reverse([
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
+        ]));
 
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
     public function test_fixtureGroupedMain_ordering()
     {
-        $this->setupFixture($this->fixtureGroupedMain());
+        $this->setupFixture([
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
+            '04-api' => [
+                '01-readme.md',
+                '02-installation.md',
+                '03-getting-started.md',
+            ],
+        ]);
 
         $this->assertOrder(['home', 'about', 'contact', 'api' => [
             'readme', 'installation', 'getting-started',
@@ -140,7 +157,16 @@ public function test_fixtureGroupedMain_ordering()
     public function test_fixtureGroupedMain_reverse_ordering()
     {
         // Also a sanity check but for the inner group as well.
-        $this->setupFixture($this->arrayReverseRecursive($this->fixtureGroupedMain()));
+        $this->setupFixture($this->arrayReverseRecursive([
+            '01-home.md',
+            '02-about.md',
+            '03-contact.md',
+            '04-api' => [
+                '01-readme.md',
+                '02-installation.md',
+                '03-getting-started.md',
+            ],
+        ]));
 
         $this->assertOrder(['home', 'about', 'contact', 'api' => [
             'readme', 'installation', 'getting-started',
@@ -149,14 +175,32 @@ public function test_fixtureGroupedMain_reverse_ordering()
 
     public function test_fixtureFlatSidebar_ordering()
     {
-        $this->setUpSidebarFixture($this->fixtureFlatSidebar());
+        $this->setUpSidebarFixture([
+            '01-readme.md',
+            '02-installation.md',
+            '03-getting-started.md',
+        ]);
 
         $this->assertSidebarOrder(['readme', 'installation', 'getting-started']);
     }
 
     public function test_fixtureGroupedSidebar_ordering()
     {
-        $this->setUpSidebarFixture($this->fixtureGroupedSidebar());
+        $this->setUpSidebarFixture([
+            '01-readme.md',
+            '02-installation.md',
+            '03-getting-started.md',
+            '04-introduction' => [
+                '01-general.md',
+                '02-resources.md',
+                '03-requirements.md',
+            ],
+            '05-advanced' => [
+                '01-features.md',
+                '02-extensions.md',
+                '03-configuration.md',
+            ],
+        ]);
 
         $this->assertSidebarOrder([
             'other' => ['readme', 'installation', 'getting-started'],
@@ -167,13 +211,29 @@ public function test_fixtureGroupedSidebar_ordering()
 
     public function test_fixturePrefixSyntaxes_ordering()
     {
-        foreach ($this->fixturePrefixSyntaxes() as $fixture) {
+        $fixtures = [
+            [
+                '1-foo.md',
+                '2-bar.md',
+                '3-baz.md',
+            ], [
+                '01-foo.md',
+                '02-bar.md',
+                '03-baz.md',
+            ], [
+                '001-foo.md',
+                '002-bar.md',
+                '003-baz.md',
+            ],
+        ];
+
+        foreach ($fixtures as $fixture) {
             $this->setupFixture($fixture);
 
             $this->assertOrder(['foo', 'bar', 'baz']);
         }
 
-        foreach ($this->fixturePrefixSyntaxes() as $fixture) {
+        foreach ($fixtures as $fixture) {
             $this->setupFixture(array_reverse($fixture));
 
             $this->assertOrder(['foo', 'bar', 'baz']);
@@ -182,7 +242,11 @@ public function test_fixturePrefixSyntaxes_ordering()
 
     public function test_fixtureFileExtensions_ordering()
     {
-        $this->setupFixture($this->fixtureFileExtensions());
+        $this->setupFixture([
+            '01-foo.md',
+            '02-bar.html',
+            '03-baz.blade.php',
+        ]);
 
         $this->assertOrder(['foo', 'bar', 'baz']);
     }
@@ -211,85 +275,6 @@ protected function assertOrder(array $expected, bool $sidebar = false): void
         $this->assertSame($expected, $actual);
     }
 
-    protected function fixtureFlatMain(): array
-    {
-        return [
-            '01-home.md',
-            '02-about.md',
-            '03-contact.md',
-        ];
-    }
-
-    protected function fixtureGroupedMain(): array
-    {
-        return [
-            '01-home.md',
-            '02-about.md',
-            '03-contact.md',
-            '04-api' => [
-                '01-readme.md',
-                '02-installation.md',
-                '03-getting-started.md',
-            ],
-        ];
-    }
-
-    protected function fixtureFlatSidebar(): array
-    {
-        return [
-            '01-readme.md',
-            '02-installation.md',
-            '03-getting-started.md',
-        ];
-    }
-
-    protected function fixtureGroupedSidebar(): array
-    {
-        return [
-            '01-readme.md',
-            '02-installation.md',
-            '03-getting-started.md',
-            '04-introduction' => [
-                '01-general.md',
-                '02-resources.md',
-                '03-requirements.md',
-            ],
-            '05-advanced' => [
-                '01-features.md',
-                '02-extensions.md',
-                '03-configuration.md',
-            ],
-        ];
-    }
-
-    protected function fixturePrefixSyntaxes(): array
-    {
-        return [
-            [
-                '1-foo.md',
-                '2-bar.md',
-                '3-baz.md',
-            ], [
-                '01-foo.md',
-                '02-bar.md',
-                '03-baz.md',
-            ], [
-                '001-foo.md',
-                '002-bar.md',
-                '003-baz.md',
-            ],
-        ];
-    }
-
-    protected function fixtureFileExtensions(): array
-    {
-        return [
-            '01-foo.md',
-            '02-bar.html',
-            '03-baz.blade.php',
-        ];
-    }
-
     protected function arrayReverseRecursive(array $array): array
     {
         $reversed = array_reverse($array);

From 2a7b3595df1a2e7bff634330d905f58c4ac0e6f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 2 May 2024 21:08:34 +0200
Subject: [PATCH 1817/2811] Rename test methods using ChatGPT to make them
 clearer

---
 .../FilenamePrefixNavigationPriorityTest.php     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index d0a61e3b674..9041f92b751 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -113,7 +113,7 @@ public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeys
         $this->assertSame("$identifier.html", $page->getOutputPath());
     }
 
-    public function test_fixtureFlatMain_ordering()
+    public function testFlatMainNavigationOrdering()
     {
         $this->setupFixture([
             '01-home.md',
@@ -124,7 +124,7 @@ public function test_fixtureFlatMain_ordering()
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
-    public function test_fixtureFlatMain_reverse_ordering()
+    public function testReverseOrderOfFlatMainNavigation()
     {
         // This is just a sanity check to make sure the helper is working, so we only need one of these.
         $this->setupFixture(array_reverse([
@@ -136,7 +136,7 @@ public function test_fixtureFlatMain_reverse_ordering()
         $this->assertOrder(['home', 'about', 'contact']);
     }
 
-    public function test_fixtureGroupedMain_ordering()
+    public function testGroupedMainNavigationOrdering()
     {
         $this->setupFixture([
             '01-home.md',
@@ -154,7 +154,7 @@ public function test_fixtureGroupedMain_ordering()
         ]]);
     }
 
-    public function test_fixtureGroupedMain_reverse_ordering()
+    public function testReverseOrderOfGroupedMainNavigation()
     {
         // Also a sanity check but for the inner group as well.
         $this->setupFixture($this->arrayReverseRecursive([
@@ -173,7 +173,7 @@ public function test_fixtureGroupedMain_reverse_ordering()
         ]]);
     }
 
-    public function test_fixtureFlatSidebar_ordering()
+    public function testFlatSidebarNavigationOrdering()
     {
         $this->setUpSidebarFixture([
             '01-readme.md',
@@ -184,7 +184,7 @@ public function test_fixtureFlatSidebar_ordering()
         $this->assertSidebarOrder(['readme', 'installation', 'getting-started']);
     }
 
-    public function test_fixtureGroupedSidebar_ordering()
+    public function testGroupedSidebarNavigationOrdering()
     {
         $this->setUpSidebarFixture([
             '01-readme.md',
@@ -209,7 +209,7 @@ public function test_fixtureGroupedSidebar_ordering()
         ]);
     }
 
-    public function test_fixturePrefixSyntaxes_ordering()
+    public function testDifferentPrefixSyntaxesOrdering()
     {
         $fixtures = [
             [
@@ -240,7 +240,7 @@ public function test_fixturePrefixSyntaxes_ordering()
         }
     }
 
-    public function test_fixtureFileExtensions_ordering()
+    public function testOrderingWithDifferentFileExtensions()
     {
         $this->setupFixture([
             '01-foo.md',

From 333b139c8237c71463eb0800b94bef23daf24994 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 3 May 2024 20:28:45 +0200
Subject: [PATCH 1818/2811] Document numerical prefix navigation ordering

---
 docs/digging-deeper/navigation.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index ff515caf30b..1d2731235f9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -300,6 +300,37 @@ Here are some things to keep in mind when using dropdown menus, regardless of th
 - Dropdowns take priority over standard items. So if you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
   - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
 
+## Numerical Prefix Navigation Ordering
+
+HydePHP v2 introduces a new feature that allows navigation items to be ordered based on a numerical prefix in the filename.
+This is a great way to control the ordering of pages in both the primary navigation menu and the documentation sidebar, 
+as your file structure will match the order of the pages in the navigation menus.
+
+For example, the following will have the same order in the navigation menu as well as the file structure (assuming you sort files by name):
+
+```
+_pages/
+  01-home.md # Gets priority 1, putting it first
+  02-about.md # Gets priority 2, putting it second
+  03-contact.md # Gets priority 3, putting it third
+```
+
+Hyde will then parse the number from the filename and use it as the priority for the page in the navigation menus.
+
+>info Remember, that while Hyde in general retains the source file names when creating route keys and thus output file names, Hyde will in this case strip the numerical prefix from the route key so your URLs will not contain the numerical prefix.
+
+### Customization
+
+You can disable this feature by setting the `numerical_page_ordering` setting to `false` in the `hyde.php` config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
+
+```php
+// filepath config/hyde.php
+
+'numerical_page_ordering' => false,
+```
+
+While it's not recommended, as you lose out on the convenience of the automatic ordering, any front matter priority settings will override the numerical prefix ordering if you for some reason need to.
+
 ## Digging Deeper into the internals
 
 While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,

From 755cbfcef4db70ffbcb6637d8705ca522e5512e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 3 May 2024 21:15:36 +0200
Subject: [PATCH 1819/2811] Improve documentation formatting

---
 docs/digging-deeper/navigation.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1d2731235f9..229d665531d 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -306,18 +306,26 @@ HydePHP v2 introduces a new feature that allows navigation items to be ordered b
 This is a great way to control the ordering of pages in both the primary navigation menu and the documentation sidebar, 
 as your file structure will match the order of the pages in the navigation menus.
 
-For example, the following will have the same order in the navigation menu as well as the file structure (assuming you sort files by name):
+For example, the following will have the same order in the navigation menu as in a file explorer:
 
-```
+```shell
 _pages/
-  01-home.md # Gets priority 1, putting it first
-  02-about.md # Gets priority 2, putting it second
-  03-contact.md # Gets priority 3, putting it third
+  01-home.md # Gets priority 1, putting it first (will be saved to _site/index.html)
+  02-about.md # Gets priority 2, putting it second (will be saved to _site/about.html)
+  03-contact.md # Gets priority 3, putting it third (will be saved to _site/contact.html)
 ```
 
 Hyde will then parse the number from the filename and use it as the priority for the page in the navigation menus.
 
->info Remember, that while Hyde in general retains the source file names when creating route keys and thus output file names, Hyde will in this case strip the numerical prefix from the route key so your URLs will not contain the numerical prefix.
+### Keep in mind
+
+Here are some things to keep in mind, especially if you mix numerical prefix ordering with other ordering methods:
+
+1. The numerical prefix will still be part of the page identifier, but it will be stripped from the route key.
+   - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.
+2. You can delimit the numerical prefix with either a dash or an underscore.
+   - For example: `_pages/01-home.md` and `_pages/01_home.md` are both valid.
+3. The leading zeroes are optional, so `_pages/1-home.md` is also valid.
 
 ### Customization
 

From 3787c60d1499efe5e9757714ab1b157ad04c8b87 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 3 May 2024 21:15:45 +0200
Subject: [PATCH 1820/2811] Document using numerical prefix ordering in
 subdirectories

---
 docs/digging-deeper/navigation.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 229d665531d..32074117275 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -327,6 +327,30 @@ Here are some things to keep in mind, especially if you mix numerical prefix ord
    - For example: `_pages/01-home.md` and `_pages/01_home.md` are both valid.
 3. The leading zeroes are optional, so `_pages/1-home.md` is also valid.
 
+### Using numerical prefix ordering in subdirectories
+
+The numerical prefix ordering feature works great when using the automatic subdirectory-based grouping for navigation menu dropdowns and documentation sidebar categories.
+
+This integration has two main features to consider:
+1. You can use numerical prefixes in subdirectories to control the order of dropdowns.
+2. The ordering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
+
+Here is an example structure of how you may want to organize a documentation site:
+
+```shell
+_docs/
+  01-getting-started/
+    01-installation.md
+    02-requirements.md
+    03-configuration.md
+  02-usage/
+    01-quick-start.md
+    02-advanced-usage.md
+  03-features/
+    01-feature-1.md
+    02-feature-2.md
+```
+
 ### Customization
 
 You can disable this feature by setting the `numerical_page_ordering` setting to `false` in the `hyde.php` config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.

From eac372f2376d1c1bc7b2bf0d3f9a3e0d3f48b633 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 3 May 2024 21:16:07 +0200
Subject: [PATCH 1821/2811] Fix formatting

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 32074117275..c85a8677da4 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -298,12 +298,12 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 Here are some things to keep in mind when using dropdown menus, regardless of the configuration:
 - Dropdowns take priority over standard items. So if you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
-  - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
+    - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
 
 ## Numerical Prefix Navigation Ordering
 
 HydePHP v2 introduces a new feature that allows navigation items to be ordered based on a numerical prefix in the filename.
-This is a great way to control the ordering of pages in both the primary navigation menu and the documentation sidebar, 
+This is a great way to control the ordering of pages in both the primary navigation menu and the documentation sidebar,
 as your file structure will match the order of the pages in the navigation menus.
 
 For example, the following will have the same order in the navigation menu as in a file explorer:
@@ -322,9 +322,9 @@ Hyde will then parse the number from the filename and use it as the priority for
 Here are some things to keep in mind, especially if you mix numerical prefix ordering with other ordering methods:
 
 1. The numerical prefix will still be part of the page identifier, but it will be stripped from the route key.
-   - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.
+    - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.
 2. You can delimit the numerical prefix with either a dash or an underscore.
-   - For example: `_pages/01-home.md` and `_pages/01_home.md` are both valid.
+    - For example: `_pages/01-home.md` and `_pages/01_home.md` are both valid.
 3. The leading zeroes are optional, so `_pages/1-home.md` is also valid.
 
 ### Using numerical prefix ordering in subdirectories

From d73e9c404a2427df6dab2a28f832073211b6350b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 10:44:21 +0200
Subject: [PATCH 1822/2811] Rename added config option to match documented
 value

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php      | 2 +-
 .../tests/Feature/FilenamePrefixNavigationPriorityTest.php      | 2 +-
 .../framework/tests/Feature/Services/SitemapServiceTest.php     | 2 +-
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 6e7dd12aba2..69cf6085a01 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -23,7 +23,7 @@ class FilenamePrefixNavigationHelper
      */
     public static function enabled(): bool
     {
-        return Config::getBool('hyde.filename_page_ordering', true);
+        return Config::getBool('hyde.numerical_page_ordering', true);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
index 9041f92b751..05aa57a5d5f 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
@@ -84,7 +84,7 @@ public function testSourceFilesHaveTheirNumericalPrefixTrimmedFromRouteKeys()
 
     public function testSourceFilesDoNotHaveTheirNumericalPrefixTrimmedFromRouteKeysWhenFeatureIsDisabled()
     {
-        Config::set('hyde.filename_page_ordering', false);
+        Config::set('hyde.numerical_page_ordering', false);
 
         $this->file('_pages/01-home.md');
 
diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index f718fe3d223..bfa9e602552 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
         copy(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'), Hyde::path('_pages/index.blade.php'));
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
 
-        Config::set(['hyde.filename_page_ordering' => false]);
+        Config::set(['hyde.numerical_page_ordering' => false]);
     }
 
     public function testServiceInstantiatesXmlElement()
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 561c9f00e96..b46ddae02b6 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -23,7 +23,7 @@ public function testEnabledReturnsTrueWhenEnabled()
 
     public function testEnabledReturnsFalseWhenDisabled()
     {
-        self::mockConfig(['hyde.filename_page_ordering' => false]);
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
 
         $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
     }

From 8a281113ff15473ea785ab7e19d016f518cfe726 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 13:29:56 +0200
Subject: [PATCH 1823/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1d99b7472e4..a099118b402 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,6 +10,7 @@ This serves two purposes:
 2. At release time, you can move the Unreleased section changes into a new release version section.
 
 ### Added
+- You can now specify navigation priorities by adding a numeric prefix to the source file names in https://github.com/hydephp/develop/pull/1709
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 - The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
 

From b2a03e08764a56e0085d9137db6b081437381089 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 13:46:39 +0200
Subject: [PATCH 1824/2811] Draft new unit tests

---
 .../tests/Unit/NavigationDataFactoryUnitTest.php  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 6e544d32232..80d4d9c86ab 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -267,6 +267,21 @@ public function testMakeGroupDefaultsToNullIfFrontMatterGroupNotSetAndSubdirecto
         $this->assertNull($factory->makeGroup());
     }
 
+    public function testItExtractsPriorityFromNumericalFilenamePrefix()
+    {
+        //
+    }
+
+    public function testItDoesNotExtractPriorityFromNumericalFilenamePrefixWhenFeatureIsDisabled()
+    {
+        //
+    }
+
+    public function testItDoesNotExtractNonNumericalFilenamePrefixes()
+    {
+        //
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);

From 1babeadf13fcda764a83d5ef8477fad49fb49f00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 17:01:14 +0200
Subject: [PATCH 1825/2811] Test it extracts priority from numerical filename
 prefix

---
 .../framework/tests/Unit/NavigationDataFactoryUnitTest.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 80d4d9c86ab..5671b4bb35f 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -269,7 +269,10 @@ public function testMakeGroupDefaultsToNullIfFrontMatterGroupNotSetAndSubdirecto
 
     public function testItExtractsPriorityFromNumericalFilenamePrefix()
     {
-        //
+        $coreDataObject = $this->makeCoreDataObject('01-test.md');
+        $factory = new NavigationConfigTestClass($coreDataObject);
+
+        $this->assertSame(1, $factory->makePriority());
     }
 
     public function testItDoesNotExtractPriorityFromNumericalFilenamePrefixWhenFeatureIsDisabled()

From 244182f77c5538b3962a0fd94718a20d8a50cad6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 17:06:05 +0200
Subject: [PATCH 1826/2811] Test it extracts various syntaxes

---
 .../Unit/NavigationDataFactoryUnitTest.php    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 5671b4bb35f..c72ee3c9f1f 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -275,6 +275,38 @@ public function testItExtractsPriorityFromNumericalFilenamePrefix()
         $this->assertSame(1, $factory->makePriority());
     }
 
+    public function testItExtractsPriorityFromNumericalFilenamePrefixWithKebabCaseSyntax()
+    {
+        $this->assertSame(1, (new NavigationConfigTestClass($this->makeCoreDataObject('01-foo.md')))->makePriority());
+        $this->assertSame(2, (new NavigationConfigTestClass($this->makeCoreDataObject('02-bar.md')))->makePriority());
+        $this->assertSame(3, (new NavigationConfigTestClass($this->makeCoreDataObject('03-baz.md')))->makePriority());
+    }
+
+    public function testItExtractsPriorityFromNumericalFilenamePrefixWithSnakeCaseSyntax()
+    {
+        $this->markTestSkipped('TODO: Support snake_case syntax for priority extraction');
+
+        $this->assertSame(1, (new NavigationConfigTestClass($this->makeCoreDataObject('01_foo.md')))->makePriority());
+        $this->assertSame(2, (new NavigationConfigTestClass($this->makeCoreDataObject('02_bar.md')))->makePriority());
+        $this->assertSame(3, (new NavigationConfigTestClass($this->makeCoreDataObject('03_baz.md')))->makePriority());
+    }
+
+    public function testItExtractsPriorityFromNumericalFilenamePrefixRegardlessOfLeadingZeroes()
+    {
+        $this->assertSame(123, (new NavigationConfigTestClass($this->makeCoreDataObject('123-foo.md')))->makePriority());
+        $this->assertSame(123, (new NavigationConfigTestClass($this->makeCoreDataObject('0123-foo.md')))->makePriority());
+        $this->assertSame(123, (new NavigationConfigTestClass($this->makeCoreDataObject('00123-foo.md')))->makePriority());
+        $this->assertSame(123, (new NavigationConfigTestClass($this->makeCoreDataObject('000123-foo.md')))->makePriority());
+        $this->assertSame(123, (new NavigationConfigTestClass($this->makeCoreDataObject('0000123-foo.md')))->makePriority());
+    }
+
+    public function testItExtractsPriorityFromNumericalFilenamePrefixForNestedIdentifiers()
+    {
+        $this->assertSame(1, (new NavigationConfigTestClass($this->makeCoreDataObject('foo/01-bar.md')))->makePriority());
+        $this->assertSame(2, (new NavigationConfigTestClass($this->makeCoreDataObject('foo/bar/02-baz.md')))->makePriority());
+        $this->assertSame(3, (new NavigationConfigTestClass($this->makeCoreDataObject('foo/01-bar/03-baz.md')))->makePriority());
+    }
+
     public function testItDoesNotExtractPriorityFromNumericalFilenamePrefixWhenFeatureIsDisabled()
     {
         //

From 13f2a12b97f0ef82679eab800ca32601e5996025 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 4 May 2024 18:48:48 +0200
Subject: [PATCH 1827/2811] Implement the tests

---
 .../tests/Unit/NavigationDataFactoryUnitTest.php         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index c72ee3c9f1f..8aac2aba7d7 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -309,12 +309,17 @@ public function testItExtractsPriorityFromNumericalFilenamePrefixForNestedIdenti
 
     public function testItDoesNotExtractPriorityFromNumericalFilenamePrefixWhenFeatureIsDisabled()
     {
-        //
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
+
+        $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('01-test.md')))->makePriority());
+        $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('01-home.md')))->makePriority());
+        $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('01-404.md')))->makePriority());
     }
 
     public function testItDoesNotExtractNonNumericalFilenamePrefixes()
     {
-        //
+        $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('foo-bar.md')))->makePriority());
+        $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('abc-bar.md')))->makePriority());
     }
 
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject

From 2e33af28455097a82e54cd190b210bb6e0a5b3e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:50:01 +0200
Subject: [PATCH 1828/2811] Support snake case syntax for priority extraction

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php      | 2 +-
 packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 69cf6085a01..7e3153186c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -35,7 +35,7 @@ public static function isIdentifierNumbered(string $identifier): bool
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        return preg_match('/^\d+-/', $identifier) === 1;
+        return preg_match('/^\d+-/', $identifier) === 1 || preg_match('/^\d+_/', $identifier) === 1;
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 8aac2aba7d7..08824908383 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -284,8 +284,6 @@ public function testItExtractsPriorityFromNumericalFilenamePrefixWithKebabCaseSy
 
     public function testItExtractsPriorityFromNumericalFilenamePrefixWithSnakeCaseSyntax()
     {
-        $this->markTestSkipped('TODO: Support snake_case syntax for priority extraction');
-
         $this->assertSame(1, (new NavigationConfigTestClass($this->makeCoreDataObject('01_foo.md')))->makePriority());
         $this->assertSame(2, (new NavigationConfigTestClass($this->makeCoreDataObject('02_bar.md')))->makePriority());
         $this->assertSame(3, (new NavigationConfigTestClass($this->makeCoreDataObject('03_baz.md')))->makePriority());

From b838bb7c37a10925640c968a2f9a0facc1bee48a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:50:46 +0200
Subject: [PATCH 1829/2811] Merge regex patterns

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 7e3153186c8..510bffb4515 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -35,7 +35,7 @@ public static function isIdentifierNumbered(string $identifier): bool
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        return preg_match('/^\d+-/', $identifier) === 1 || preg_match('/^\d+_/', $identifier) === 1;
+        return preg_match('/^\d+[-_]/', $identifier) === 1;
     }
 
     /**

From 5b4491fb1d3c3be6e4394f59fa43e45866152f56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:52:18 +0200
Subject: [PATCH 1830/2811] Fix grammar in test skip comment

---
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index b46ddae02b6..f0dee342dcd 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -58,7 +58,7 @@ public function testSplitNumberAndIdentifierWithMultipleDigits()
 
     public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
     {
-        $this->markTestSkipped('Since this is an internal class at the moment, we don not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
 
         $this->expectException(\AssertionError::class);
         $this->expectExceptionMessage('Identifier "home.md" is not numbered.');

From d6045177a2851518684202b0149d5b23d4dc060a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:55:42 +0200
Subject: [PATCH 1831/2811] Introduce local variable

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 510bffb4515..fe71db4b910 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -52,7 +52,8 @@ public static function splitNumberAndIdentifier(string $identifier): array
 
         assert(self::isIdentifierNumbered($identifier));
 
-        $parts = explode('-', $identifier, 2);
+        $separator = '-';
+        $parts = explode($separator, $identifier, 2);
 
         $parts[0] = (int) $parts[0];
 

From 25a76808c1eaabc14b85bb9b32f4304b484b26e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:55:57 +0200
Subject: [PATCH 1832/2811] Split out snake cased parts

---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index fe71db4b910..033bd6d9599 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -7,7 +7,9 @@
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 
+use function ltrim;
 use function assert;
+use function substr;
 use function explode;
 use function preg_match;
 
@@ -52,7 +54,7 @@ public static function splitNumberAndIdentifier(string $identifier): array
 
         assert(self::isIdentifierNumbered($identifier));
 
-        $separator = '-';
+        $separator = substr(ltrim($identifier, '0123456789'), 0, 1);
         $parts = explode($separator, $identifier, 2);
 
         $parts[0] = (int) $parts[0];

From 2f8de3fde4cc19e57d6c7ae01757671d5790dc6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 17:57:44 +0200
Subject: [PATCH 1833/2811] Add tests for when using snake case dividers

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index f0dee342dcd..4babe0d4e04 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -42,6 +42,13 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
     }
 
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'));
+    }
+
     public function testSplitNumberAndIdentifier()
     {
         $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
@@ -49,6 +56,13 @@ public function testSplitNumberAndIdentifier()
         $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
     }
 
+    public function testSplitNumberAndIdentifierForSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'));
+    }
+
     public function testSplitNumberAndIdentifierWithMultipleDigits()
     {
         $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
@@ -56,6 +70,13 @@ public function testSplitNumberAndIdentifierWithMultipleDigits()
         $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
     }
 
+    public function testSplitNumberAndIdentifierWithMultipleDigitsAndSnakeCaseDividers()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'));
+    }
+
     public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
     {
         $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
@@ -73,6 +94,13 @@ public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
         $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'));
     }
 
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'));
+    }
+
     public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'));
@@ -87,6 +115,13 @@ public function testSplitNumberAndIdentifierForNestedPages()
         $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
     }
 
+    public function testSplitNumberAndIdentifierForNestedPagesWithSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'));
+    }
+
     public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
     {
         $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'));
@@ -94,6 +129,13 @@ public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetec
         $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'));
     }
 
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'));
+    }
+
     public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'));
@@ -107,4 +149,11 @@ public function testSplitNumberAndIdentifierForDeeplyNestedPages()
         $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'));
         $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'));
     }
+
+    public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'));
+    }
 }

From 88c52ea00407aafdb9d05b6f80d57012876696c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:00:45 +0200
Subject: [PATCH 1834/2811] Test non numerical parts are not detected

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 4babe0d4e04..b5dddb36d57 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -156,4 +156,26 @@ public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDiv
         $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'));
         $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'));
     }
+
+    public function testNonNumericalPartsAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'));
+    }
+
+    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'));
+    }
 }

From 13c29ec3c793b0196a7fc56d5bf151b71cafbef9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:05:58 +0200
Subject: [PATCH 1835/2811] Add tests for various edge cases

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index b5dddb36d57..ae0176244a4 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -178,4 +178,37 @@ public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'));
     }
+
+    public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'));
+    }
+
+    public function testNumericallyPrefixedIdentifiersWithoutDividerAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'));
+    }
+
+    public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'));
+    }
 }

From 0a7e8fb64cba327c030e8caa66a0885a97e1cb3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:13:04 +0200
Subject: [PATCH 1836/2811] Convert test to a Pest test

Want to use dynamic datasets
---
 ...lenamePrefixNavigationPriorityUnitTest.php | 380 ++++++++----------
 1 file changed, 172 insertions(+), 208 deletions(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index ae0176244a4..f2a72fde534 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -2,213 +2,177 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Testing\UnitTestCase;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
-/**
- * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
- *
- * @see \Hyde\Framework\Testing\Feature\FilenamePrefixNavigationPriorityTest
- */
-class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
-{
-    protected static bool $needsConfig = true;
-
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        self::mockConfig(['hyde.numerical_page_ordering' => false]);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividers()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifier()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierForSnakeCaseDividers()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierWithMultipleDigitsAndSnakeCaseDividers()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-    }
-
-    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'));
-    }
-
-    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'));
-    }
-
-    public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierForNestedPages()
-    {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierForNestedPagesWithSnakeCaseDividers()
-    {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierForDeeplyNestedPages()
-    {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'));
-    }
-
-    public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDividers()
-    {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'));
-    }
-
-    public function testNonNumericalPartsAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'));
-    }
-
-    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'));
-    }
-
-    public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'));
-    }
-
-    public function testNumericallyPrefixedIdentifiersWithoutDividerAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'));
-    }
-
-    public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'));
-    }
-}
+beforeEach(fn () => $this->mockConfig());
+
+test('enabled returns true when enabled', function () {
+    expect(FilenamePrefixNavigationHelper::enabled())->toBeTrue();
+});
+
+test('enabled returns false when disabled', function () {
+    $this->mockConfig(['hyde.numerical_page_ordering' => false]);
+
+    expect(FilenamePrefixNavigationHelper::enabled())->toBeFalse();
+});
+
+test('identifiers with numerical prefixes are detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'))->toBeTrue();
+});
+
+test('identifiers without numerical prefixes are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'))->toBeFalse();
+});
+
+test('identifiers with numerical prefixes are detected when using snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'))->toBeTrue();
+});
+
+test('split number and identifier', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'))->toBe([1, 'home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'))->toBe([2, 'about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'))->toBe([3, 'contact.md']);
+});
+
+test('split number and identifier for snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'))->toBe([1, 'home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'))->toBe([2, 'about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'))->toBe([3, 'contact.md']);
+});
+
+test('split number and identifier with multiple digits', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'))->toBe([123, 'home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'))->toBe([456, 'about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'))->toBe([789, 'contact.md']);
+});
+
+test('split number and identifier with multiple digits and snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'))->toBe([123, 'home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'))->toBe([456, 'about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'))->toBe([789, 'contact.md']);
+});
+
+test('split number and identifier throws exception when identifier is not numbered', function () {
+    $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
+    $this->expectException(\AssertionError::class);
+    $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+    FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+});
+
+test('identifiers for nested pages with numerical prefixes are detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'))->toBeTrue();
+});
+
+test('identifiers for nested pages with numerical prefixes are detected using snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'))->toBeTrue();
+});
+
+test('identifiers for nested pages without numerical prefixes are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'))->toBeFalse();
+});
+
+test('split number and identifier for nested pages', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'))->toBe([1, 'foo/home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'))->toBe([2, 'foo/about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'))->toBe([3, 'foo/contact.md']);
+});
+
+test('split number and identifier for nested pages with snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'))->toBe([1, 'foo/home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'))->toBe([2, 'foo/about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'))->toBe([3, 'foo/contact.md']);
+});
+
+test('identifiers for deeply nested pages with numerical prefixes are detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'))->toBeTrue();
+});
+
+test('identifiers for deeply nested pages with numerical prefixes are detected using snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'))->toBeTrue();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'))->toBeTrue();
+});
+
+test('identifiers for deeply nested pages without numerical prefixes are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'))->toBeFalse();
+});
+
+test('split number and identifier for deeply nested pages', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'))->toBe([1, 'foo/bar/home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'))->toBe([2, 'foo/bar/about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'))->toBe([3, 'foo/bar/contact.md']);
+});
+
+test('split number and identifier for deeply nested pages with snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'))->toBe([1, 'foo/bar/home.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'))->toBe([2, 'foo/bar/about.md']);
+    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'))->toBe([3, 'foo/bar/contact.md']);
+});
+
+test('non numerical parts are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
+
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'))->toBeFalse();
+});
+
+test('non numerical parts are not detected for snake case dividers', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
+
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'))->toBeFalse();
+});
+
+test('numerically prefixed identifiers with unknown dividers are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'))->toBeFalse();
+
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'))->toBeFalse();
+
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'))->toBeFalse();
+
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'))->toBeFalse();
+});
+
+test('numerically prefixed identifiers without divider are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'))->toBeFalse();
+});
+
+test('numerically string prefixed identifiers without divider are not detected', function () {
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'))->toBeFalse();
+    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'))->toBeFalse();
+});

From 6468511e401cc0e4e1f3c0de936b83bddf8fd17d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:13:57 +0200
Subject: [PATCH 1837/2811] Revert "Convert test to a Pest test"

This reverts commit 0a7e8fb64cba327c030e8caa66a0885a97e1cb3d.
---
 ...lenamePrefixNavigationPriorityUnitTest.php | 380 ++++++++++--------
 1 file changed, 208 insertions(+), 172 deletions(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index f2a72fde534..ae0176244a4 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -2,177 +2,213 @@
 
 declare(strict_types=1);
 
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
-beforeEach(fn () => $this->mockConfig());
-
-test('enabled returns true when enabled', function () {
-    expect(FilenamePrefixNavigationHelper::enabled())->toBeTrue();
-});
-
-test('enabled returns false when disabled', function () {
-    $this->mockConfig(['hyde.numerical_page_ordering' => false]);
-
-    expect(FilenamePrefixNavigationHelper::enabled())->toBeFalse();
-});
-
-test('identifiers with numerical prefixes are detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'))->toBeTrue();
-});
-
-test('identifiers without numerical prefixes are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'))->toBeFalse();
-});
-
-test('identifiers with numerical prefixes are detected when using snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'))->toBeTrue();
-});
-
-test('split number and identifier', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'))->toBe([1, 'home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'))->toBe([2, 'about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'))->toBe([3, 'contact.md']);
-});
-
-test('split number and identifier for snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'))->toBe([1, 'home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'))->toBe([2, 'about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'))->toBe([3, 'contact.md']);
-});
-
-test('split number and identifier with multiple digits', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'))->toBe([123, 'home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'))->toBe([456, 'about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'))->toBe([789, 'contact.md']);
-});
-
-test('split number and identifier with multiple digits and snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'))->toBe([123, 'home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'))->toBe([456, 'about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'))->toBe([789, 'contact.md']);
-});
-
-test('split number and identifier throws exception when identifier is not numbered', function () {
-    $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-    $this->expectException(\AssertionError::class);
-    $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-    FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
-});
-
-test('identifiers for nested pages with numerical prefixes are detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'))->toBeTrue();
-});
-
-test('identifiers for nested pages with numerical prefixes are detected using snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'))->toBeTrue();
-});
-
-test('identifiers for nested pages without numerical prefixes are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'))->toBeFalse();
-});
-
-test('split number and identifier for nested pages', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'))->toBe([1, 'foo/home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'))->toBe([2, 'foo/about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'))->toBe([3, 'foo/contact.md']);
-});
-
-test('split number and identifier for nested pages with snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'))->toBe([1, 'foo/home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'))->toBe([2, 'foo/about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'))->toBe([3, 'foo/contact.md']);
-});
-
-test('identifiers for deeply nested pages with numerical prefixes are detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'))->toBeTrue();
-});
-
-test('identifiers for deeply nested pages with numerical prefixes are detected using snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'))->toBeTrue();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'))->toBeTrue();
-});
-
-test('identifiers for deeply nested pages without numerical prefixes are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'))->toBeFalse();
-});
-
-test('split number and identifier for deeply nested pages', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'))->toBe([1, 'foo/bar/home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'))->toBe([2, 'foo/bar/about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'))->toBe([3, 'foo/bar/contact.md']);
-});
-
-test('split number and identifier for deeply nested pages with snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'))->toBe([1, 'foo/bar/home.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'))->toBe([2, 'foo/bar/about.md']);
-    expect(FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'))->toBe([3, 'foo/bar/contact.md']);
-});
-
-test('non numerical parts are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'))->toBeFalse();
-
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'))->toBeFalse();
-});
-
-test('non numerical parts are not detected for snake case dividers', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'))->toBeFalse();
-
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'))->toBeFalse();
-});
-
-test('numerically prefixed identifiers with unknown dividers are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'))->toBeFalse();
-
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'))->toBeFalse();
-
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'))->toBeFalse();
-
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'))->toBeFalse();
-});
-
-test('numerically prefixed identifiers without divider are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'))->toBeFalse();
-});
-
-test('numerically string prefixed identifiers without divider are not detected', function () {
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'))->toBeFalse();
-    expect(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'))->toBeFalse();
-});
+/**
+ * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
+ *
+ * @see \Hyde\Framework\Testing\Feature\FilenamePrefixNavigationPriorityTest
+ */
+class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
+{
+    protected static bool $needsConfig = true;
+
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifier()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierWithMultipleDigitsAndSnakeCaseDividers()
+    {
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
+        $this->expectException(\AssertionError::class);
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+    }
+
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'));
+    }
+
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'));
+    }
+
+    public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForNestedPages()
+    {
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForNestedPagesWithSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForDeeplyNestedPages()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'));
+    }
+
+    public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDividers()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'));
+    }
+
+    public function testNonNumericalPartsAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'));
+    }
+
+    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'));
+    }
+
+    public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'));
+
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'));
+    }
+
+    public function testNumericallyPrefixedIdentifiersWithoutDividerAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'));
+    }
+
+    public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDetected()
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'));
+    }
+}

From 38ac759f61cc4ae5103bb2ff501ee69cf2931a69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:19:02 +0200
Subject: [PATCH 1838/2811] Set up PHPUnit data provider

Didn't realize this could also run multiple tests like in Pest
---
 .../Unit/FilenamePrefixNavigationPriorityUnitTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index ae0176244a4..8acef9a5491 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Foundation\HydeCoreExtension;
 use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
 
 /**
@@ -211,4 +212,12 @@ public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDete
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'));
     }
+
+    public static function pageTypeProvider(): array
+    {
+        self::needsKernel();
+        self::mockConfig();
+
+        return array_map(fn (string $class): array => [$class], HydeCoreExtension::getPageClasses());
+    }
 }

From e7706398ce4057f2fc21430ac0f2ab91aef19562 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:35:26 +0200
Subject: [PATCH 1839/2811] Add keys to the provider

---
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 8acef9a5491..145bda6fae7 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -218,6 +218,7 @@ public static function pageTypeProvider(): array
         self::needsKernel();
         self::mockConfig();
 
-        return array_map(fn (string $class): array => [$class], HydeCoreExtension::getPageClasses());
+        $arrayMap = array_map(fn (string $class): array => [$class], HydeCoreExtension::getPageClasses());
+        return array_combine(array_map(fn (string $class): string => str($class)->classBasename()->kebab()->replace('-', ' ')->toString(), HydeCoreExtension::getPageClasses()), $arrayMap);
     }
 }

From 828fb8b8af6aba4bd7a860974573b0f125f002d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:37:11 +0200
Subject: [PATCH 1840/2811] Clean up provider syntax

---
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 145bda6fae7..2837f332195 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -218,7 +218,9 @@ public static function pageTypeProvider(): array
         self::needsKernel();
         self::mockConfig();
 
-        $arrayMap = array_map(fn (string $class): array => [$class], HydeCoreExtension::getPageClasses());
-        return array_combine(array_map(fn (string $class): string => str($class)->classBasename()->kebab()->replace('-', ' ')->toString(), HydeCoreExtension::getPageClasses()), $arrayMap);
+        return array_combine(
+            array_map(fn ($class) => str($class)->classBasename()->snake(' ')->plural()->toString(),
+            HydeCoreExtension::getPageClasses()), array_map(fn ($class) => [$class], HydeCoreExtension::getPageClasses())
+        );
     }
 }

From 6aea910d848a13c5b1d562ad9cc3df7a0df47e64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:44:04 +0200
Subject: [PATCH 1841/2811] Fix wrong line wrapping

---
 .../tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 2837f332195..45237ce4c4c 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -219,8 +219,8 @@ public static function pageTypeProvider(): array
         self::mockConfig();
 
         return array_combine(
-            array_map(fn ($class) => str($class)->classBasename()->snake(' ')->plural()->toString(),
-            HydeCoreExtension::getPageClasses()), array_map(fn ($class) => [$class], HydeCoreExtension::getPageClasses())
+            array_map(fn ($class) => str($class)->classBasename()->snake(' ')->plural()->toString(), HydeCoreExtension::getPageClasses()),
+            array_map(fn ($class) => [$class], HydeCoreExtension::getPageClasses())
         );
     }
 }

From 73631344c2e927c786fdb3801eca20c90f9c7ba7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 18:45:22 +0200
Subject: [PATCH 1842/2811] Add matrix tests using data provider

---
 ...lenamePrefixNavigationPriorityUnitTest.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 45237ce4c4c..1e07644d1d4 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -144,6 +144,54 @@ public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNo
         $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'));
     }
 
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithNumericalPrefixesAreDetectedForPageType(string $type)
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType(string $type)
+    {
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.'.$type::$fileExtension));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.'.$type::$fileExtension));
+        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividersForPageType(string $type)
+    {
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testSplitNumberAndIdentifierForDeeplyNestedPagesForPageType(string $type)
+    {
+        $this->assertSame([1, 'foo/bar/home.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.'.$type::$fileExtension));
+        $this->assertSame([2, 'foo/bar/about.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.'.$type::$fileExtension));
+        $this->assertSame([3, 'foo/bar/contact.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.'.$type::$fileExtension));
+    }
+
     public function testSplitNumberAndIdentifierForDeeplyNestedPages()
     {
         $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'));

From 85e161d83b55c7d6f4493bd43ca32d8d4f6c80ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 20:45:00 +0200
Subject: [PATCH 1843/2811] Rename helper method to better fit its usage

Renames isIdentifierNumbered to hasNumericalPrefix
---
 .../Factories/NavigationDataFactory.php       |   2 +-
 .../FilenamePrefixNavigationHelper.php        |   4 +-
 .../framework/src/Support/Models/RouteKey.php |   2 +-
 ...lenamePrefixNavigationPriorityUnitTest.php | 132 +++++++++---------
 4 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 42679f3d1cc..d9cc52590d8 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -247,7 +247,7 @@ private function checkFilePrefixForOrder(): ?int
             return null;
         }
 
-        if (! FilenamePrefixNavigationHelper::isIdentifierNumbered($this->identifier)) {
+        if (! FilenamePrefixNavigationHelper::hasNumericalPrefix($this->identifier)) {
             return null;
         }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 033bd6d9599..9efcf78e5ce 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -31,7 +31,7 @@ public static function enabled(): bool
     /**
      * Determines if a given identifier has a numerical prefix.
      */
-    public static function isIdentifierNumbered(string $identifier): bool
+    public static function hasNumericalPrefix(string $identifier): bool
     {
         if (self::isIdentifierNested($identifier)) {
             $identifier = self::getCoreIdentifierPart($identifier);
@@ -52,7 +52,7 @@ public static function splitNumberAndIdentifier(string $identifier): array
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        assert(self::isIdentifierNumbered($identifier));
+        assert(self::hasNumericalPrefix($identifier));
 
         $separator = substr(ltrim($identifier, '0123456789'), 0, 1);
         $parts = explode($separator, $identifier, 2);
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index ecf98145996..9353d645cda 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -56,7 +56,7 @@ public static function fromPage(string $pageClass, string $identifier): self
     /** @experimental */
     protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
     {
-        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::isIdentifierNumbered($identifier)) {
+        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::hasNumericalPrefix($identifier)) {
             $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
         }
 
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 1e07644d1d4..862a79db25d 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -31,23 +31,23 @@ public function testEnabledReturnsFalseWhenDisabled()
 
     public function testIdentifiersWithNumericalPrefixesAreDetected()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03-contact.md'));
     }
 
     public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('contact.md'));
     }
 
     public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividers()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03_contact.md'));
     }
 
     public function testSplitNumberAndIdentifier()
@@ -90,23 +90,23 @@ public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNu
 
     public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03-contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/03-contact.md'));
     }
 
     public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/03_contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/03_contact.md'));
     }
 
     public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/contact.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/contact.md'));
     }
 
     public function testSplitNumberAndIdentifierForNestedPages()
@@ -125,23 +125,23 @@ public function testSplitNumberAndIdentifierForNestedPagesWithSnakeCaseDividers(
 
     public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03-contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/01-home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/02-about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/03-contact.md'));
     }
 
     public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/03_contact.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/01_home.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/02_about.md'));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/03_contact.md'));
     }
 
     public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo/bar/contact.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/contact.md'));
     }
 
     /**
@@ -151,9 +151,9 @@ public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNo
      */
     public function testIdentifiersWithNumericalPrefixesAreDetectedForPageType(string $type)
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01-home.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02-about.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03-contact.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01-home.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02-about.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03-contact.'.$type::$fileExtension));
     }
 
     /**
@@ -163,9 +163,9 @@ public function testIdentifiersWithNumericalPrefixesAreDetectedForPageType(strin
      */
     public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType(string $type)
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('home.'.$type::$fileExtension));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('about.'.$type::$fileExtension));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('contact.'.$type::$fileExtension));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('home.'.$type::$fileExtension));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('about.'.$type::$fileExtension));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('contact.'.$type::$fileExtension));
     }
 
     /**
@@ -175,9 +175,9 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType
      */
     public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividersForPageType(string $type)
     {
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('01_home.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('02_about.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::isIdentifierNumbered('03_contact.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.'.$type::$fileExtension));
+        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03_contact.'.$type::$fileExtension));
     }
 
     /**
@@ -208,57 +208,57 @@ public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDiv
 
     public function testNonNumericalPartsAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
 
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo-bar/contact.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/contact.md'));
     }
 
     public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
 
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('foo_bar/contact.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/home.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/about.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/contact.md'));
     }
 
     public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001.foo.md'));
 
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01/foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001/foo.md'));
 
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01—foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001—foo.md'));
 
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01 foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001 foo.md'));
     }
 
     public function testNumericallyPrefixedIdentifiersWithoutDividerAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('1foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('01foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('001foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001foo.md'));
     }
 
     public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDetected()
     {
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one-foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one_foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::isIdentifierNumbered('one.foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one-foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one_foo.md'));
+        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one.foo.md'));
     }
 
     public static function pageTypeProvider(): array

From 6520b7fd8f76dc6829795f8032c1c58207b31272 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 20:48:35 +0200
Subject: [PATCH 1844/2811] Rename helper method to better fit its usage

Renames splitNumberAndIdentifier to splitNumericPrefix
---
 .../Factories/NavigationDataFactory.php       |  2 +-
 .../FilenamePrefixNavigationHelper.php        |  2 +-
 .../framework/src/Support/Models/RouteKey.php |  2 +-
 ...lenamePrefixNavigationPriorityUnitTest.php | 76 +++++++++----------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d9cc52590d8..34118b02ba2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -251,7 +251,7 @@ private function checkFilePrefixForOrder(): ?int
             return null;
         }
 
-        return FilenamePrefixNavigationHelper::splitNumberAndIdentifier($this->identifier)[0];
+        return FilenamePrefixNavigationHelper::splitNumericPrefix($this->identifier)[0];
     }
 
     private function canUseSubdirectoryForGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 9efcf78e5ce..858cdece6ba 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -45,7 +45,7 @@ public static function hasNumericalPrefix(string $identifier): bool
      *
      * @return array{integer, string}
      */
-    public static function splitNumberAndIdentifier(string $identifier): array
+    public static function splitNumericPrefix(string $identifier): array
     {
         if (self::isIdentifierNested($identifier)) {
             $parentPath = self::getNestedIdentifierPrefix($identifier);
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 9353d645cda..81b4dc2569e 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -57,7 +57,7 @@ public static function fromPage(string $pageClass, string $identifier): self
     protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
     {
         if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::hasNumericalPrefix($identifier)) {
-            $identifier = FilenamePrefixNavigationHelper::splitNumberAndIdentifier($identifier)[1];
+            $identifier = FilenamePrefixNavigationHelper::splitNumericPrefix($identifier)[1];
         }
 
         return $identifier;
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 862a79db25d..3fe7e159658 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -50,42 +50,42 @@ public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCas
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03_contact.md'));
     }
 
-    public function testSplitNumberAndIdentifier()
+    public function testSplitNumericPrefix()
     {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03-contact.md'));
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('01-home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('02-about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('03-contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierForSnakeCaseDividers()
+    public function testSplitNumericPrefixForSnakeCaseDividers()
     {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('01_home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('02_about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('03_contact.md'));
+        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('01_home.md'));
+        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('02_about.md'));
+        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('03_contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierWithMultipleDigits()
+    public function testSplitNumericPrefixWithMultipleDigits()
     {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789-contact.md'));
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('123-home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('456-about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('789-contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierWithMultipleDigitsAndSnakeCaseDividers()
+    public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDividers()
     {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('123_home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('456_about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('789_contact.md'));
+        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('123_home.md'));
+        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('456_about.md'));
+        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('789_contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierThrowsExceptionWhenIdentifierIsNotNumbered()
+    public function testSplitNumericPrefixThrowsExceptionWhenIdentifierIsNotNumbered()
     {
         $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
 
         $this->expectException(\AssertionError::class);
         $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
 
-        FilenamePrefixNavigationHelper::splitNumberAndIdentifier('home.md');
+        FilenamePrefixNavigationHelper::splitNumericPrefix('home.md');
     }
 
     public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
@@ -109,18 +109,18 @@ public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetec
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierForNestedPages()
+    public function testSplitNumericPrefixForNestedPages()
     {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01-home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02-about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03-contact.md'));
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/01-home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/02-about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/03-contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierForNestedPagesWithSnakeCaseDividers()
+    public function testSplitNumericPrefixForNestedPagesWithSnakeCaseDividers()
     {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/01_home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/02_about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/03_contact.md'));
+        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/01_home.md'));
+        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/02_about.md'));
+        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/03_contact.md'));
     }
 
     public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
@@ -185,25 +185,25 @@ public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCas
      *
      * @dataProvider pageTypeProvider
      */
-    public function testSplitNumberAndIdentifierForDeeplyNestedPagesForPageType(string $type)
+    public function testSplitNumericPrefixForDeeplyNestedPagesForPageType(string $type)
     {
-        $this->assertSame([1, 'foo/bar/home.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.'.$type::$fileExtension));
-        $this->assertSame([2, 'foo/bar/about.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.'.$type::$fileExtension));
-        $this->assertSame([3, 'foo/bar/contact.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.'.$type::$fileExtension));
+        $this->assertSame([1, 'foo/bar/home.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01-home.'.$type::$fileExtension));
+        $this->assertSame([2, 'foo/bar/about.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02-about.'.$type::$fileExtension));
+        $this->assertSame([3, 'foo/bar/contact.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03-contact.'.$type::$fileExtension));
     }
 
-    public function testSplitNumberAndIdentifierForDeeplyNestedPages()
+    public function testSplitNumericPrefixForDeeplyNestedPages()
     {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01-home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02-about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03-contact.md'));
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01-home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02-about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03-contact.md'));
     }
 
-    public function testSplitNumberAndIdentifierForDeeplyNestedPagesWithSnakeCaseDividers()
+    public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDividers()
     {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/01_home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/02_about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumberAndIdentifier('foo/bar/03_contact.md'));
+        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01_home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02_about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03_contact.md'));
     }
 
     public function testNonNumericalPartsAreNotDetected()

From 22a52b2ef91b511ac130ed8d48df3801edc773ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 20:50:19 +0200
Subject: [PATCH 1845/2811] Update test terminology

I think delimiter is better than divider here
---
 ...lenamePrefixNavigationPriorityUnitTest.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
index 3fe7e159658..63fa7e10556 100644
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
@@ -43,7 +43,7 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('contact.md'));
     }
 
-    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividers()
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimiters()
     {
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.md'));
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.md'));
@@ -57,7 +57,7 @@ public function testSplitNumericPrefix()
         $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('03-contact.md'));
     }
 
-    public function testSplitNumericPrefixForSnakeCaseDividers()
+    public function testSplitNumericPrefixForSnakeCaseDelimiters()
     {
         $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('01_home.md'));
         $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('02_about.md'));
@@ -71,7 +71,7 @@ public function testSplitNumericPrefixWithMultipleDigits()
         $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('789-contact.md'));
     }
 
-    public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDividers()
+    public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDelimiters()
     {
         $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('123_home.md'));
         $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('456_about.md'));
@@ -95,7 +95,7 @@ public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/03-contact.md'));
     }
 
-    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
     {
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/01_home.md'));
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/02_about.md'));
@@ -116,7 +116,7 @@ public function testSplitNumericPrefixForNestedPages()
         $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/03-contact.md'));
     }
 
-    public function testSplitNumericPrefixForNestedPagesWithSnakeCaseDividers()
+    public function testSplitNumericPrefixForNestedPagesWithSnakeCaseDelimiters()
     {
         $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/01_home.md'));
         $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/02_about.md'));
@@ -130,7 +130,7 @@ public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetec
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/03-contact.md'));
     }
 
-    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDividers()
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
     {
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/01_home.md'));
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/02_about.md'));
@@ -173,7 +173,7 @@ public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType
      *
      * @dataProvider pageTypeProvider
      */
-    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDividersForPageType(string $type)
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimitersForPageType(string $type)
     {
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.'.$type::$fileExtension));
         $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.'.$type::$fileExtension));
@@ -199,7 +199,7 @@ public function testSplitNumericPrefixForDeeplyNestedPages()
         $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03-contact.md'));
     }
 
-    public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDividers()
+    public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDelimiters()
     {
         $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01_home.md'));
         $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02_about.md'));
@@ -217,7 +217,7 @@ public function testNonNumericalPartsAreNotDetected()
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/contact.md'));
     }
 
-    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
+    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDelimiters()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
@@ -228,7 +228,7 @@ public function testNonNumericalPartsAreNotDetectedForSnakeCaseDividers()
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/contact.md'));
     }
 
-    public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetected()
+    public function testNumericallyPrefixedIdentifiersWithUnknownDelimitersAreNotDetected()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1.foo.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01.foo.md'));
@@ -247,14 +247,14 @@ public function testNumericallyPrefixedIdentifiersWithUnknownDividersAreNotDetec
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001 foo.md'));
     }
 
-    public function testNumericallyPrefixedIdentifiersWithoutDividerAreNotDetected()
+    public function testNumericallyPrefixedIdentifiersWithoutDelimiterAreNotDetected()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1foo.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01foo.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001foo.md'));
     }
 
-    public function testNumericallyStringPrefixedIdentifiersWithoutDividerAreNotDetected()
+    public function testNumericallyStringPrefixedIdentifiersWithoutDelimiterAreNotDetected()
     {
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one-foo.md'));
         $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one_foo.md'));

From 4e990e0ec77604dc5200ee11084c5f2c3389c6c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 20:51:02 +0200
Subject: [PATCH 1846/2811] Introduce local variable

In case we want to customize this later it's easier to see here
---
 .../Features/Navigation/FilenamePrefixNavigationHelper.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
index 858cdece6ba..c24ddff61a9 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
@@ -11,6 +11,7 @@
 use function assert;
 use function substr;
 use function explode;
+use function implode;
 use function preg_match;
 
 /**
@@ -37,7 +38,9 @@ public static function hasNumericalPrefix(string $identifier): bool
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        return preg_match('/^\d+[-_]/', $identifier) === 1;
+        $delimiters = implode(['-', '_']);
+
+        return preg_match('/^\d+['.$delimiters.']/', $identifier) === 1;
     }
 
     /**

From 55367c793c94a3402a9b2f737b3444d7712f9c87 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 20:56:50 +0200
Subject: [PATCH 1847/2811] Rename helper class to NumericalPageOrderingHelper

Renames FilenamePrefixNavigationHelper to NumericalPageOrderingHelper
---
 .../Factories/NavigationDataFactory.php       |   8 +-
 ...er.php => NumericalPageOrderingHelper.php} |   2 +-
 .../framework/src/Support/Models/RouteKey.php |   6 +-
 ...hp => NumericalPageOrderingHelperTest.php} |  10 +-
 ...lenamePrefixNavigationPriorityUnitTest.php | 274 ------------------
 .../NumericalPageOrderingHelperUnitTest.php   | 274 ++++++++++++++++++
 6 files changed, 287 insertions(+), 287 deletions(-)
 rename packages/framework/src/Framework/Features/Navigation/{FilenamePrefixNavigationHelper.php => NumericalPageOrderingHelper.php} (98%)
 rename packages/framework/tests/Feature/{FilenamePrefixNavigationPriorityTest.php => NumericalPageOrderingHelperTest.php} (96%)
 delete mode 100644 packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
 create mode 100644 packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 34118b02ba2..e747f27c53e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -12,7 +12,7 @@
 use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
-use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
+use Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper;
 
 use function basename;
 use function array_flip;
@@ -243,15 +243,15 @@ private function parseNavigationPriorityConfig(array $config, string $pageKeyNam
 
     private function checkFilePrefixForOrder(): ?int
     {
-        if (! FilenamePrefixNavigationHelper::enabled()) {
+        if (! NumericalPageOrderingHelper::enabled()) {
             return null;
         }
 
-        if (! FilenamePrefixNavigationHelper::hasNumericalPrefix($this->identifier)) {
+        if (! NumericalPageOrderingHelper::hasNumericalPrefix($this->identifier)) {
             return null;
         }
 
-        return FilenamePrefixNavigationHelper::splitNumericPrefix($this->identifier)[0];
+        return NumericalPageOrderingHelper::splitNumericPrefix($this->identifier)[0];
     }
 
     private function canUseSubdirectoryForGroups(): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
similarity index 98%
rename from packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
rename to packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index c24ddff61a9..5a7767d053f 100644
--- a/packages/framework/src/Framework/Features/Navigation/FilenamePrefixNavigationHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -19,7 +19,7 @@
  *
  * @experimental The code herein may be moved to more appropriate locations in the future.
  */
-class FilenamePrefixNavigationHelper
+class NumericalPageOrderingHelper
 {
     /**
      * Determines if the feature is enabled.
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 81b4dc2569e..24766e73a11 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -5,7 +5,7 @@
 namespace Hyde\Support\Models;
 
 use Stringable;
-use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
+use Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper;
 
 use function unslash;
 
@@ -56,8 +56,8 @@ public static function fromPage(string $pageClass, string $identifier): self
     /** @experimental */
     protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
     {
-        if (FilenamePrefixNavigationHelper::enabled() && FilenamePrefixNavigationHelper::hasNumericalPrefix($identifier)) {
-            $identifier = FilenamePrefixNavigationHelper::splitNumericPrefix($identifier)[1];
+        if (NumericalPageOrderingHelper::enabled() && NumericalPageOrderingHelper::hasNumericalPrefix($identifier)) {
+            $identifier = NumericalPageOrderingHelper::splitNumericPrefix($identifier)[1];
         }
 
         return $identifier;
diff --git a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
similarity index 96%
rename from packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
rename to packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index 05aa57a5d5f..e2a8f09c15e 100644
--- a/packages/framework/tests/Feature/FilenamePrefixNavigationPriorityTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -22,17 +22,17 @@
  * The feature can be disabled in the config. It also works within sidebar groups,
  * so that multiple groups can have the same prefix independent of other groups.
  *
- * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
+ * @covers \Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Factories\NavigationDataFactory // Todo: Update the unit test for this class.
  * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
  *
- * @see \Hyde\Framework\Testing\Unit\FilenamePrefixNavigationPriorityUnitTest
+ * @see \Hyde\Framework\Testing\Unit\NumericalPageOrderingHelperUnitTest
  *
  * Todo: Add test to ensure explicitly set priority overrides filename prefix.
  */
-class FilenamePrefixNavigationPriorityTest extends TestCase
+class NumericalPageOrderingHelperTest extends TestCase
 {
     protected function setUp(): void
     {
@@ -291,9 +291,9 @@ protected function arrayReverseRecursive(array $array): array
 
 class FilenamePrefixNavigationPriorityTestingHelper
 {
-    protected FilenamePrefixNavigationPriorityTest $test;
+    protected NumericalPageOrderingHelperTest $test;
 
-    public function __construct(FilenamePrefixNavigationPriorityTest $test)
+    public function __construct(NumericalPageOrderingHelperTest $test)
     {
         $this->test = $test;
     }
diff --git a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php b/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
deleted file mode 100644
index 63fa7e10556..00000000000
--- a/packages/framework/tests/Unit/FilenamePrefixNavigationPriorityUnitTest.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Unit;
-
-use Hyde\Testing\UnitTestCase;
-use Hyde\Foundation\HydeCoreExtension;
-use Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper;
-
-/**
- * @covers \Hyde\Framework\Features\Navigation\FilenamePrefixNavigationHelper
- *
- * @see \Hyde\Framework\Testing\Feature\FilenamePrefixNavigationPriorityTest
- */
-class FilenamePrefixNavigationPriorityUnitTest extends UnitTestCase
-{
-    protected static bool $needsConfig = true;
-
-    public function testEnabledReturnsTrueWhenEnabled()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testEnabledReturnsFalseWhenDisabled()
-    {
-        self::mockConfig(['hyde.numerical_page_ordering' => false]);
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::enabled());
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03-contact.md'));
-    }
-
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('contact.md'));
-    }
-
-    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimiters()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03_contact.md'));
-    }
-
-    public function testSplitNumericPrefix()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('01-home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('02-about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('03-contact.md'));
-    }
-
-    public function testSplitNumericPrefixForSnakeCaseDelimiters()
-    {
-        $this->assertSame([1, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('01_home.md'));
-        $this->assertSame([2, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('02_about.md'));
-        $this->assertSame([3, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('03_contact.md'));
-    }
-
-    public function testSplitNumericPrefixWithMultipleDigits()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('123-home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('456-about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('789-contact.md'));
-    }
-
-    public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDelimiters()
-    {
-        $this->assertSame([123, 'home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('123_home.md'));
-        $this->assertSame([456, 'about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('456_about.md'));
-        $this->assertSame([789, 'contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('789_contact.md'));
-    }
-
-    public function testSplitNumericPrefixThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        FilenamePrefixNavigationHelper::splitNumericPrefix('home.md');
-    }
-
-    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/03-contact.md'));
-    }
-
-    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/03_contact.md'));
-    }
-
-    public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/contact.md'));
-    }
-
-    public function testSplitNumericPrefixForNestedPages()
-    {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/01-home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/02-about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/03-contact.md'));
-    }
-
-    public function testSplitNumericPrefixForNestedPagesWithSnakeCaseDelimiters()
-    {
-        $this->assertSame([1, 'foo/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/01_home.md'));
-        $this->assertSame([2, 'foo/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/02_about.md'));
-        $this->assertSame([3, 'foo/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/03_contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/01-home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/02-about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/03-contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/01_home.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/02_about.md'));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/03_contact.md'));
-    }
-
-    public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo/bar/contact.md'));
-    }
-
-    /**
-     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
-     *
-     * @dataProvider pageTypeProvider
-     */
-    public function testIdentifiersWithNumericalPrefixesAreDetectedForPageType(string $type)
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01-home.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02-about.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03-contact.'.$type::$fileExtension));
-    }
-
-    /**
-     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
-     *
-     * @dataProvider pageTypeProvider
-     */
-    public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType(string $type)
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('home.'.$type::$fileExtension));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('about.'.$type::$fileExtension));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('contact.'.$type::$fileExtension));
-    }
-
-    /**
-     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
-     *
-     * @dataProvider pageTypeProvider
-     */
-    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimitersForPageType(string $type)
-    {
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('01_home.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('02_about.'.$type::$fileExtension));
-        $this->assertTrue(FilenamePrefixNavigationHelper::hasNumericalPrefix('03_contact.'.$type::$fileExtension));
-    }
-
-    /**
-     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
-     *
-     * @dataProvider pageTypeProvider
-     */
-    public function testSplitNumericPrefixForDeeplyNestedPagesForPageType(string $type)
-    {
-        $this->assertSame([1, 'foo/bar/home.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01-home.'.$type::$fileExtension));
-        $this->assertSame([2, 'foo/bar/about.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02-about.'.$type::$fileExtension));
-        $this->assertSame([3, 'foo/bar/contact.'.$type::$fileExtension], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03-contact.'.$type::$fileExtension));
-    }
-
-    public function testSplitNumericPrefixForDeeplyNestedPages()
-    {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01-home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02-about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03-contact.md'));
-    }
-
-    public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDelimiters()
-    {
-        $this->assertSame([1, 'foo/bar/home.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/01_home.md'));
-        $this->assertSame([2, 'foo/bar/about.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/02_about.md'));
-        $this->assertSame([3, 'foo/bar/contact.md'], FilenamePrefixNavigationHelper::splitNumericPrefix('foo/bar/03_contact.md'));
-    }
-
-    public function testNonNumericalPartsAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo-bar/contact.md'));
-    }
-
-    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDelimiters()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/home.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/about.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('foo_bar/contact.md'));
-    }
-
-    public function testNumericallyPrefixedIdentifiersWithUnknownDelimitersAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01.foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001.foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01/foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001/foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01—foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001—foo.md'));
-
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01 foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001 foo.md'));
-    }
-
-    public function testNumericallyPrefixedIdentifiersWithoutDelimiterAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('1foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('01foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('001foo.md'));
-    }
-
-    public function testNumericallyStringPrefixedIdentifiersWithoutDelimiterAreNotDetected()
-    {
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one-foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one_foo.md'));
-        $this->assertFalse(FilenamePrefixNavigationHelper::hasNumericalPrefix('one.foo.md'));
-    }
-
-    public static function pageTypeProvider(): array
-    {
-        self::needsKernel();
-        self::mockConfig();
-
-        return array_combine(
-            array_map(fn ($class) => str($class)->classBasename()->snake(' ')->plural()->toString(), HydeCoreExtension::getPageClasses()),
-            array_map(fn ($class) => [$class], HydeCoreExtension::getPageClasses())
-        );
-    }
-}
diff --git a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
new file mode 100644
index 00000000000..57d50717fdd
--- /dev/null
+++ b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
@@ -0,0 +1,274 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+use Hyde\Foundation\HydeCoreExtension;
+use Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper
+ *
+ * @see \Hyde\Framework\Testing\Feature\NumericalPageOrderingHelperTest
+ */
+class NumericalPageOrderingHelperUnitTest extends UnitTestCase
+{
+    protected static bool $needsConfig = true;
+
+    public function testEnabledReturnsTrueWhenEnabled()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::enabled());
+    }
+
+    public function testEnabledReturnsFalseWhenDisabled()
+    {
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
+
+        $this->assertFalse(NumericalPageOrderingHelper::enabled());
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('02-about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('03-contact.md'));
+    }
+
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('home.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('about.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('contact.md'));
+    }
+
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimiters()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01_home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('02_about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('03_contact.md'));
+    }
+
+    public function testSplitNumericPrefix()
+    {
+        $this->assertSame([1, 'home.md'], NumericalPageOrderingHelper::splitNumericPrefix('01-home.md'));
+        $this->assertSame([2, 'about.md'], NumericalPageOrderingHelper::splitNumericPrefix('02-about.md'));
+        $this->assertSame([3, 'contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('03-contact.md'));
+    }
+
+    public function testSplitNumericPrefixForSnakeCaseDelimiters()
+    {
+        $this->assertSame([1, 'home.md'], NumericalPageOrderingHelper::splitNumericPrefix('01_home.md'));
+        $this->assertSame([2, 'about.md'], NumericalPageOrderingHelper::splitNumericPrefix('02_about.md'));
+        $this->assertSame([3, 'contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('03_contact.md'));
+    }
+
+    public function testSplitNumericPrefixWithMultipleDigits()
+    {
+        $this->assertSame([123, 'home.md'], NumericalPageOrderingHelper::splitNumericPrefix('123-home.md'));
+        $this->assertSame([456, 'about.md'], NumericalPageOrderingHelper::splitNumericPrefix('456-about.md'));
+        $this->assertSame([789, 'contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('789-contact.md'));
+    }
+
+    public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDelimiters()
+    {
+        $this->assertSame([123, 'home.md'], NumericalPageOrderingHelper::splitNumericPrefix('123_home.md'));
+        $this->assertSame([456, 'about.md'], NumericalPageOrderingHelper::splitNumericPrefix('456_about.md'));
+        $this->assertSame([789, 'contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('789_contact.md'));
+    }
+
+    public function testSplitNumericPrefixThrowsExceptionWhenIdentifierIsNotNumbered()
+    {
+        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
+
+        $this->expectException(\AssertionError::class);
+        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
+
+        NumericalPageOrderingHelper::splitNumericPrefix('home.md');
+    }
+
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/01-home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/02-about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/03-contact.md'));
+    }
+
+    public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/01_home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/02_about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/03_contact.md'));
+    }
+
+    public function testIdentifiersForNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/home.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/about.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/contact.md'));
+    }
+
+    public function testSplitNumericPrefixForNestedPages()
+    {
+        $this->assertSame([1, 'foo/home.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/01-home.md'));
+        $this->assertSame([2, 'foo/about.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/02-about.md'));
+        $this->assertSame([3, 'foo/contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/03-contact.md'));
+    }
+
+    public function testSplitNumericPrefixForNestedPagesWithSnakeCaseDelimiters()
+    {
+        $this->assertSame([1, 'foo/home.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/01_home.md'));
+        $this->assertSame([2, 'foo/about.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/02_about.md'));
+        $this->assertSame([3, 'foo/contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/03_contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetected()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/01-home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/02-about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/03-contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithNumericalPrefixesAreDetectedUsingSnakeCaseDelimiters()
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/01_home.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/02_about.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/03_contact.md'));
+    }
+
+    public function testIdentifiersForDeeplyNestedPagesWithoutNumericalPrefixesAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/home.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/about.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo/bar/contact.md'));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithNumericalPrefixesAreDetectedForPageType(string $type)
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-home.'.$type::$fileExtension));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('02-about.'.$type::$fileExtension));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('03-contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithoutNumericalPrefixesAreNotDetectedForPageType(string $type)
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('home.'.$type::$fileExtension));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('about.'.$type::$fileExtension));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testIdentifiersWithNumericalPrefixesAreDetectedWhenUsingSnakeCaseDelimitersForPageType(string $type)
+    {
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01_home.'.$type::$fileExtension));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('02_about.'.$type::$fileExtension));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('03_contact.'.$type::$fileExtension));
+    }
+
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $type
+     *
+     * @dataProvider pageTypeProvider
+     */
+    public function testSplitNumericPrefixForDeeplyNestedPagesForPageType(string $type)
+    {
+        $this->assertSame([1, 'foo/bar/home.'.$type::$fileExtension], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/01-home.'.$type::$fileExtension));
+        $this->assertSame([2, 'foo/bar/about.'.$type::$fileExtension], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/02-about.'.$type::$fileExtension));
+        $this->assertSame([3, 'foo/bar/contact.'.$type::$fileExtension], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/03-contact.'.$type::$fileExtension));
+    }
+
+    public function testSplitNumericPrefixForDeeplyNestedPages()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/01-home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/02-about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/03-contact.md'));
+    }
+
+    public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDelimiters()
+    {
+        $this->assertSame([1, 'foo/bar/home.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/01_home.md'));
+        $this->assertSame([2, 'foo/bar/about.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/02_about.md'));
+        $this->assertSame([3, 'foo/bar/contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/03_contact.md'));
+    }
+
+    public function testNonNumericalPartsAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar.md'));
+
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar/home.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar/about.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar/contact.md'));
+    }
+
+    public function testNonNumericalPartsAreNotDetectedForSnakeCaseDelimiters()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar.md'));
+
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar/home.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar/about.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo_bar/contact.md'));
+    }
+
+    public function testNumericallyPrefixedIdentifiersWithUnknownDelimitersAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('1.foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01.foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('001.foo.md'));
+
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('1/foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01/foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('001/foo.md'));
+
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('1—foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01—foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('001—foo.md'));
+
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('1 foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01 foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('001 foo.md'));
+    }
+
+    public function testNumericallyPrefixedIdentifiersWithoutDelimiterAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('1foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('001foo.md'));
+    }
+
+    public function testNumericallyStringPrefixedIdentifiersWithoutDelimiterAreNotDetected()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('one-foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('one_foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('one.foo.md'));
+    }
+
+    public static function pageTypeProvider(): array
+    {
+        self::needsKernel();
+        self::mockConfig();
+
+        return array_combine(
+            array_map(fn ($class) => str($class)->classBasename()->snake(' ')->plural()->toString(), HydeCoreExtension::getPageClasses()),
+            array_map(fn ($class) => [$class], HydeCoreExtension::getPageClasses())
+        );
+    }
+}

From 5854ad85d915339e1522c23c5f0b4e3d453a42bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:00:52 +0200
Subject: [PATCH 1848/2811] Remove experimental marker, keeping internal marker

I don't see much use for this class outside of the framework internals
---
 .../Features/Navigation/NumericalPageOrderingHelper.php         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 5a7767d053f..8fe32a32387 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -16,8 +16,6 @@
 
 /**
  * @internal Helper class for the new Filename Prefix Navigation feature.
- *
- * @experimental The code herein may be moved to more appropriate locations in the future.
  */
 class NumericalPageOrderingHelper
 {

From 7e02a740ee0be9ceba2728a9f13d780135f61b6e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:01:46 +0200
Subject: [PATCH 1849/2811] Update internal marker reasoning

---
 .../Features/Navigation/NumericalPageOrderingHelper.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 8fe32a32387..71136ba3b94 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -15,7 +15,7 @@
 use function preg_match;
 
 /**
- * @internal Helper class for the new Filename Prefix Navigation feature.
+ * @internal This class contains shared helper code for the framework to provide numerical page ordering. It is not intended to be used outside the framework code internals.
  */
 class NumericalPageOrderingHelper
 {

From d3893e4a728619e08f1fc9b88cb79639c3094961 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:03:19 +0200
Subject: [PATCH 1850/2811] Remove assertions from the code

Since this is an internal class we do not need these sanity checks as we know we provide valid states. If we make the class public we instead want to throw proper exceptions.
---
 .../Navigation/NumericalPageOrderingHelper.php         |  7 -------
 .../tests/Unit/NumericalPageOrderingHelperUnitTest.php | 10 ----------
 2 files changed, 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 71136ba3b94..6d724e60f6f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -8,7 +8,6 @@
 use Illuminate\Support\Str;
 
 use function ltrim;
-use function assert;
 use function substr;
 use function explode;
 use function implode;
@@ -53,8 +52,6 @@ public static function splitNumericPrefix(string $identifier): array
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        assert(self::hasNumericalPrefix($identifier));
-
         $separator = substr(ltrim($identifier, '0123456789'), 0, 1);
         $parts = explode($separator, $identifier, 2);
 
@@ -74,15 +71,11 @@ protected static function isIdentifierNested(string $identifier): bool
 
     protected static function getNestedIdentifierPrefix(string $identifier): string
     {
-        assert(self::isIdentifierNested($identifier));
-
         return Str::beforeLast($identifier, '/');
     }
 
     protected static function getCoreIdentifierPart(string $identifier): string
     {
-        assert(self::isIdentifierNested($identifier));
-
         return Str::afterLast($identifier, '/');
     }
 }
diff --git a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
index 57d50717fdd..b715332c15a 100644
--- a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
+++ b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
@@ -78,16 +78,6 @@ public function testSplitNumericPrefixWithMultipleDigitsAndSnakeCaseDelimiters()
         $this->assertSame([789, 'contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('789_contact.md'));
     }
 
-    public function testSplitNumericPrefixThrowsExceptionWhenIdentifierIsNotNumbered()
-    {
-        $this->markTestSkipped('Since this is an internal class at the moment, we do not need to test this. If we want this in the public API it should be a badmethodcall exception.');
-
-        $this->expectException(\AssertionError::class);
-        $this->expectExceptionMessage('Identifier "home.md" is not numbered.');
-
-        NumericalPageOrderingHelper::splitNumericPrefix('home.md');
-    }
-
     public function testIdentifiersForNestedPagesWithNumericalPrefixesAreDetected()
     {
         $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('foo/01-home.md'));

From 91db72b1eec380c4bd2bd98a7c58bc68b5df1e44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:06:09 +0200
Subject: [PATCH 1851/2811] Extract helper method

---
 .../Features/Navigation/NumericalPageOrderingHelper.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 6d724e60f6f..098743202c3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -52,7 +52,7 @@ public static function splitNumericPrefix(string $identifier): array
             $identifier = self::getCoreIdentifierPart($identifier);
         }
 
-        $separator = substr(ltrim($identifier, '0123456789'), 0, 1);
+        $separator = self::getFirstCharacterFromIdentifier($identifier);
         $parts = explode($separator, $identifier, 2);
 
         $parts[0] = (int) $parts[0];
@@ -78,4 +78,9 @@ protected static function getCoreIdentifierPart(string $identifier): string
     {
         return Str::afterLast($identifier, '/');
     }
+
+    protected static function getFirstCharacterFromIdentifier(string $identifier): string
+    {
+        return substr(ltrim($identifier, '0123456789'), 0, 1);
+    }
 }

From dfed72dc920451fa698db10627570e2ca9e75073 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:06:26 +0200
Subject: [PATCH 1852/2811] Use static instead of self

---
 .../Navigation/NumericalPageOrderingHelper.php       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 098743202c3..f44ab1b903f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -31,8 +31,8 @@ public static function enabled(): bool
      */
     public static function hasNumericalPrefix(string $identifier): bool
     {
-        if (self::isIdentifierNested($identifier)) {
-            $identifier = self::getCoreIdentifierPart($identifier);
+        if (static::isIdentifierNested($identifier)) {
+            $identifier = static::getCoreIdentifierPart($identifier);
         }
 
         $delimiters = implode(['-', '_']);
@@ -47,12 +47,12 @@ public static function hasNumericalPrefix(string $identifier): bool
      */
     public static function splitNumericPrefix(string $identifier): array
     {
-        if (self::isIdentifierNested($identifier)) {
-            $parentPath = self::getNestedIdentifierPrefix($identifier);
-            $identifier = self::getCoreIdentifierPart($identifier);
+        if (static::isIdentifierNested($identifier)) {
+            $parentPath = static::getNestedIdentifierPrefix($identifier);
+            $identifier = static::getCoreIdentifierPart($identifier);
         }
 
-        $separator = self::getFirstCharacterFromIdentifier($identifier);
+        $separator = static::getFirstCharacterFromIdentifier($identifier);
         $parts = explode($separator, $identifier, 2);
 
         $parts[0] = (int) $parts[0];

From b5349bd5cf4b4781ee552a75c52cb01896cf27e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:07:33 +0200
Subject: [PATCH 1853/2811] Convert local variable contents to protected class
 constant

---
 .../Navigation/NumericalPageOrderingHelper.php        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index f44ab1b903f..27c9f58b70e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -18,6 +18,13 @@
  */
 class NumericalPageOrderingHelper
 {
+    /**
+     * The delimiters that are used to separate the numerical prefix from the rest of the identifier.
+     *
+     * @var array<string>
+     */
+    protected const DELIMITERS = ['-', '_'];
+
     /**
      * Determines if the feature is enabled.
      */
@@ -35,9 +42,7 @@ public static function hasNumericalPrefix(string $identifier): bool
             $identifier = static::getCoreIdentifierPart($identifier);
         }
 
-        $delimiters = implode(['-', '_']);
-
-        return preg_match('/^\d+['.$delimiters.']/', $identifier) === 1;
+        return preg_match('/^\d+['.implode(static::DELIMITERS).']/', $identifier) === 1;
     }
 
     /**

From 2c36b6dc5bfcee7e49e7df937cb13b50a9a00ce4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:08:26 +0200
Subject: [PATCH 1854/2811] Convert concatenation to 'sprintf()' call

---
 .../Features/Navigation/NumericalPageOrderingHelper.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 27c9f58b70e..4fc85c20001 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -42,7 +42,7 @@ public static function hasNumericalPrefix(string $identifier): bool
             $identifier = static::getCoreIdentifierPart($identifier);
         }
 
-        return preg_match('/^\d+['.implode(static::DELIMITERS).']/', $identifier) === 1;
+        return preg_match(sprintf('/^\d+[%s]/', implode(static::DELIMITERS)), $identifier) === 1;
     }
 
     /**

From bae9e7fd8b73908e1d8ce3d954a8c176b6a7065c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:09:05 +0200
Subject: [PATCH 1855/2811] Import used function

---
 .../Features/Navigation/NumericalPageOrderingHelper.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 4fc85c20001..ae95912a5c8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -11,6 +11,7 @@
 use function substr;
 use function explode;
 use function implode;
+use function sprintf;
 use function preg_match;
 
 /**

From d2687560d8a866a3f94da3a1635e014a1eb5b740 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:09:37 +0200
Subject: [PATCH 1856/2811] Convert concatenation to string interpolation

---
 .../Features/Navigation/NumericalPageOrderingHelper.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index ae95912a5c8..97762144d01 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -64,7 +64,7 @@ public static function splitNumericPrefix(string $identifier): array
         $parts[0] = (int) $parts[0];
 
         if (isset($parentPath)) {
-            $parts[1] = $parentPath.'/'.$parts[1];
+            $parts[1] = "$parentPath/$parts[1]";
         }
 
         return $parts;

From 133d5079ef9fb29d74ec359ca95b985d9dcf2dde Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:10:36 +0200
Subject: [PATCH 1857/2811] Use clearer language in description

---
 .../Features/Navigation/NumericalPageOrderingHelper.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 97762144d01..e310f64b520 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -27,7 +27,7 @@ class NumericalPageOrderingHelper
     protected const DELIMITERS = ['-', '_'];
 
     /**
-     * Determines if the feature is enabled.
+     * Check if the feature is enabled.
      */
     public static function enabled(): bool
     {

From 2a2780f52c88ce6645ddd818cd461a401a19f835 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:11:36 +0200
Subject: [PATCH 1858/2811] Compress PHPDoc annotations

---
 .../Navigation/NumericalPageOrderingHelper.php  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index e310f64b520..581d11f085f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -15,28 +15,21 @@
 use function preg_match;
 
 /**
- * @internal This class contains shared helper code for the framework to provide numerical page ordering. It is not intended to be used outside the framework code internals.
+ * @internal This class contains shared helper code for the framework to provide numerical page ordering.
+ *           It is not intended to be used outside the framework code internals.
  */
 class NumericalPageOrderingHelper
 {
-    /**
-     * The delimiters that are used to separate the numerical prefix from the rest of the identifier.
-     *
-     * @var array<string>
-     */
+    /** @var array<string> The delimiters that are used to separate the numerical prefix from the rest of the identifier. */
     protected const DELIMITERS = ['-', '_'];
 
-    /**
-     * Check if the feature is enabled.
-     */
+    /** Check if the feature is enabled. */
     public static function enabled(): bool
     {
         return Config::getBool('hyde.numerical_page_ordering', true);
     }
 
-    /**
-     * Determines if a given identifier has a numerical prefix.
-     */
+    /** Determines if a given identifier has a numerical prefix. */
     public static function hasNumericalPrefix(string $identifier): bool
     {
         if (static::isIdentifierNested($identifier)) {

From d87645c712e4b938fb423ed88d1b333f230516ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:13:03 +0200
Subject: [PATCH 1859/2811] Test feature is enabled by default

---
 .../tests/Unit/NumericalPageOrderingHelperUnitTest.php     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
index b715332c15a..70c0290ac98 100644
--- a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
+++ b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
@@ -29,6 +29,13 @@ public function testEnabledReturnsFalseWhenDisabled()
         $this->assertFalse(NumericalPageOrderingHelper::enabled());
     }
 
+    public function testFeatureIsEnabledByDefault()
+    {
+        self::mockConfig(['hyde' => []]);
+
+        $this->assertTrue(NumericalPageOrderingHelper::enabled());
+    }
+
     public function testIdentifiersWithNumericalPrefixesAreDetected()
     {
         $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-home.md'));

From 9b1dcd0611a57192e3ffb1d4e210048c4b2ff705 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 6 May 2024 21:13:17 +0200
Subject: [PATCH 1860/2811] Swap test method order

---
 .../Unit/NumericalPageOrderingHelperUnitTest.php     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
index 70c0290ac98..e93302cb52c 100644
--- a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
+++ b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
@@ -22,18 +22,18 @@ public function testEnabledReturnsTrueWhenEnabled()
         $this->assertTrue(NumericalPageOrderingHelper::enabled());
     }
 
-    public function testEnabledReturnsFalseWhenDisabled()
+    public function testFeatureIsEnabledByDefault()
     {
-        self::mockConfig(['hyde.numerical_page_ordering' => false]);
+        self::mockConfig(['hyde' => []]);
 
-        $this->assertFalse(NumericalPageOrderingHelper::enabled());
+        $this->assertTrue(NumericalPageOrderingHelper::enabled());
     }
 
-    public function testFeatureIsEnabledByDefault()
+    public function testEnabledReturnsFalseWhenDisabled()
     {
-        self::mockConfig(['hyde' => []]);
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
 
-        $this->assertTrue(NumericalPageOrderingHelper::enabled());
+        $this->assertFalse(NumericalPageOrderingHelper::enabled());
     }
 
     public function testIdentifiersWithNumericalPrefixesAreDetected()

From 1494cd069b841f0e9869106b4c68e272f9ecd29b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 7 May 2024 09:22:48 +0200
Subject: [PATCH 1861/2811] Update unit test to mock the config

---
 packages/framework/tests/Unit/RouteKeyTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index ce7b50a18ce..4c0ab309f81 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -18,6 +18,8 @@
  */
 class RouteKeyTest extends UnitTestCase
 {
+    protected static bool $needsConfig = true;
+
     public function testMake()
     {
         $this->assertEquals(RouteKey::make('foo'), new RouteKey('foo'));

From 3f9b39d09f3fc4361092c5cb0f62e39738eb77ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 7 May 2024 10:37:37 +0200
Subject: [PATCH 1862/2811] Create route key unit tests for numerical prefix
 extraction

Based on the navigation data factory unit tests, but to test the ancillary extraction
---
 .../framework/tests/Unit/RouteKeyTest.php     | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index 4c0ab309f81..d906bd1ebfa 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -95,6 +95,56 @@ public function testFromPageWithCustomNestedOutputDirectory()
         $this->assertEquals(new RouteKey('foo/bar/baz'), RouteKey::fromPage(MarkdownPage::class, 'baz'));
     }
 
+    public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefix()
+    {
+        $this->assertSame('test', RouteKey::fromPage(InMemoryPage::class, '01-test')->get());
+    }
+
+    public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixWithKebabCaseSyntax()
+    {
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '01-foo')->get());
+        $this->assertSame('bar', RouteKey::fromPage(InMemoryPage::class, '02-bar')->get());
+        $this->assertSame('baz', RouteKey::fromPage(InMemoryPage::class, '03-baz')->get());
+    }
+
+    public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixWithSnakeCaseSyntax()
+    {
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '01_foo')->get());
+        $this->assertSame('bar', RouteKey::fromPage(InMemoryPage::class, '02_bar')->get());
+        $this->assertSame('baz', RouteKey::fromPage(InMemoryPage::class, '03_baz')->get());
+    }
+
+    public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixRegardlessOfLeadingZeroes()
+    {
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '0123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '00123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '000123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '0000123-foo')->get());
+    }
+
+    public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixForNestedIdentifiers()
+    {
+        $this->assertSame('foo/bar', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar')->get());
+        $this->assertSame('foo/bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/bar/02-baz')->get());
+        $this->assertSame('foo/01-bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar/03-baz')->get());
+    }
+
+    public function testItDoesNotExtractCoreIdentifierPartFromNumericalFilenamePrefixWhenFeatureIsDisabled()
+    {
+        self::mockConfig(['hyde.numerical_page_ordering' => false]);
+
+        $this->assertSame('01-test', RouteKey::fromPage(InMemoryPage::class, '01-test')->get());
+        $this->assertSame('01-home', RouteKey::fromPage(InMemoryPage::class, '01-home')->get());
+        $this->assertSame('01-404', RouteKey::fromPage(InMemoryPage::class, '01-404')->get());
+    }
+
+    public function testItDoesNotExtractNonNumericalFilenamePrefixes()
+    {
+        $this->assertSame('foo-bar', RouteKey::fromPage(InMemoryPage::class, 'foo-bar')->get());
+        $this->assertSame('abc-bar', RouteKey::fromPage(InMemoryPage::class, 'abc-bar')->get());
+    }
+
     public static function tearDownAfterClass(): void
     {
         MarkdownPage::setOutputDirectory('');

From df063897953e3bfb4f5b94f422dd6fbeb498988d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 7 May 2024 10:42:28 +0200
Subject: [PATCH 1863/2811] Replace assignment with early return

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

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 24766e73a11..75cf142e082 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -57,7 +57,7 @@ public static function fromPage(string $pageClass, string $identifier): self
     protected static function splitNumberedIdentifiersIfNeeded(string $identifier): string
     {
         if (NumericalPageOrderingHelper::enabled() && NumericalPageOrderingHelper::hasNumericalPrefix($identifier)) {
-            $identifier = NumericalPageOrderingHelper::splitNumericPrefix($identifier)[1];
+            return NumericalPageOrderingHelper::splitNumericPrefix($identifier)[1];
         }
 
         return $identifier;

From 429931dba8e39a1d540a111d8a104a0ce487957f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 8 May 2024 19:13:15 +0200
Subject: [PATCH 1864/2811] Remove resolved todos

---
 .../tests/Feature/NumericalPageOrderingHelperTest.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index e2a8f09c15e..46d4dbe675e 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -25,8 +25,8 @@
  * @covers \Hyde\Framework\Features\Navigation\NumericalPageOrderingHelper
  * @covers \Hyde\Framework\Features\Navigation\MainNavigationMenu
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Factories\NavigationDataFactory // Todo: Update the unit test for this class.
- * @covers \Hyde\Support\Models\RouteKey // Todo: Update the unit test for this class.
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Support\Models\RouteKey
  *
  * @see \Hyde\Framework\Testing\Unit\NumericalPageOrderingHelperUnitTest
  *

From 4ec0d8cb76dab6e199e98078ac8255c94ce3db17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 8 May 2024 19:47:41 +0200
Subject: [PATCH 1865/2811] Add test to ensure explicitly set priority
 overrides filename prefix

---
 .../tests/Feature/NumericalPageOrderingHelperTest.php     | 2 --
 .../tests/Unit/NavigationDataFactoryUnitTest.php          | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index 46d4dbe675e..fd63b499c13 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -29,8 +29,6 @@
  * @covers \Hyde\Support\Models\RouteKey
  *
  * @see \Hyde\Framework\Testing\Unit\NumericalPageOrderingHelperUnitTest
- *
- * Todo: Add test to ensure explicitly set priority overrides filename prefix.
  */
 class NumericalPageOrderingHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index 08824908383..eccd5604465 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -320,6 +320,14 @@ public function testItDoesNotExtractNonNumericalFilenamePrefixes()
         $this->assertSame(999, (new NavigationConfigTestClass($this->makeCoreDataObject('abc-bar.md')))->makePriority());
     }
 
+    public function testFrontMatterValueOverridesFilenamePrefixPriority()
+    {
+        $coreDataObject = new CoreDataObject(new FrontMatter(['navigation.priority' => 10]), new Markdown(), markdownPage::class, '05-test', '', '', '');
+        $factory = new NavigationConfigTestClass($coreDataObject);
+
+        $this->assertSame(10, $factory->makePriority());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);

From d3c0e751f0292146ffd2297b64d52d42698713da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 9 May 2024 14:28:48 +0200
Subject: [PATCH 1866/2811] Draft test sidebar group priorities can be set with
 numerical prefix

---
 .../tests/Feature/NumericalPageOrderingHelperTest.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index fd63b499c13..e0f6a4416e3 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -249,6 +249,15 @@ public function testOrderingWithDifferentFileExtensions()
         $this->assertOrder(['foo', 'bar', 'baz']);
     }
 
+    public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
+    {
+        $this->directory('_docs/03-getting-started');
+        $this->file('_docs/03-getting-started/05-advanced.md');
+
+        $page = DocumentationPage::parse('getting-started/advanced');
+        $this->assertInstanceOf(DocumentationPage::class, $page);
+    }
+
     protected function setUpSidebarFixture(array $files): self
     {
         return $this->setupFixture($files, sidebar: true);

From 2a6ebb8e8f9fceb1eef4eaa357114dc8b298a80f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 9 May 2024 16:38:04 +0200
Subject: [PATCH 1867/2811] Fix identifier syntax still have the prefixes in
 test

---
 .../framework/tests/Feature/NumericalPageOrderingHelperTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index e0f6a4416e3..a5f481320e3 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -254,7 +254,7 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
         $this->directory('_docs/03-getting-started');
         $this->file('_docs/03-getting-started/05-advanced.md');
 
-        $page = DocumentationPage::parse('getting-started/advanced');
+        $page = DocumentationPage::parse('03-getting-started/05-advanced');
         $this->assertInstanceOf(DocumentationPage::class, $page);
     }
 

From d10c541ea509fe689ae993a33d7d1684bbf9cb7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 9 May 2024 16:39:30 +0200
Subject: [PATCH 1868/2811] Add initial assertions

---
 .../tests/Feature/NumericalPageOrderingHelperTest.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index a5f481320e3..cc4661663f5 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -256,6 +256,9 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
 
         $page = DocumentationPage::parse('03-getting-started/05-advanced');
         $this->assertInstanceOf(DocumentationPage::class, $page);
+
+        $this->assertSame('docs/advanced', $page->getRouteKey());
+        $this->assertSame('docs/advanced.html', $page->getOutputPath());
     }
 
     protected function setUpSidebarFixture(array $files): self

From 29455922bfbb78c663fde76e896f8a760dd297cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 9 May 2024 16:42:53 +0200
Subject: [PATCH 1869/2811] Test without flattened output paths

---
 .../Feature/NumericalPageOrderingHelperTest.php   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index cc4661663f5..a40e28f0e0d 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -261,6 +261,21 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
         $this->assertSame('docs/advanced.html', $page->getOutputPath());
     }
 
+
+    public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefixWithoutFlattenedOutputPaths()
+    {
+        config(['docs.flattened_output_paths' => false]);
+
+        $this->directory('_docs/03-getting-started');
+        $this->file('_docs/03-getting-started/05-advanced.md');
+
+        $page = DocumentationPage::parse('03-getting-started/05-advanced');
+        $this->assertInstanceOf(DocumentationPage::class, $page);
+
+        $this->assertSame('docs/getting-started/advanced', $page->getRouteKey());
+        $this->assertSame('docs/getting-started/advanced.html', $page->getOutputPath());
+    }
+
     protected function setUpSidebarFixture(array $files): self
     {
         return $this->setupFixture($files, sidebar: true);

From eb68285ade64e4c5a6026128d8419c64556f83ee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 9 May 2024 17:16:46 +0200
Subject: [PATCH 1870/2811] Assert the subdirectory group is trimmed from
 numerical prefix

---
 .../framework/tests/Feature/NumericalPageOrderingHelperTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index a40e28f0e0d..0341a60b011 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -259,6 +259,7 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
 
         $this->assertSame('docs/advanced', $page->getRouteKey());
         $this->assertSame('docs/advanced.html', $page->getOutputPath());
+        $this->assertSame('getting-started', $page->navigationMenuGroup());
     }
 
 
@@ -274,6 +275,7 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefixWithoutFlat
 
         $this->assertSame('docs/getting-started/advanced', $page->getRouteKey());
         $this->assertSame('docs/getting-started/advanced.html', $page->getOutputPath());
+        $this->assertSame('getting-started', $page->navigationMenuGroup());
     }
 
     protected function setUpSidebarFixture(array $files): self

From 798eedaaf3041cc107790748ae702e3d96db3f26 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 10 May 2024 14:18:27 +0200
Subject: [PATCH 1871/2811] Split numerical prefix when making group identifier

---
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index e747f27c53e..b7b331e6db6 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -80,7 +80,9 @@ protected function makeLabel(): ?string
     protected function makeGroup(): ?string
     {
         if ($this->pageIsInSubdirectory() && $this->canUseSubdirectoryForGroups()) {
-            return $this->getSubdirectoryName();
+            return NumericalPageOrderingHelper::hasNumericalPrefix($this->getSubdirectoryName())
+                ? NumericalPageOrderingHelper::splitNumericPrefix($this->getSubdirectoryName())[1]
+                : $this->getSubdirectoryName();
         }
 
         return $this->searchForGroupInFrontMatter();

From 1cf11714bb73933c84dce3b2eb3224240ba00e2c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 10 May 2024 14:18:40 +0200
Subject: [PATCH 1872/2811] Split each part of nested path

---
 .../Features/Navigation/NumericalPageOrderingHelper.php    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
index 581d11f085f..658c779b74f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
+++ b/packages/framework/src/Framework/Features/Navigation/NumericalPageOrderingHelper.php
@@ -12,6 +12,7 @@
 use function explode;
 use function implode;
 use function sprintf;
+use function array_map;
 use function preg_match;
 
 /**
@@ -57,6 +58,12 @@ public static function splitNumericPrefix(string $identifier): array
         $parts[0] = (int) $parts[0];
 
         if (isset($parentPath)) {
+            $parentPaths = explode('/', $parentPath);
+            $parentPaths = array_map(function (string $part): string {
+                return static::hasNumericalPrefix($part) ? static::splitNumericPrefix($part)[1] : $part;
+            }, $parentPaths);
+            $parentPath = implode('/', $parentPaths);
+
             $parts[1] = "$parentPath/$parts[1]";
         }
 

From 562a64313af18d0d1af8656085dc7d7c351c927d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 10 May 2024 14:18:53 +0200
Subject: [PATCH 1873/2811] Test nested numerical prefix handling

---
 .../NumericalPageOrderingHelperUnitTest.php    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
index e93302cb52c..08c4416bd0d 100644
--- a/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
+++ b/packages/framework/tests/Unit/NumericalPageOrderingHelperUnitTest.php
@@ -203,6 +203,13 @@ public function testSplitNumericPrefixForDeeplyNestedPagesWithSnakeCaseDelimiter
         $this->assertSame([3, 'foo/bar/contact.md'], NumericalPageOrderingHelper::splitNumericPrefix('foo/bar/03_contact.md'));
     }
 
+    public function testNumericalPrefixesInSubdirectoriesAreTrimmed()
+    {
+        $this->assertSame([1, 'foo.md'], NumericalPageOrderingHelper::splitNumericPrefix('01-foo.md'));
+        $this->assertSame([2, 'nested/foo.md'], NumericalPageOrderingHelper::splitNumericPrefix('01-nested/02-foo.md'));
+        $this->assertSame([3, 'deeply/nested/foo.md'], NumericalPageOrderingHelper::splitNumericPrefix('01-deeply/02-nested/03-foo.md'));
+    }
+
     public function testNonNumericalPartsAreNotDetected()
     {
         $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo-bar.md'));
@@ -258,6 +265,17 @@ public function testNumericallyStringPrefixedIdentifiersWithoutDelimiterAreNotDe
         $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('one.foo.md'));
     }
 
+    public function testHasNumericalPrefixOnlyReturnsTrueIfLastIdentifierPartIsNumerical()
+    {
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01-nested/foo.md'));
+        $this->assertFalse(NumericalPageOrderingHelper::hasNumericalPrefix('01-deeply/02-nested/foo.md'));
+
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-foo.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-nested/02-foo.md'));
+        $this->assertTrue(NumericalPageOrderingHelper::hasNumericalPrefix('01-deeply/02-nested/03-foo.md'));
+    }
+
     public static function pageTypeProvider(): array
     {
         self::needsKernel();

From ba0ead99b3b9e51a4ff6ce36ff571cd6afc0ba2e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 10 May 2024 12:19:07 +0000
Subject: [PATCH 1874/2811] Apply fixes from StyleCI

---
 .../framework/tests/Feature/NumericalPageOrderingHelperTest.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index 0341a60b011..b5b54025ac0 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -262,7 +262,6 @@ public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefix()
         $this->assertSame('getting-started', $page->navigationMenuGroup());
     }
 
-
     public function testSidebarGroupPrioritiesCanBeSetWithNumericalPrefixWithoutFlattenedOutputPaths()
     {
         config(['docs.flattened_output_paths' => false]);

From 0bcb133786efff896138ea203188c17caedbabc3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 10 May 2024 14:20:32 +0200
Subject: [PATCH 1875/2811] Update test to expect trimmed numerical group part

See https://github.com/hydephp/develop/pull/1710#discussion_r1592040949
---
 packages/framework/tests/Unit/RouteKeyTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index d906bd1ebfa..cc30305afd5 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -127,7 +127,7 @@ public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixForNe
     {
         $this->assertSame('foo/bar', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar')->get());
         $this->assertSame('foo/bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/bar/02-baz')->get());
-        $this->assertSame('foo/01-bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar/03-baz')->get());
+        $this->assertSame('foo/bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar/03-baz')->get());
     }
 
     public function testItDoesNotExtractCoreIdentifierPartFromNumericalFilenamePrefixWhenFeatureIsDisabled()

From a2f4219e4cfdc1bc7c457257f327bc102e7175b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 16:31:53 +0200
Subject: [PATCH 1876/2811] Add additional fixture for test

---
 packages/framework/tests/Feature/DataCollectionTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index df35e788f3f..9f5479f4dee 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -34,11 +34,13 @@ public function testYamlCollections()
     {
         $this->directory('resources/collections/foo');
         $this->markdown('resources/collections/foo/foo.yaml', matter: ['title' => 'Foo']);
-        $this->file('resources/collections/foo/bar.yml');
+        $this->file('resources/collections/foo/bar.yml', "---\ntitle: Bar\n---");
+        $this->file('resources/collections/foo/baz.yml');
 
         $this->assertEquals(new DataCollections([
             'foo/foo.yaml' => new FrontMatter(['title' => 'Foo']),
-            'foo/bar.yml' => new FrontMatter([]),
+            'foo/bar.yml' => new FrontMatter(['title' => 'Bar']),
+            'foo/baz.yml' => new FrontMatter([]),
         ]), DataCollections::yaml('foo'));
     }
 

From 71e2212aed530c421680da93f40b05ba344a68a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 16:48:34 +0200
Subject: [PATCH 1877/2811] Test YAML collections without triple dashes

---
 .../framework/tests/Feature/DataCollectionTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 9f5479f4dee..bea53f0ef6d 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -44,6 +44,16 @@ public function testYamlCollections()
         ]), DataCollections::yaml('foo'));
     }
 
+    public function testYamlCollectionsWithoutTripleDashes()
+    {
+        $this->directory('resources/collections/foo');
+        $this->file('resources/collections/foo/foo.yml', 'title: Foo');
+
+        $this->assertEquals(new DataCollections([
+            'foo/foo.yml' => new FrontMatter(['title' => 'Foo']),
+        ]), DataCollections::yaml('foo'));
+    }
+
     public function testJsonCollections()
     {
         $this->directory('resources/collections/foo');

From ff896418527acb5b8695fb3abc17f766873bb8ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 17:25:04 +0200
Subject: [PATCH 1878/2811] Support parsing Yaml data files with both dashes
 and without

---
 .../framework/src/Support/DataCollections.php     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/DataCollections.php b/packages/framework/src/Support/DataCollections.php
index b5ab786edef..f683801a5ec 100644
--- a/packages/framework/src/Support/DataCollections.php
+++ b/packages/framework/src/Support/DataCollections.php
@@ -5,6 +5,9 @@
 namespace Hyde\Support;
 
 use Hyde\Facades\Filesystem;
+use Symfony\Component\Yaml\Yaml;
+use Hyde\Markdown\Models\FrontMatter;
+use Spatie\YamlFrontMatter\YamlFrontMatter;
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Illuminate\Support\Collection;
@@ -68,7 +71,17 @@ public static function yaml(string $name): static
         static::needsDirectory(static::$sourceDirectory);
 
         return new static(static::findFiles($name, ['yaml', 'yml'])->mapWithKeys(function (string $file): array {
-            return [static::makeIdentifier($file) => MarkdownFileParser::parse($file)->matter()];
+            $content = Filesystem::get($file);
+
+            if (str_starts_with($content, '---')) {
+                $document = YamlFrontMatter::markdownCompatibleParse($content);
+                $matter = new FrontMatter($document->matter());
+            } else {
+                $parsed = Yaml::parse($content) ?: [];
+                $matter = new FrontMatter($parsed);
+            }
+
+            return [static::makeIdentifier($file) => $matter];
         }));
     }
 

From 30b6365da3cf921a875856e751e0d87520d21611 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 17:33:49 +0200
Subject: [PATCH 1879/2811] Yaml data files no longer need to start with triple
 dashes

---
 docs/digging-deeper/collections.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index f0ebb7b79fb..f0224e85f23 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -129,14 +129,10 @@ Here is an approximation of the data types contained by the variable created abo
 Assuming the Yaml document looks like this:
 
 ```yaml
----
 name: "John Doe"
 email: "john@example.org"
 ```
 
->warning Note that the Yaml file should start with `---` to be parsed correctly.
-
-
 ## Json Collections
 
 ### Usage

From 5b2af72411c40b926a831bc49f19147fef9bcf3f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 17:37:17 +0200
Subject: [PATCH 1880/2811] Simplify Yaml data file parsing

---
 packages/framework/src/Support/DataCollections.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/DataCollections.php b/packages/framework/src/Support/DataCollections.php
index f683801a5ec..ceba103e305 100644
--- a/packages/framework/src/Support/DataCollections.php
+++ b/packages/framework/src/Support/DataCollections.php
@@ -7,7 +7,6 @@
 use Hyde\Facades\Filesystem;
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Markdown\Models\FrontMatter;
-use Spatie\YamlFrontMatter\YamlFrontMatter;
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Illuminate\Support\Collection;
@@ -74,13 +73,12 @@ public static function yaml(string $name): static
             $content = Filesystem::get($file);
 
             if (str_starts_with($content, '---')) {
-                $document = YamlFrontMatter::markdownCompatibleParse($content);
-                $matter = new FrontMatter($document->matter());
-            } else {
-                $parsed = Yaml::parse($content) ?: [];
-                $matter = new FrontMatter($parsed);
+                $content = Str::between($content, '---', '---');
             }
 
+            $parsed = Yaml::parse($content) ?: [];
+            $matter = new FrontMatter($parsed);
+
             return [static::makeIdentifier($file) => $matter];
         }));
     }

From e4e68086d619f9d541d562dca37a22ef1c8b1b00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 18:53:25 +0200
Subject: [PATCH 1881/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a099118b402..1671f6fceb9 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -173,6 +173,7 @@ Due to the scope of the rewrite, the easiest and fastest way to upgrade your cod
 
 - For a full comparison of the changes, you may see the PR that introduced the new API: https://github.com/hydephp/develop/pull/1568/files
 - For information on how to use the new Navigation API, see the documentation: https://hydephp.com/docs/2.x/navigation-api
+- If you use DataCollections, you should read the upgrade path below as there are breaking changes to the DataCollection API.
 
 ### HTML ID changes
 
@@ -216,3 +217,9 @@ For example, if you triggered the media transfer with a build service method cal
 
 (new TransferMediaAssets())->run();
 ```
+
+### DataCollection API changes
+
+The DataCollections feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
+
+Unfortunately, this means that existing setups may need to be adjusted to work with the new API.

From 5d655cb4a60d96c501a88d6d40f1d0715c0c8ef4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 18:53:34 +0200
Subject: [PATCH 1882/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1671f6fceb9..a23fc612755 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -223,3 +223,7 @@ For example, if you triggered the media transfer with a build service method cal
 The DataCollections feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
 
 Unfortunately, this means that existing setups may need to be adjusted to work with the new API.
+
+#### Issues that may arise
+
+If you get a Yaml `ParseException` stating that "Multiple documents are not supported in", you must remove the `---` separator YAML documents in your data files.

From daa7a3a5cd4a481de098eb556ebdd39a6bc7dce7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 18:53:37 +0200
Subject: [PATCH 1883/2811] Revert "Update RELEASE_NOTES.md"

This reverts commit 5d655cb4a60d96c501a88d6d40f1d0715c0c8ef4.
---
 RELEASE_NOTES.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a23fc612755..1671f6fceb9 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -223,7 +223,3 @@ For example, if you triggered the media transfer with a build service method cal
 The DataCollections feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
 
 Unfortunately, this means that existing setups may need to be adjusted to work with the new API.
-
-#### Issues that may arise
-
-If you get a Yaml `ParseException` stating that "Multiple documents are not supported in", you must remove the `---` separator YAML documents in your data files.

From 6ebc9c9626128940cb581c65aa112693a0e13c9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 20:54:02 +0200
Subject: [PATCH 1884/2811] Unwrap unnecessary condition

---
 packages/framework/src/Support/DataCollections.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/DataCollections.php b/packages/framework/src/Support/DataCollections.php
index ceba103e305..79e53dc32d5 100644
--- a/packages/framework/src/Support/DataCollections.php
+++ b/packages/framework/src/Support/DataCollections.php
@@ -71,10 +71,7 @@ public static function yaml(string $name): static
 
         return new static(static::findFiles($name, ['yaml', 'yml'])->mapWithKeys(function (string $file): array {
             $content = Filesystem::get($file);
-
-            if (str_starts_with($content, '---')) {
-                $content = Str::between($content, '---', '---');
-            }
+            $content = Str::between($content, '---', '---');
 
             $parsed = Yaml::parse($content) ?: [];
             $matter = new FrontMatter($parsed);

From d87afdec66d8e7af499c412e40fd774e4702e5d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 21:21:28 +0200
Subject: [PATCH 1885/2811] Remove merge conflicted line

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a099118b402..50d15004f03 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -36,7 +36,7 @@ This serves two purposes:
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed
-- Realtime Compiler: Fixed responsive dashboard table issue in https://github.com/hydephp/develop/pull/1595
+- for any bug fixes.
 
 ### Security
 - in case of vulnerabilities.

From 22c4b667a36c6312d89cacd72147ee7c4ea702cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 21:22:00 +0200
Subject: [PATCH 1886/2811] No longer automatically create the data collections
 directory

Fixes https://github.com/hydephp/develop/issues/1735
---
 RELEASE_NOTES.md                              |  4 ++-
 docs/digging-deeper/collections.md            |  1 -
 .../framework/src/Support/DataCollections.php |  9 ------
 .../tests/Feature/DataCollectionTest.php      | 28 -------------------
 4 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7bea4c45323..e4c43f306b0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -25,7 +25,7 @@ This serves two purposes:
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
-
+- Calling the `DataCollections` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -223,3 +223,5 @@ For example, if you triggered the media transfer with a build service method cal
 The DataCollections feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
 
 Unfortunately, this means that existing setups may need to be adjusted to work with the new API.
+
+- Calling the `DataCollections` methods will no longer create the data collections directory automatically
diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index 89745bd0c57..b83bef6647f 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -32,7 +32,6 @@ Follow these conventions and creating dynamic static sites will be a breeze.
 6. While not enforced, each subdirectory should probably only have the same filetype to prevent developer confusion.
 7. Unlike source files for pages, files starting with underscores are not ignored.
 8. You can customize the source directory for collections through a service provider.
-9. If the base source directory does not exist, it will be created for you.
 
 
 ## Available Collection Types
diff --git a/packages/framework/src/Support/DataCollections.php b/packages/framework/src/Support/DataCollections.php
index 79e53dc32d5..00d54371089 100644
--- a/packages/framework/src/Support/DataCollections.php
+++ b/packages/framework/src/Support/DataCollections.php
@@ -8,7 +8,6 @@
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
@@ -35,8 +34,6 @@
  */
 class DataCollections extends Collection
 {
-    use InteractsWithDirectories;
-
     /**
      * The base directory for all data collections. Can be modified using a service provider.
      */
@@ -51,8 +48,6 @@ class DataCollections extends Collection
      */
     public static function markdown(string $name): static
     {
-        static::needsDirectory(static::$sourceDirectory);
-
         return new static(static::findFiles($name, 'md')->mapWithKeys(function (string $file): array {
             return [static::makeIdentifier($file) => MarkdownFileParser::parse($file)];
         }));
@@ -67,8 +62,6 @@ public static function markdown(string $name): static
      */
     public static function yaml(string $name): static
     {
-        static::needsDirectory(static::$sourceDirectory);
-
         return new static(static::findFiles($name, ['yaml', 'yml'])->mapWithKeys(function (string $file): array {
             $content = Filesystem::get($file);
             $content = Str::between($content, '---', '---');
@@ -89,8 +82,6 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        static::needsDirectory(static::$sourceDirectory);
-
         return new static(static::findFiles($name, 'json')->mapWithKeys(function (string $file) use ($asArray): array {
             return [static::makeIdentifier($file) => json_decode(Filesystem::get($file), $asArray)];
         }));
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index bea53f0ef6d..f144e9fd367 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -4,12 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Support\DataCollections;
 use Hyde\Testing\TestCase;
-use Illuminate\Support\Facades\File;
 
 /**
  * @covers \Hyde\Support\DataCollections
@@ -170,30 +168,4 @@ public function testSourceDirectoryCanBeChanged()
 
         DataCollections::$sourceDirectory = 'resources/collections';
     }
-
-    public function testSourceDirectoryIsAutomaticallyAddedIfMissing()
-    {
-        $this->directory('resources/collections');
-        File::deleteDirectory(Hyde::path('resources/collections'));
-        $this->assertDirectoryDoesNotExist(Hyde::path('resources/collections'));
-
-        DataCollections::markdown('foo');
-
-        $this->assertDirectoryExists(Hyde::path('resources/collections'));
-    }
-
-    public function testCustomSourceDirectoryIsAutomaticallyAddedIfMissing()
-    {
-        $this->directory('foo');
-        File::deleteDirectory(Hyde::path('foo'));
-
-        $this->assertDirectoryDoesNotExist(Hyde::path('foo'));
-
-        DataCollections::$sourceDirectory = 'foo';
-        DataCollections::markdown('bar');
-
-        $this->assertDirectoryExists(Hyde::path('foo'));
-
-        DataCollections::$sourceDirectory = 'resources/collections';
-    }
 }

From 4245ba5f08eae765225a634d5362bfe08559884d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 23 Jun 2024 21:54:11 +0200
Subject: [PATCH 1887/2811] Breaking: Rename class `DataCollections` to
 `DataCollection`

See https://github.com/hydephp/develop/issues/1712
---
 RELEASE_NOTES.md                              | 13 +++--
 _ide_helper.php                               |  2 +-
 app/config.php                                |  2 +-
 docs/digging-deeper/collections.md            | 32 ++++++------
 docs/digging-deeper/helpers.md                | 10 ++--
 ...DataCollections.php => DataCollection.php} |  8 +--
 .../tests/Feature/DataCollectionTest.php      | 50 +++++++++----------
 .../tests/Unit/DataCollectionUnitTest.php     | 22 ++++----
 8 files changed, 73 insertions(+), 66 deletions(-)
 rename packages/framework/src/Support/{DataCollections.php => DataCollection.php} (93%)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e4c43f306b0..53fc95b9911 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,6 +17,7 @@ This serves two purposes:
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
 - **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
+- **Breaking:** Renamed class `DataCollections` to `DataCollection`. For more information, see below.
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
@@ -25,7 +26,7 @@ This serves two purposes:
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
-- Calling the `DataCollections` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
+- Calling the `DataCollection` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
 
 ### Deprecated
 - for soon-to-be removed features.
@@ -220,8 +221,14 @@ For example, if you triggered the media transfer with a build service method cal
 
 ### DataCollection API changes
 
-The DataCollections feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
+The DataCollection feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
 
 Unfortunately, this means that existing setups may need to be adjusted to work with the new API.
 
-- Calling the `DataCollections` methods will no longer create the data collections directory automatically
+#### Upgrade guide
+
+- The `DataCollections` class has been renamed to `DataCollection`. If you have used the `DataCollections` class in your code, you will need to update your code to use the new class name.
+
+#### Minor impact
+
+- Calling the `DataCollection` methods will no longer create the data collections directory automatically
diff --git a/_ide_helper.php b/_ide_helper.php
index 8cc231f850f..228893b3169 100644
--- a/_ide_helper.php
+++ b/_ide_helper.php
@@ -40,7 +40,7 @@ class Features extends \Hyde\Facades\Features {}
 class Config extends \Hyde\Facades\Config {}
 /** @mixin \Illuminate\Filesystem\Filesystem */
 class Filesystem extends \Hyde\Facades\Filesystem {}
-class DataCollections extends \Hyde\Support\DataCollections {}
+class DataCollection extends \Hyde\Support\DataCollection {}
 class Includes extends \Hyde\Support\Includes {}
 /** @mixin \Hyde\Foundation\Kernel\RouteCollection */
 class Routes extends \Hyde\Foundation\Facades\Routes {}
diff --git a/app/config.php b/app/config.php
index 22206637aff..ab5db6907b0 100644
--- a/app/config.php
+++ b/app/config.php
@@ -103,7 +103,7 @@
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
         'DocumentationPage' => \Hyde\Pages\DocumentationPage::class,
-        'DataCollections' => \Hyde\Support\DataCollections::class,
+        'DataCollection' => \Hyde\Support\DataCollection::class,
         'Includes' => \Hyde\Support\Includes::class,
         'Feature' => \Hyde\Enums\Feature::class,
     ],
diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index b83bef6647f..b3040ecb900 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -8,7 +8,7 @@ navigation:
 
 ## Introduction to Hyde Data Collections
 
-Hyde provides `DataCollections`, a subset of [Laravel Collections](https://laravel.com/docs/10.x/collections) giving you a similar developer experience to working with Eloquent Collections.
+Hyde provides `DataCollection`, a subset of [Laravel Collections](https://laravel.com/docs/10.x/collections) giving you a similar developer experience to working with Eloquent Collections.
 However, instead of accessing a database, it's all entirely file-based using static data files such as Markdown, Yaml, and JSON files which get
 parsed into objects that you can easily work with.
 
@@ -24,7 +24,7 @@ In short, HydePHP finds files in the specified directory, turns each file into a
 To make collections easy to use and understand, Hyde makes a few assumptions about the structure of your collections.
 Follow these conventions and creating dynamic static sites will be a breeze.
 
-1. Collections are accessed through static methods in the `DataCollections` class.
+1. Collections are accessed through static methods in the `DataCollection` class.
 2. Collections are stored as files in subdirectories of the `resources/collections` directory.
 3. To get a collection, specify name of the subdirectory the files are stored in.
 4. Data will be parsed into differing objects depending on which facade method you use. See the table below.
@@ -41,9 +41,9 @@ Follow these conventions and creating dynamic static sites will be a breeze.
 The following facade methods for creating data collections are available:
 
 ```php
-\Hyde\Support\DataCollections::markdown(string $name);
-\Hyde\Support\DataCollections::yaml(string $name);
-\Hyde\Support\DataCollections::json(string $name, bool $asArray = false);
+\Hyde\Support\DataCollection::markdown(string $name);
+\Hyde\Support\DataCollection::yaml(string $name);
+\Hyde\Support\DataCollection::json(string $name, bool $asArray = false);
 ```
 
 ### Quick Reference Table
@@ -60,7 +60,7 @@ The following facade methods for creating data collections are available:
 ### Usage
 
 ```php
-$collection = \Hyde\Support\DataCollections::markdown('name');
+$collection = \Hyde\Support\DataCollection::markdown('name');
 ```
 
 ### Example returns
@@ -68,7 +68,7 @@ $collection = \Hyde\Support\DataCollections::markdown('name');
 Here is an approximation of the data types contained by the variable created above:
 
 ```php
-\Hyde\Support\DataCollections {
+\Hyde\Support\DataCollection {
     "testimonials/1.md" => Hyde\Markdown\Models\MarkdownDocument
     "testimonials/2.md" => Hyde\Markdown\Models\MarkdownDocument
     "testimonials/3.md" => Hyde\Markdown\Models\MarkdownDocument
@@ -107,7 +107,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit...
 ### Usage
 
 ```php
-$collection = \Hyde\Support\DataCollections::yaml('name');
+$collection = \Hyde\Support\DataCollection::yaml('name');
 ```
 
 ### Example returns
@@ -115,7 +115,7 @@ $collection = \Hyde\Support\DataCollections::yaml('name');
 Here is an approximation of the data types contained by the variable created above:
 
 ```php
-\Hyde\Support\DataCollections {
+\Hyde\Support\DataCollection {
   "authors/1.yaml" => Hyde\Markdown\Models\FrontMatter {
     +data: array:1 [
       "name" => "John Doe",
@@ -137,13 +137,13 @@ email: "john@example.org"
 ### Usage
 
 ```php
-$collection = \Hyde\Support\DataCollections::json('name');
+$collection = \Hyde\Support\DataCollection::json('name');
 ```
 
 By default, the entries will be returned as `stdClass` objects. If you want to return an associative array instead, pass `true` as the second parameter:
 
 ```php
-$collection = \Hyde\Support\DataCollections::json('name', true);
+$collection = \Hyde\Support\DataCollection::json('name', true);
 ```
 
 Since both return values use native PHP types, there are no example returns added here, as I'm sure you can imagine what they look like.
@@ -186,18 +186,18 @@ resources/collections
 
 #### Using the Facade to Access the Collections
 
-Now for the fun part! We will use the `DataCollections::markdown()` to access all our files into a convenient object.
+Now for the fun part! We will use the `DataCollection::markdown()` to access all our files into a convenient object.
 The class is registered with an alias, so you don't need to include any namespaces when in a Blade file.
 
 The general syntax to use the facade is as follows:
 
 ```blade
-DataCollections::markdown('subdirectory_name')
+DataCollection::markdown('subdirectory_name')
 ```
 
-This will return a Hyde DataCollections object, containing our Markdown files as MarkdownDocument objects. Here is a quick look at the object the facade returns:
+This will return a Hyde DataCollection object, containing our Markdown files as MarkdownDocument objects. Here is a quick look at the object the facade returns:
 
-<pre style="display: block; white-space: pre-wrap; padding: 1rem 1.5rem; overflow: initial !important; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 400 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><span class="sf-dump-default" style="display: inline; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; white-space: pre-wrap; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; white-space: pre-wrap; position: relative; z-index: 99999; word-break: break-all;"> </span><span style="display: inline; color: rgb(18, 153, 218);">Hyde\Support\DataCollections</span> {<span style="text-decoration: none; border: 0px; outline: none; color: rgb(160, 160, 160);">#651 <span style="display: inline;">▼</span></span><samp>
+<pre style="display: block; white-space: pre-wrap; padding: 1rem 1.5rem; overflow: initial !important; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 400 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;"><span class="sf-dump-default" style="display: inline; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; white-space: pre-wrap; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; background-color: rgb(24, 23, 27); color: rgb(255, 132, 0); font: 12px Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; white-space: pre-wrap; position: relative; z-index: 99999; word-break: break-all;"> </span><span style="display: inline; color: rgb(18, 153, 218);">Hyde\Support\DataCollection</span> {<span style="text-decoration: none; border: 0px; outline: none; color: rgb(160, 160, 160);">#651 <span style="display: inline;">▼</span></span><samp>
   #<span style="display: inline; color: rgb(255, 255, 255);">items</span>: <span style="display: inline; color: rgb(18, 153, 218);">array:3</span> [<span style="text-decoration: none; border: 0px; outline: none; color: rgb(160, 160, 160);"><span style="display: inline;">▼</span></span><samp>
     "<span style="display: inline; color: rgb(86, 219, 58);">testimonials/1.md</span>" =&gt; <span style="display: inline; color: rgb(18, 153, 218);"><span>Hyde\Markdown\Models</span><span style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top; color: rgb(18, 153, 218);">\</span>MarkdownDocument</span> {<span style="text-decoration: none; border: 0px; outline: none; color: rgb(160, 160, 160);">#653 <span style="display: inline;">▼</span></span><samp>
       +<span style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span style="display: inline; color: rgb(18, 153, 218);"><span>Hyde\Markdown\Models</span><span style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top; color: rgb(18, 153, 218);">\</span>FrontMatter</span> {<span style="text-decoration: none; border: 0px; outline: none; color: rgb(160, 160, 160);">#652 <span style="display: inline;">▶</span></span>}
@@ -222,7 +222,7 @@ we are able to get the author from the front matter, and the content from the bo
 
 ```blade
 // filepath _pages/testimonials.blade.php
-@foreach(DataCollections::markdown('testimonials') as $testimonial)
+@foreach(DataCollection::markdown('testimonials') as $testimonial)
     <blockquote>
         <p>{{ $testimonial->body }}</p>
         <small>{{ $testimonial->matter['author'] }}</small>
diff --git a/docs/digging-deeper/helpers.md b/docs/digging-deeper/helpers.md
index 62a89033a16..6414fba758a 100644
--- a/docs/digging-deeper/helpers.md
+++ b/docs/digging-deeper/helpers.md
@@ -14,20 +14,20 @@ Note that these helpers targets those who write custom code and Blade templates,
 
 ## File-based Collections
 
-Hyde provides `DataCollections`, a subset of [Laravel Collections](https://laravel.com/docs/10.x/collections) giving you a similar developer experience to working with Eloquent Collections. However, instead of accessing a database,
+Hyde provides `DataCollection`, a subset of [Laravel Collections](https://laravel.com/docs/10.x/collections) giving you a similar developer experience to working with Eloquent Collections. However, instead of accessing a database,
 it's all entirely file-based using static data files such as Markdown, Yaml, and JSON files which get parsed into objects that you can easily work with.
 
 ```php
-use Hyde\Support\DataCollections;
+use Hyde\Support\DataCollection;
 
 // Gets all Markdown files in resources/collections/$name directory
-DataCollections::markdown(string $name);
+DataCollection::markdown(string $name);
 
 // Gets all YAML files in resources/collections/$name directory
-DataCollections::yaml(string $name);
+DataCollection::yaml(string $name);
 
 // Gets all JSON files in resources/collections/$name directory
-DataCollections::json(string $name, bool $asArray = false);
+DataCollection::json(string $name, bool $asArray = false);
 ```
 
 See the [File-based Collections](collections) documentation for the full details.
diff --git a/packages/framework/src/Support/DataCollections.php b/packages/framework/src/Support/DataCollection.php
similarity index 93%
rename from packages/framework/src/Support/DataCollections.php
rename to packages/framework/src/Support/DataCollection.php
index 00d54371089..ffedb51e2cf 100644
--- a/packages/framework/src/Support/DataCollections.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -32,7 +32,7 @@
  * All collections are indexed by their filename, which is relative
  * to the configured data collection source directory.
  */
-class DataCollections extends Collection
+class DataCollection extends Collection
 {
     /**
      * The base directory for all data collections. Can be modified using a service provider.
@@ -44,7 +44,7 @@ class DataCollections extends Collection
      *
      * Each Markdown file will be parsed into a MarkdownDocument with front matter.
      *
-     * @return DataCollections<string, \Hyde\Markdown\Models\MarkdownDocument>
+     * @return DataCollection<string, \Hyde\Markdown\Models\MarkdownDocument>
      */
     public static function markdown(string $name): static
     {
@@ -58,7 +58,7 @@ public static function markdown(string $name): static
      *
      * Each YAML file will be parsed into a FrontMatter object.
      *
-     * @return DataCollections<string, \Hyde\Markdown\Models\FrontMatter>
+     * @return DataCollection<string, \Hyde\Markdown\Models\FrontMatter>
      */
     public static function yaml(string $name): static
     {
@@ -78,7 +78,7 @@ public static function yaml(string $name): static
      *
      * Each JSON file will be parsed into a stdClass object, or an associative array, depending on the second parameter.
      *
-     * @return DataCollections<string, \stdClass|array>
+     * @return DataCollection<string, \stdClass|array>
      */
     public static function json(string $name, bool $asArray = false): static
     {
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index f144e9fd367..9889472841e 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -6,11 +6,11 @@
 
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
-use Hyde\Support\DataCollections;
+use Hyde\Support\DataCollection;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\DataCollections
+ * @covers \Hyde\Support\DataCollection
  *
  * @see \Hyde\Framework\Testing\Unit\DataCollectionUnitTest
  */
@@ -22,10 +22,10 @@ public function testMarkdownCollections()
         $this->markdown('resources/collections/foo/foo.md', 'Hello World', ['title' => 'Foo']);
         $this->file('resources/collections/foo/bar.md');
 
-        $this->assertEquals(new DataCollections([
+        $this->assertEquals(new DataCollection([
             'foo/foo.md' => new MarkdownDocument(['title' => 'Foo'], 'Hello World'),
             'foo/bar.md' => new MarkdownDocument([], ''),
-        ]), DataCollections::markdown('foo'));
+        ]), DataCollection::markdown('foo'));
     }
 
     public function testYamlCollections()
@@ -35,11 +35,11 @@ public function testYamlCollections()
         $this->file('resources/collections/foo/bar.yml', "---\ntitle: Bar\n---");
         $this->file('resources/collections/foo/baz.yml');
 
-        $this->assertEquals(new DataCollections([
+        $this->assertEquals(new DataCollection([
             'foo/foo.yaml' => new FrontMatter(['title' => 'Foo']),
             'foo/bar.yml' => new FrontMatter(['title' => 'Bar']),
             'foo/baz.yml' => new FrontMatter([]),
-        ]), DataCollections::yaml('foo'));
+        ]), DataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsWithoutTripleDashes()
@@ -47,9 +47,9 @@ public function testYamlCollectionsWithoutTripleDashes()
         $this->directory('resources/collections/foo');
         $this->file('resources/collections/foo/foo.yml', 'title: Foo');
 
-        $this->assertEquals(new DataCollections([
+        $this->assertEquals(new DataCollection([
             'foo/foo.yml' => new FrontMatter(['title' => 'Foo']),
-        ]), DataCollections::yaml('foo'));
+        ]), DataCollection::yaml('foo'));
     }
 
     public function testJsonCollections()
@@ -58,10 +58,10 @@ public function testJsonCollections()
         $this->file('resources/collections/foo/foo.json', json_encode(['foo' => 'bar']));
         $this->file('resources/collections/foo/bar.json');
 
-        $this->assertEquals(new DataCollections([
+        $this->assertEquals(new DataCollection([
             'foo/foo.json' => (object) ['foo' => 'bar'],
             'foo/bar.json' => null,
-        ]), DataCollections::json('foo'));
+        ]), DataCollection::json('foo'));
     }
 
     public function testJsonCollectionsAsArrays()
@@ -70,24 +70,24 @@ public function testJsonCollectionsAsArrays()
         $this->file('resources/collections/foo/foo.json', json_encode(['foo' => 'bar']));
         $this->file('resources/collections/foo/bar.json');
 
-        $this->assertEquals(new DataCollections([
+        $this->assertEquals(new DataCollection([
             'foo/foo.json' => ['foo' => 'bar'],
             'foo/bar.json' => null,
-        ]), DataCollections::json('foo', true));
+        ]), DataCollection::json('foo', true));
     }
 
     public function testFindMarkdownFilesMethodReturnsEmptyArrayIfTheSpecifiedDirectoryDoesNotExist()
     {
-        $this->assertIsArray(DataCollections::markdown('foo')->keys()->toArray());
-        $this->assertEmpty(DataCollections::markdown('foo')->keys()->toArray());
+        $this->assertIsArray(DataCollection::markdown('foo')->keys()->toArray());
+        $this->assertEmpty(DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testFindMarkdownFilesMethodReturnsEmptyArrayIfNoFilesAreFoundInSpecifiedDirectory()
     {
         $this->directory('resources/collections/foo');
 
-        $this->assertIsArray(DataCollections::markdown('foo')->keys()->toArray());
-        $this->assertEmpty(DataCollections::markdown('foo')->keys()->toArray());
+        $this->assertIsArray(DataCollection::markdown('foo')->keys()->toArray());
+        $this->assertEmpty(DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testFindMarkdownFilesMethodReturnsAnArrayOfMarkdownFilesInTheSpecifiedDirectory()
@@ -99,7 +99,7 @@ public function testFindMarkdownFilesMethodReturnsAnArrayOfMarkdownFilesInTheSpe
         $this->assertSame([
             'foo/bar.md',
             'foo/foo.md',
-        ], DataCollections::markdown('foo')->keys()->toArray());
+        ], DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testFindMarkdownFilesMethodDoesNotIncludeFilesInSubdirectories()
@@ -111,7 +111,7 @@ public function testFindMarkdownFilesMethodDoesNotIncludeFilesInSubdirectories()
 
         $this->assertSame([
             'foo/foo.md',
-        ], DataCollections::markdown('foo')->keys()->toArray());
+        ], DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testFindMarkdownFilesMethodDoesNotIncludeFilesWithExtensionsOtherThanMd()
@@ -122,7 +122,7 @@ public function testFindMarkdownFilesMethodDoesNotIncludeFilesWithExtensionsOthe
 
         $this->assertSame([
             'foo/foo.md',
-        ], DataCollections::markdown('foo')->keys()->toArray());
+        ], DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testFindMarkdownFilesMethodDoesNotRemoveFilesStartingWithAnUnderscore()
@@ -132,7 +132,7 @@ public function testFindMarkdownFilesMethodDoesNotRemoveFilesStartingWithAnUnder
 
         $this->assertSame([
             'foo/_foo.md',
-        ], DataCollections::markdown('foo')->keys()->toArray());
+        ], DataCollection::markdown('foo')->keys()->toArray());
     }
 
     public function testStaticMarkdownHelperDiscoversAndParsesMarkdownFilesInTheSpecifiedDirectory()
@@ -144,7 +144,7 @@ public function testStaticMarkdownHelperDiscoversAndParsesMarkdownFilesInTheSpec
         $this->assertEquals([
             'foo/foo.md' => new MarkdownDocument([], ''),
             'foo/bar.md' => new MarkdownDocument([], ''),
-        ], DataCollections::markdown('foo')->toArray());
+        ], DataCollection::markdown('foo')->toArray());
     }
 
     public function testStaticMarkdownHelperDoestNotIgnoreFilesStartingWithAnUnderscore()
@@ -153,19 +153,19 @@ public function testStaticMarkdownHelperDoestNotIgnoreFilesStartingWithAnUndersc
         $this->file('resources/collections/foo/foo.md');
         $this->file('resources/collections/foo/_bar.md');
 
-        $this->assertCount(2, DataCollections::markdown('foo'));
+        $this->assertCount(2, DataCollection::markdown('foo'));
     }
 
     public function testSourceDirectoryCanBeChanged()
     {
-        DataCollections::$sourceDirectory = 'foo';
+        DataCollection::$sourceDirectory = 'foo';
         $this->directory('foo/bar');
         $this->file('foo/bar/foo.md');
 
         $this->assertSame([
             'bar/foo.md',
-        ], DataCollections::markdown('bar')->keys()->toArray());
+        ], DataCollection::markdown('bar')->keys()->toArray());
 
-        DataCollections::$sourceDirectory = 'resources/collections';
+        DataCollection::$sourceDirectory = 'resources/collections';
     }
 }
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index fc4cfdea17b..cfea0468e04 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -5,14 +5,14 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Hyde;
-use Hyde\Support\DataCollections;
+use Hyde\Support\DataCollection;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Collection;
 use Mockery;
 
 /**
- * @covers \Hyde\Support\DataCollections
+ * @covers \Hyde\Support\DataCollection
  *
  * @see \Hyde\Framework\Testing\Feature\DataCollectionTest
  */
@@ -22,27 +22,27 @@ class DataCollectionUnitTest extends UnitTestCase
 
     public function testClassHasStaticSourceDirectoryProperty()
     {
-        $this->assertSame('resources/collections', DataCollections::$sourceDirectory);
+        $this->assertSame('resources/collections', DataCollection::$sourceDirectory);
     }
 
     public function testConstructorCreatesNewDataCollectionInstance()
     {
-        $this->assertInstanceOf(DataCollections::class, new DataCollections());
+        $this->assertInstanceOf(DataCollection::class, new DataCollection());
     }
 
     public function testClassExtendsCollectionClass()
     {
-        $this->assertInstanceOf(Collection::class, new DataCollections());
+        $this->assertInstanceOf(Collection::class, new DataCollection());
     }
 
     public function testCanConvertCollectionToArray()
     {
-        $this->assertSame([], (new DataCollections())->toArray());
+        $this->assertSame([], (new DataCollection())->toArray());
     }
 
     public function testCanConvertCollectionToJson()
     {
-        $this->assertSame('[]', (new DataCollections())->toJson());
+        $this->assertSame('[]', (new DataCollection())->toJson());
     }
 
     public function testFindMarkdownFilesCallsProperGlobPattern()
@@ -54,7 +54,7 @@ public function testFindMarkdownFilesCallsProperGlobPattern()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        DataCollections::markdown('foo')->keys()->toArray();
+        DataCollection::markdown('foo')->keys()->toArray();
 
         $this->addToAssertionCount(Mockery::getContainer()->mockery_getExpectationCount());
         Mockery::close();
@@ -69,7 +69,7 @@ public function testFindMarkdownFilesWithNoFiles()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        $this->assertSame([], DataCollections::markdown('foo')->keys()->toArray());
+        $this->assertSame([], DataCollection::markdown('foo')->keys()->toArray());
 
         Mockery::close();
     }
@@ -84,13 +84,13 @@ public function testFindMarkdownFilesWithFiles()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        $this->assertSame(['bar.md'], DataCollections::markdown('foo')->keys()->toArray());
+        $this->assertSame(['bar.md'], DataCollection::markdown('foo')->keys()->toArray());
 
         Mockery::close();
     }
 
     public function testStaticMarkdownHelperReturnsNewDataCollectionInstance()
     {
-        $this->assertInstanceOf(DataCollections::class, DataCollections::markdown('foo'));
+        $this->assertInstanceOf(DataCollection::class, DataCollection::markdown('foo'));
     }
 }

From a24aa34412226c865fdbb663aa70351300c17797 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:42:56 +0200
Subject: [PATCH 1888/2811] Add mockable data collection test class

---
 .../tests/Unit/DataCollectionUnitTest.php     | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cfea0468e04..4cc703c0676 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -20,6 +20,13 @@ class DataCollectionUnitTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 
+    protected function tearDown(): void
+    {
+        MockableDataCollection::tearDown();
+
+        parent::tearDown();
+    }
+
     public function testClassHasStaticSourceDirectoryProperty()
     {
         $this->assertSame('resources/collections', DataCollection::$sourceDirectory);
@@ -94,3 +101,23 @@ public function testStaticMarkdownHelperReturnsNewDataCollectionInstance()
         $this->assertInstanceOf(DataCollection::class, DataCollection::markdown('foo'));
     }
 }
+
+class MockableDataCollection extends DataCollection
+{
+    protected static array $mockFiles = [];
+
+    protected static function findFiles(string $name, array|string $extensions): Collection
+    {
+        return collect(static::$mockFiles);
+    }
+
+    public static function mockFiles(array $files): void
+    {
+        static::$mockFiles = $files;
+    }
+
+    public static function tearDown(): void
+    {
+        static::$mockFiles = [];
+    }
+}

From 02b8b0663af262f254cac5ded3a1802efdd10848 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:48:44 +0200
Subject: [PATCH 1889/2811] Get by name

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 4cc703c0676..cea8cf15b1a 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -108,7 +108,7 @@ class MockableDataCollection extends DataCollection
 
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
-        return collect(static::$mockFiles);
+        return collect(static::$mockFiles[$name]);
     }
 
     public static function mockFiles(array $files): void

From 6c91c63e5aced05b9820e052bd5acaadc3daf500 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:49:18 +0200
Subject: [PATCH 1890/2811] Normalize file contents syntax

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index ffedb51e2cf..a8fd789b4b0 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -63,7 +63,7 @@ public static function markdown(string $name): static
     public static function yaml(string $name): static
     {
         return new static(static::findFiles($name, ['yaml', 'yml'])->mapWithKeys(function (string $file): array {
-            $content = Filesystem::get($file);
+            $content = Filesystem::getContents($file);
             $content = Str::between($content, '---', '---');
 
             $parsed = Yaml::parse($content) ?: [];
@@ -83,7 +83,7 @@ public static function yaml(string $name): static
     public static function json(string $name, bool $asArray = false): static
     {
         return new static(static::findFiles($name, 'json')->mapWithKeys(function (string $file) use ($asArray): array {
-            return [static::makeIdentifier($file) => json_decode(Filesystem::get($file), $asArray)];
+            return [static::makeIdentifier($file) => json_decode(Filesystem::getContents($file), $asArray)];
         }));
     }
 

From dd63ffe1c7a03a591d430b865bf5864805573487 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:55:33 +0200
Subject: [PATCH 1891/2811] Add array based glob helper

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cea8cf15b1a..47d51c23752 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -120,4 +120,11 @@ public static function tearDown(): void
     {
         static::$mockFiles = [];
     }
+
+    protected static function arrayGlob(array $files, string $name, array|string $extensions): array
+    {
+        return array_filter($files, function (string $file) use ($name, $extensions): bool {
+            return str_contains($file, $name) && str_contains($file, $extensions);
+        }, ARRAY_FILTER_USE_KEY);
+    }
 }

From b577a4804207ab1d06826dfa989c205f04ee02f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:55:52 +0200
Subject: [PATCH 1892/2811] Collect using array glob

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 47d51c23752..cdac3cee973 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -108,7 +108,7 @@ class MockableDataCollection extends DataCollection
 
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
-        return collect(static::$mockFiles[$name]);
+        return collect(static::arrayGlob(static::$mockFiles, $name, $extensions));
     }
 
     public static function mockFiles(array $files): void

From db628613ab9d4b7521886cdbc1ac0d6d4bc3166c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:56:00 +0200
Subject: [PATCH 1893/2811] Annotate generics

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cdac3cee973..1ded27cc22c 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -111,6 +111,9 @@ protected static function findFiles(string $name, array|string $extensions): Col
         return collect(static::arrayGlob(static::$mockFiles, $name, $extensions));
     }
 
+    /**
+     * @param  array<string, string>  $files  Filename as key, file contents as value.
+     */
     public static function mockFiles(array $files): void
     {
         static::$mockFiles = $files;

From dd698abe3298e324597d961798dafdad5f0e93a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 09:56:05 +0200
Subject: [PATCH 1894/2811] Assert generics and test mock setup

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 1ded27cc22c..016dd5adc24 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -116,6 +116,13 @@ protected static function findFiles(string $name, array|string $extensions): Col
      */
     public static function mockFiles(array $files): void
     {
+        foreach ($files as $file => $contents) {
+            assert(is_string($file), 'File name must be a string.');
+            assert(is_string($contents), 'File contents must be a string.');
+            assert(str_contains($file, '/'), 'File must be in a directory.');
+            assert(str_contains($file, '.'), 'File must have an extension.');
+        }
+
         static::$mockFiles = $files;
     }
 

From d9bb52adee743da4afda6428685b7bc1773e6fb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 10:04:36 +0200
Subject: [PATCH 1895/2811] Mock the filesystem

---
 .../framework/tests/Unit/DataCollectionUnitTest.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 016dd5adc24..3a78022ee93 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -123,6 +123,17 @@ public static function mockFiles(array $files): void
             assert(str_contains($file, '.'), 'File must have an extension.');
         }
 
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('get')
+            ->andReturnUsing(function (string $file) use ($files) {
+                $file = unslash(str_replace(Hyde::path(), '', $file));
+                $files = static::arrayGlob($files, $file, 'md');
+
+                return array_values($files)[0] ?? '';
+            });
+
+        app()->instance(Filesystem::class, $filesystem);
+
         static::$mockFiles = $files;
     }
 

From e8af560121c4103094ed9f1bb736c15dff16e054 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:14:43 +0200
Subject: [PATCH 1896/2811] Simplify testing helpers

---
 .../tests/Unit/DataCollectionUnitTest.php        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 3a78022ee93..381e08d95a2 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -5,11 +5,14 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Support\DataCollection;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Collection;
 use Mockery;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\MarkdownDocument;
 
 /**
  * @covers \Hyde\Support\DataCollection
@@ -108,7 +111,7 @@ class MockableDataCollection extends DataCollection
 
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
-        return collect(static::arrayGlob(static::$mockFiles, $name, $extensions));
+        return collect(static::$mockFiles)->keys();
     }
 
     /**
@@ -127,9 +130,9 @@ public static function mockFiles(array $files): void
         $filesystem->shouldReceive('get')
             ->andReturnUsing(function (string $file) use ($files) {
                 $file = unslash(str_replace(Hyde::path(), '', $file));
-                $files = static::arrayGlob($files, $file, 'md');
+                $files = collect($files)->mapWithKeys(fn ($contents, $file) => [Str::before(basename($file), '.') => $contents])->all();
 
-                return array_values($files)[0] ?? '';
+                return $files[$file] ?? '';
             });
 
         app()->instance(Filesystem::class, $filesystem);
@@ -141,11 +144,4 @@ public static function tearDown(): void
     {
         static::$mockFiles = [];
     }
-
-    protected static function arrayGlob(array $files, string $name, array|string $extensions): array
-    {
-        return array_filter($files, function (string $file) use ($name, $extensions): bool {
-            return str_contains($file, $name) && str_contains($file, $extensions);
-        }, ARRAY_FILTER_USE_KEY);
-    }
 }

From ba3b72a126abe47696278233a718af747f67bb0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:15:05 +0200
Subject: [PATCH 1897/2811] Test Markdown method returns collection of Markdown
 documents

---
 .../tests/Unit/DataCollectionUnitTest.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 381e08d95a2..de2b58bc6a9 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -103,6 +103,23 @@ public function testStaticMarkdownHelperReturnsNewDataCollectionInstance()
     {
         $this->assertInstanceOf(DataCollection::class, DataCollection::markdown('foo'));
     }
+
+    public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => 'bar',
+            'foo/baz.md' => 'baz',
+        ]);
+
+        $collection = MockableDataCollection::markdown('foo');
+
+        $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
+
+        $this->assertSame([
+            'bar' => 'bar',
+            'baz' => 'baz',
+        ], $collection->map(fn ($value) => (string) $value)->all());
+    }
 }
 
 class MockableDataCollection extends DataCollection

From 8474481fa903caaa2dee5a38f7e5755729700a4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:15:34 +0200
Subject: [PATCH 1898/2811] Test Yaml method returns collection of front matter
 objects

---
 .../tests/Unit/DataCollectionUnitTest.php       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index de2b58bc6a9..140b2fdd76c 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -120,6 +120,23 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
             'baz' => 'baz',
         ], $collection->map(fn ($value) => (string) $value)->all());
     }
+
+    public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => '---\nfoo: bar\n---',
+            'foo/baz.yml' => '---\nfoo: baz\n---',
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'bar' => ['foo' => 'bar'],
+            'baz' => ['foo' => 'baz'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
 }
 
 class MockableDataCollection extends DataCollection

From 07e9cc3ba42391da28a06d6e96a78da8d3e26cad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:25:20 +0200
Subject: [PATCH 1899/2811] Update mocks to better match real setup

---
 .../framework/tests/Unit/DataCollectionUnitTest.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 140b2fdd76c..f56d0719652 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -116,8 +116,8 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
         $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
 
         $this->assertSame([
-            'bar' => 'bar',
-            'baz' => 'baz',
+            'foo/bar.md' => 'bar',
+            'foo/baz.md' => 'baz',
         ], $collection->map(fn ($value) => (string) $value)->all());
     }
 
@@ -133,8 +133,8 @@ public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
         $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
 
         $this->assertSame([
-            'bar' => ['foo' => 'bar'],
-            'baz' => ['foo' => 'baz'],
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
         ], $collection->map(fn ($value) => $value->toArray())->all());
     }
 }
@@ -145,7 +145,7 @@ class MockableDataCollection extends DataCollection
 
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
-        return collect(static::$mockFiles)->keys();
+        return collect(static::$mockFiles)->keys()->map(fn ($file) => parent::makeIdentifier($file))->values();
     }
 
     /**
@@ -163,7 +163,7 @@ public static function mockFiles(array $files): void
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('get')
             ->andReturnUsing(function (string $file) use ($files) {
-                $file = unslash(str_replace(Hyde::path(), '', $file));
+                $file = Str::before(basename($file), '.');
                 $files = collect($files)->mapWithKeys(fn ($contents, $file) => [Str::before(basename($file), '.') => $contents])->all();
 
                 return $files[$file] ?? '';

From 330940e3e53c71d17126ee667a362a577c3d15ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:27:13 +0200
Subject: [PATCH 1900/2811] Fix quote usage

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index f56d0719652..69c5f745a05 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -124,8 +124,8 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
     public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
     {
         MockableDataCollection::mockFiles([
-            'foo/bar.yml' => '---\nfoo: bar\n---',
-            'foo/baz.yml' => '---\nfoo: baz\n---',
+            'foo/bar.yml' => "---\nfoo: bar\n---",
+            'foo/baz.yml' => "---\nfoo: baz\n---",
         ]);
 
         $collection = MockableDataCollection::yaml('foo');

From c2ad0e9a4d0dc86c1b4977512e3b95c3b1ce57d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:35:48 +0200
Subject: [PATCH 1901/2811] Test differing Yaml syntaxes

---
 .../tests/Unit/DataCollectionUnitTest.php     | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 69c5f745a05..a89d7d93480 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -137,6 +137,57 @@ public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
             'foo/baz.yml' => ['foo' => 'baz'],
         ], $collection->map(fn ($value) => $value->toArray())->all());
     }
+
+    public function testYamlCollectionsDoNotRequireTripleDashes()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => 'foo: bar',
+            'foo/baz.yml' => 'foo: baz',
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
+
+    public function testYamlCollectionsAcceptTripleDashes()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => "---\nfoo: bar\n---",
+            'foo/baz.yml' => "---\nfoo: baz",
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
+
+    public function testYamlCollectionsSupportYamlAndYmlFileExtensions()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yaml' => "---\nfoo: bar\n---",
+            'foo/baz.yml' => "---\nfoo: baz\n---",
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yaml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
 }
 
 class MockableDataCollection extends DataCollection

From ae8523dcd2522ca5cb5a985ef6903b6410913ad4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:36:28 +0200
Subject: [PATCH 1902/2811] Test Yaml fault tolerance

---
 .../tests/Unit/DataCollectionUnitTest.php     | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index a89d7d93480..65d5185414f 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -188,6 +188,61 @@ public function testYamlCollectionsSupportYamlAndYmlFileExtensions()
             'foo/baz.yml' => ['foo' => 'baz'],
         ], $collection->map(fn ($value) => $value->toArray())->all());
     }
+
+    public function testYamlCollectionsHandleLeadingAndTrailingNewlines()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => "\nfoo: bar\n",
+            'foo/baz.yml' => "\nfoo: baz",
+            'foo/qux.yml' => "foo: qux\n",
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+            'foo/qux.yml' => ['foo' => 'qux'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
+
+    public function testYamlCollectionsHandleTrailingWhitespace()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => 'foo: bar ',
+            'foo/baz.yml' => 'foo: baz  ',
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
+
+    public function testYamlCollectionsHandleLeadingAndTrailingNewlinesAndTrailingWhitespace()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => "\nfoo: bar  \n",
+            'foo/baz.yml' => "\nfoo: baz\n ",
+            'foo/qux.yml' => "foo: qux  \n",
+        ]);
+
+        $collection = MockableDataCollection::yaml('foo');
+
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame([
+            'foo/bar.yml' => ['foo' => 'bar'],
+            'foo/baz.yml' => ['foo' => 'baz'],
+            'foo/qux.yml' => ['foo' => 'qux'],
+        ], $collection->map(fn ($value) => $value->toArray())->all());
+    }
 }
 
 class MockableDataCollection extends DataCollection

From bc8c4fc207595028c0940ffb01417398a683655a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 14:41:46 +0200
Subject: [PATCH 1903/2811] Extract helper to assert front matter collection
 structure

---
 .../tests/Unit/DataCollectionUnitTest.php     | 63 +++++++------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 65d5185414f..14ae99aa8da 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -128,14 +128,10 @@ public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
             'foo/baz.yml' => "---\nfoo: baz\n---",
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsDoNotRequireTripleDashes()
@@ -145,14 +141,10 @@ public function testYamlCollectionsDoNotRequireTripleDashes()
             'foo/baz.yml' => 'foo: baz',
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsAcceptTripleDashes()
@@ -162,14 +154,10 @@ public function testYamlCollectionsAcceptTripleDashes()
             'foo/baz.yml' => "---\nfoo: baz",
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsSupportYamlAndYmlFileExtensions()
@@ -179,14 +167,10 @@ public function testYamlCollectionsSupportYamlAndYmlFileExtensions()
             'foo/baz.yml' => "---\nfoo: baz\n---",
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yaml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsHandleLeadingAndTrailingNewlines()
@@ -197,15 +181,11 @@ public function testYamlCollectionsHandleLeadingAndTrailingNewlines()
             'foo/qux.yml' => "foo: qux\n",
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
             'foo/qux.yml' => ['foo' => 'qux'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsHandleTrailingWhitespace()
@@ -215,14 +195,10 @@ public function testYamlCollectionsHandleTrailingWhitespace()
             'foo/baz.yml' => 'foo: baz  ',
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
     }
 
     public function testYamlCollectionsHandleLeadingAndTrailingNewlinesAndTrailingWhitespace()
@@ -233,15 +209,18 @@ public function testYamlCollectionsHandleLeadingAndTrailingNewlinesAndTrailingWh
             'foo/qux.yml' => "foo: qux  \n",
         ]);
 
-        $collection = MockableDataCollection::yaml('foo');
-
-        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
-
-        $this->assertSame([
+        $this->assertFrontMatterCollectionStructure([
             'foo/bar.yml' => ['foo' => 'bar'],
             'foo/baz.yml' => ['foo' => 'baz'],
             'foo/qux.yml' => ['foo' => 'qux'],
-        ], $collection->map(fn ($value) => $value->toArray())->all());
+        ], MockableDataCollection::yaml('foo'));
+    }
+
+    protected function assertFrontMatterCollectionStructure(array $expected, DataCollection $collection): void
+    {
+        $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);
+
+        $this->assertSame($expected, $collection->map(fn ($value) => $value->toArray())->all());
     }
 }
 

From d36c1a706d949159a5ac9e659f570b6ce91f1934 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 15:08:07 +0200
Subject: [PATCH 1904/2811] Add helper to assert Json collection structure

---
 .../tests/Unit/DataCollectionUnitTest.php          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 14ae99aa8da..f832c090fe1 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -222,6 +222,20 @@ protected function assertFrontMatterCollectionStructure(array $expected, DataCol
 
         $this->assertSame($expected, $collection->map(fn ($value) => $value->toArray())->all());
     }
+
+    protected function assertJsonCollectionStructure(array $expected, DataCollection $collection, bool $asArray = false): void
+    {
+        if ($asArray) {
+            $this->assertContainsOnly('array', $collection);
+        } else {
+            $this->assertContainsOnly('object', $collection);
+        }
+
+        $this->assertSame(
+            collect($expected)->map(fn ($value) => (array) $value)->all(),
+            $collection->map(fn ($value) => (array) $value)->all()
+        );
+    }
 }
 
 class MockableDataCollection extends DataCollection

From 46a2bb11d2fa436bd21c179c5c54d4d486f9a69a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 15:08:19 +0200
Subject: [PATCH 1905/2811] Simplify assertion handling

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index f832c090fe1..4cff6decc60 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -229,12 +229,12 @@ protected function assertJsonCollectionStructure(array $expected, DataCollection
             $this->assertContainsOnly('array', $collection);
         } else {
             $this->assertContainsOnly('object', $collection);
+
+            $expected = collect($expected)->map(fn ($value) => (array) $value)->all();
+            $collection = $collection->map(fn ($value) => (array) $value);
         }
 
-        $this->assertSame(
-            collect($expected)->map(fn ($value) => (array) $value)->all(),
-            $collection->map(fn ($value) => (array) $value)->all()
-        );
+        $this->assertSame($expected, $collection->all());
     }
 }
 

From 7535cdca2c0d591e260f6d1f09207494e323fa21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 15:08:14 +0200
Subject: [PATCH 1906/2811] Test Json collection handling

---
 .../tests/Unit/DataCollectionUnitTest.php     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 4cff6decc60..b80b68cbb62 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -216,6 +216,32 @@ public function testYamlCollectionsHandleLeadingAndTrailingNewlinesAndTrailingWh
         ], MockableDataCollection::yaml('foo'));
     }
 
+    public function testJsonMethodReturnsCollectionOfJsonDecodedObjects()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '{"foo": "bar"}',
+            'foo/baz.json' => '{"foo": "baz"}',
+        ]);
+
+        $this->assertJsonCollectionStructure([
+            'foo/bar.json' => (object) ['foo' => 'bar'],
+            'foo/baz.json' => (object) ['foo' => 'baz'],
+        ], MockableDataCollection::json('foo'));
+    }
+
+    public function testJsonMethodReturnsCollectionOfJsonDecodedArrays()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '{"foo": "bar"}',
+            'foo/baz.json' => '{"foo": "baz"}',
+        ]);
+
+        $this->assertJsonCollectionStructure([
+            'foo/bar.json' => ['foo' => 'bar'],
+            'foo/baz.json' => ['foo' => 'baz'],
+        ], MockableDataCollection::json('foo', true), true);
+    }
+
     protected function assertFrontMatterCollectionStructure(array $expected, DataCollection $collection): void
     {
         $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);

From 9ce2c983c65727f831e7b5e5c8502a03dafcb900 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 17:53:52 +0200
Subject: [PATCH 1907/2811] Remove duplicated word from documentation

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index a8fd789b4b0..dcd2938dd34 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -27,7 +27,7 @@
  * they allow you to quickly access the data collections.
  *
  * To use them retrieve a collection, call a facade method with the
- * name of the data collection subdirectory directory.
+ * name of the data collection subdirectory.
  *
  * All collections are indexed by their filename, which is relative
  * to the configured data collection source directory.

From d491da16faab80e430591cdd240ae47820ae143c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:12:33 +0200
Subject: [PATCH 1908/2811] Refactor to extract helper method

---
 .../framework/src/Support/DataCollection.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index dcd2938dd34..181e57d7fc2 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -48,9 +48,9 @@ class DataCollection extends Collection
      */
     public static function markdown(string $name): static
     {
-        return new static(static::findFiles($name, 'md')->mapWithKeys(function (string $file): array {
+        return static::discover($name, 'md', function (string $file): array {
             return [static::makeIdentifier($file) => MarkdownFileParser::parse($file)];
-        }));
+        });
     }
 
     /**
@@ -62,7 +62,7 @@ public static function markdown(string $name): static
      */
     public static function yaml(string $name): static
     {
-        return new static(static::findFiles($name, ['yaml', 'yml'])->mapWithKeys(function (string $file): array {
+        return static::discover($name, ['yaml', 'yml'], function (string $file): array {
             $content = Filesystem::getContents($file);
             $content = Str::between($content, '---', '---');
 
@@ -70,7 +70,7 @@ public static function yaml(string $name): static
             $matter = new FrontMatter($parsed);
 
             return [static::makeIdentifier($file) => $matter];
-        }));
+        });
     }
 
     /**
@@ -82,9 +82,9 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return new static(static::findFiles($name, 'json')->mapWithKeys(function (string $file) use ($asArray): array {
+        return static::discover($name, 'json', function (string $file) use ($asArray): array {
             return [static::makeIdentifier($file) => json_decode(Filesystem::getContents($file), $asArray)];
-        }));
+        });
     }
 
     protected static function findFiles(string $name, array|string $extensions): Collection
@@ -98,4 +98,9 @@ protected static function makeIdentifier(string $path): string
     {
         return unslash(Str::after($path, static::$sourceDirectory));
     }
+
+    protected static function discover(string $name, array|string $extensions, callable $callback): static
+    {
+        return new static(static::findFiles($name, $extensions)->mapWithKeys($callback));
+    }
 }

From aaffe2cbecc2dbf7bd71fa319c95f46dab6c71ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:13:57 +0200
Subject: [PATCH 1909/2811] Move up helper method

---
 packages/framework/src/Support/DataCollection.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 181e57d7fc2..ad9009e5ac5 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -87,6 +87,11 @@ public static function json(string $name, bool $asArray = false): static
         });
     }
 
+    protected static function discover(string $name, array|string $extensions, callable $callback): static
+    {
+        return new static(static::findFiles($name, $extensions)->mapWithKeys($callback));
+    }
+
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
         return Filesystem::smartGlob(sprintf('%s/%s/*.{%s}',
@@ -98,9 +103,4 @@ protected static function makeIdentifier(string $path): string
     {
         return unslash(Str::after($path, static::$sourceDirectory));
     }
-
-    protected static function discover(string $name, array|string $extensions, callable $callback): static
-    {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys($callback));
-    }
 }

From 194899d95ab38100b000731492034a01e90c0bd5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:14:36 +0200
Subject: [PATCH 1910/2811] Rename callback parameter

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index ad9009e5ac5..5f4b8a1bdb8 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -87,9 +87,9 @@ public static function json(string $name, bool $asArray = false): static
         });
     }
 
-    protected static function discover(string $name, array|string $extensions, callable $callback): static
+    protected static function discover(string $name, array|string $extensions, callable $mapUsing): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys($callback));
+        return new static(static::findFiles($name, $extensions)->mapWithKeys($mapUsing));
     }
 
     protected static function findFiles(string $name, array|string $extensions): Collection

From f89f40801d55f497f3c061aaff53a9743ddfc539 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:25:27 +0200
Subject: [PATCH 1911/2811] Refactor to further extract shared logic to helper

---
 .../framework/src/Support/DataCollection.php  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 5f4b8a1bdb8..7185e45e16c 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -4,9 +4,11 @@
 
 namespace Hyde\Support;
 
+use stdClass;
 use Hyde\Facades\Filesystem;
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -48,8 +50,8 @@ class DataCollection extends Collection
      */
     public static function markdown(string $name): static
     {
-        return static::discover($name, 'md', function (string $file): array {
-            return [static::makeIdentifier($file) => MarkdownFileParser::parse($file)];
+        return static::discover($name, 'md', function (string $file): MarkdownDocument {
+            return MarkdownFileParser::parse($file);
         });
     }
 
@@ -62,14 +64,14 @@ public static function markdown(string $name): static
      */
     public static function yaml(string $name): static
     {
-        return static::discover($name, ['yaml', 'yml'], function (string $file): array {
+        return static::discover($name, ['yaml', 'yml'], function (string $file): FrontMatter {
             $content = Filesystem::getContents($file);
             $content = Str::between($content, '---', '---');
 
             $parsed = Yaml::parse($content) ?: [];
             $matter = new FrontMatter($parsed);
 
-            return [static::makeIdentifier($file) => $matter];
+            return $matter;
         });
     }
 
@@ -82,14 +84,16 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return static::discover($name, 'json', function (string $file) use ($asArray): array {
-            return [static::makeIdentifier($file) => json_decode(Filesystem::getContents($file), $asArray)];
+        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array {
+            return json_decode(Filesystem::getContents($file), $asArray);
         });
     }
 
-    protected static function discover(string $name, array|string $extensions, callable $mapUsing): static
+    protected static function discover(string $name, array|string $extensions, callable $parseUsing): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys($mapUsing));
+        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing): array {
+            return [static::makeIdentifier($file) => $parseUsing($file)];
+        }));
     }
 
     protected static function findFiles(string $name, array|string $extensions): Collection

From a80b3d41993d3e97c458005265fd140bbe288dae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:25:58 +0200
Subject: [PATCH 1912/2811] Add null return type support pending
 https://github.com/hydephp/develop/issues/1736

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 7185e45e16c..ea1ccb468d2 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -84,7 +84,7 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array {
+        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array|null {
             return json_decode(Filesystem::getContents($file), $asArray);
         });
     }

From ca6f87d74e114ef73678a8db87f1b9d633556f8a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:28:11 +0200
Subject: [PATCH 1913/2811] Annotate helper method generics

---
 packages/framework/src/Support/DataCollection.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index ea1ccb468d2..37ba61fafe1 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -89,6 +89,11 @@ public static function json(string $name, bool $asArray = false): static
         });
     }
 
+    /**
+     * @param  array<string>|string  $extensions
+     * @param  callable(string): mixed  $parseUsing  (string $file): mixed
+     * @return static<string, mixed>
+     */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing): static
     {
         return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing): array {

From 0b54e3d42c19cc4c48b7487f7a6e4efc9ad9b87b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:35:12 +0200
Subject: [PATCH 1914/2811] Cleanup PHPDoc comment

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 37ba61fafe1..49d88816951 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -91,7 +91,7 @@ public static function json(string $name, bool $asArray = false): static
 
     /**
      * @param  array<string>|string  $extensions
-     * @param  callable(string): mixed  $parseUsing  (string $file): mixed
+     * @param  callable(string): mixed  $parseUsing
      * @return static<string, mixed>
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing): static

From c232397c8d455d0fa9bafb2912ce9ca43c3f9ddd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:35:54 +0200
Subject: [PATCH 1915/2811] Annotate helper method generics

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 49d88816951..daa1ff3a9f0 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -101,6 +101,10 @@ protected static function discover(string $name, array|string $extensions, calla
         }));
     }
 
+    /**
+     * @param  array<string>|string  $extensions
+     * @return Collection<string>
+     */
     protected static function findFiles(string $name, array|string $extensions): Collection
     {
         return Filesystem::smartGlob(sprintf('%s/%s/*.{%s}',

From 1edcc244ee52154469ca6e7f7a4ace098fa4eef2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:36:33 +0200
Subject: [PATCH 1916/2811] Inline local variable

---
 packages/framework/src/Support/DataCollection.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index daa1ff3a9f0..9fe74bbce35 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -69,9 +69,8 @@ public static function yaml(string $name): static
             $content = Str::between($content, '---', '---');
 
             $parsed = Yaml::parse($content) ?: [];
-            $matter = new FrontMatter($parsed);
 
-            return $matter;
+            return new FrontMatter($parsed);
         });
     }
 

From 308a9c11f718a4b9735e50f8da5650dea43550c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:36:58 +0200
Subject: [PATCH 1917/2811] Reorder newlines

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 9fe74bbce35..40d3ec1974c 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -66,8 +66,8 @@ public static function yaml(string $name): static
     {
         return static::discover($name, ['yaml', 'yml'], function (string $file): FrontMatter {
             $content = Filesystem::getContents($file);
-            $content = Str::between($content, '---', '---');
 
+            $content = Str::between($content, '---', '---');
             $parsed = Yaml::parse($content) ?: [];
 
             return new FrontMatter($parsed);

From c2f0faa3d6988e8ff86304225a7a58302f6d6b6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 19:38:54 +0200
Subject: [PATCH 1918/2811] Normalize PHPDoc types

---
 packages/framework/src/Support/DataCollection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 40d3ec1974c..8804b99f552 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -46,7 +46,7 @@ class DataCollection extends Collection
      *
      * Each Markdown file will be parsed into a MarkdownDocument with front matter.
      *
-     * @return DataCollection<string, \Hyde\Markdown\Models\MarkdownDocument>
+     * @return static<string, \Hyde\Markdown\Models\MarkdownDocument>
      */
     public static function markdown(string $name): static
     {
@@ -60,7 +60,7 @@ public static function markdown(string $name): static
      *
      * Each YAML file will be parsed into a FrontMatter object.
      *
-     * @return DataCollection<string, \Hyde\Markdown\Models\FrontMatter>
+     * @return static<string, \Hyde\Markdown\Models\FrontMatter>
      */
     public static function yaml(string $name): static
     {
@@ -79,7 +79,7 @@ public static function yaml(string $name): static
      *
      * Each JSON file will be parsed into a stdClass object, or an associative array, depending on the second parameter.
      *
-     * @return DataCollection<string, \stdClass|array>
+     * @return static<string, \stdClass|array>
      */
     public static function json(string $name, bool $asArray = false): static
     {

From 24532a1f9fe01135ba84048d618c8992c0000c6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 20:35:02 +0200
Subject: [PATCH 1919/2811] Introduce local variable

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 8804b99f552..bc8f534e2e5 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -84,7 +84,9 @@ public static function yaml(string $name): static
     public static function json(string $name, bool $asArray = false): static
     {
         return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array|null {
-            return json_decode(Filesystem::getContents($file), $asArray);
+            $contents = Filesystem::getContents($file);
+
+            return json_decode($contents, $asArray);
         });
     }
 

From 25b4aeb9bba26549e6c9b7716247efd6a31f3b1b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 21:09:17 +0200
Subject: [PATCH 1920/2811] Update Data Collections to validate JSON data files

Fixes https://github.com/hydephp/develop/issues/1736
---
 RELEASE_NOTES.md                              |  7 +++
 .../framework/src/Support/DataCollection.php  |  7 ++-
 .../tests/Feature/DataCollectionTest.php      |  8 +--
 .../tests/Unit/DataCollectionUnitTest.php     | 62 +++++++++++++++++++
 4 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 53fc95b9911..980fdd8e6dd 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -22,6 +22,7 @@ This serves two purposes:
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Minor: Changed the default build task message to make it more concise in https://github.com/hydephp/develop/pull/1659
+- Minor: Data collection files are now validated for syntax errors during discovery in https://github.com/hydephp/develop/pull/1732
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
@@ -232,3 +233,9 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 #### Minor impact
 
 - Calling the `DataCollection` methods will no longer create the data collections directory automatically
+
+#### Issues that may arise
+
+If you start getting `InvalidArgumentException` when using the `DataCollection` class, it may be due to malformed data collection files.
+Starting from this version, we validate the syntax of JSON and YAML files during discovery, to help you catch errors early.
+See https://github.com/hydephp/develop/issues/1736 for more information.
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index bc8f534e2e5..85b0e78cfd1 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -6,6 +6,7 @@
 
 use stdClass;
 use Hyde\Facades\Filesystem;
+use InvalidArgumentException;
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
@@ -83,9 +84,13 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array|null {
+        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array {
             $contents = Filesystem::getContents($file);
 
+            if (! json_validate($contents)) {
+                throw new InvalidArgumentException("Invalid JSON in file: '$file'");
+            }
+
             return json_decode($contents, $asArray);
         });
     }
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 9889472841e..70587bdd95d 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -56,11 +56,11 @@ public function testJsonCollections()
     {
         $this->directory('resources/collections/foo');
         $this->file('resources/collections/foo/foo.json', json_encode(['foo' => 'bar']));
-        $this->file('resources/collections/foo/bar.json');
+        $this->file('resources/collections/foo/bar.json', '{"bar": "baz"}');
 
         $this->assertEquals(new DataCollection([
             'foo/foo.json' => (object) ['foo' => 'bar'],
-            'foo/bar.json' => null,
+            'foo/bar.json' => (object) ['bar' => 'baz'],
         ]), DataCollection::json('foo'));
     }
 
@@ -68,11 +68,11 @@ public function testJsonCollectionsAsArrays()
     {
         $this->directory('resources/collections/foo');
         $this->file('resources/collections/foo/foo.json', json_encode(['foo' => 'bar']));
-        $this->file('resources/collections/foo/bar.json');
+        $this->file('resources/collections/foo/bar.json', '{"bar": "baz"}');
 
         $this->assertEquals(new DataCollection([
             'foo/foo.json' => ['foo' => 'bar'],
-            'foo/bar.json' => null,
+            'foo/bar.json' => ['bar' => 'baz'],
         ]), DataCollection::json('foo', true));
     }
 
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index b80b68cbb62..336bb209e12 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use Hyde\Support\DataCollection;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Filesystem\Filesystem;
@@ -242,6 +243,67 @@ public function testJsonMethodReturnsCollectionOfJsonDecodedArrays()
         ], MockableDataCollection::json('foo', true), true);
     }
 
+    public function testJsonMethodThrowsExceptionForInvalidJson()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '{"foo": "bar"',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+
+        MockableDataCollection::json('foo');
+    }
+
+    public function testJsonMethodThrowsExceptionForInvalidJsonWithArray()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '{"foo": "bar"',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+
+        MockableDataCollection::json('foo', true);
+    }
+
+    public function testJsonMethodThrowsExceptionForEmptyJson()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+
+        MockableDataCollection::json('foo');
+    }
+
+    public function testJsonMethodThrowsExceptionForBlankJson()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => ' ',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+
+        MockableDataCollection::json('foo');
+    }
+
+    public function testJsonMethodThrowsExceptionWhenJustOneFileIsInvalid()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.json' => '{"foo": "bar"}',
+            'foo/baz.json' => '{"foo": "baz"',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/baz.json'");
+
+        MockableDataCollection::json('foo');
+    }
+
     protected function assertFrontMatterCollectionStructure(array $expected, DataCollection $collection): void
     {
         $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);

From ebebaa17e670f9fcfbe7db9cad97d469dca1fb66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 21:11:59 +0200
Subject: [PATCH 1921/2811] Convert string interpolation to a 'sprintf()' call

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 85b0e78cfd1..0065b32981b 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -88,7 +88,7 @@ public static function json(string $name, bool $asArray = false): static
             $contents = Filesystem::getContents($file);
 
             if (! json_validate($contents)) {
-                throw new InvalidArgumentException("Invalid JSON in file: '$file'");
+                throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s'", $file));
             }
 
             return json_decode($contents, $asArray);

From 06dfada5a81b62f7ad61ab0fc7d1ed37f095ccb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 21:20:23 +0200
Subject: [PATCH 1922/2811] Display the error that caused the JSON decoding to
 fail

---
 .../framework/src/Support/DataCollection.php  |  2 +-
 .../tests/Unit/DataCollectionUnitTest.php     | 34 ++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 0065b32981b..fdea66b8867 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -88,7 +88,7 @@ public static function json(string $name, bool $asArray = false): static
             $contents = Filesystem::getContents($file);
 
             if (! json_validate($contents)) {
-                throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s'", $file));
+                throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s' (%s)", $file, json_last_error_msg()));
             }
 
             return json_decode($contents, $asArray);
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 336bb209e12..7f3eab684f5 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -250,7 +250,7 @@ public function testJsonMethodThrowsExceptionForInvalidJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -262,7 +262,7 @@ public function testJsonMethodThrowsExceptionForInvalidJsonWithArray()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo', true);
     }
@@ -274,7 +274,7 @@ public function testJsonMethodThrowsExceptionForEmptyJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -286,7 +286,7 @@ public function testJsonMethodThrowsExceptionForBlankJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json'");
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -299,7 +299,31 @@ public function testJsonMethodThrowsExceptionWhenJustOneFileIsInvalid()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/baz.json'");
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/baz.json' (Syntax error)");
+
+        MockableDataCollection::json('foo');
+    }
+
+    public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithUtfError()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/utf.json' => "\xB1\x31",
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/utf.json' (Malformed UTF-8 characters, possibly incorrectly encoded)");
+
+        MockableDataCollection::json('foo');
+    }
+
+    public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithControlCharacterError()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/control.json' => "\x19\x31",
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid JSON in file: 'foo/control.json' (Control character error, possibly incorrectly encoded)");
 
         MockableDataCollection::json('foo');
     }

From 9702722e7413ca1e5b61ac7b47a6e447668e45f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 24 Jun 2024 21:22:49 +0200
Subject: [PATCH 1923/2811] Document example to help issue searching lead to
 upgrade path

---
 RELEASE_NOTES.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 980fdd8e6dd..715166a87c5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -239,3 +239,9 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 If you start getting `InvalidArgumentException` when using the `DataCollection` class, it may be due to malformed data collection files.
 Starting from this version, we validate the syntax of JSON and YAML files during discovery, to help you catch errors early.
 See https://github.com/hydephp/develop/issues/1736 for more information.
+
+For example, an empty or malformed JSON file will now throw an exception like this:
+ 
+```php
+InvalidArgumentException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
+```

From b217795239460c06f5157a1cd01924d7e096b2f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 11:53:29 +0200
Subject: [PATCH 1924/2811] Throw a normalized exception for issues parsing
 Yaml

This better matches the JSON exception throwing. See https://github.com/hydephp/develop/issues/1736
---
 RELEASE_NOTES.md                              |  2 ++
 .../framework/src/Support/DataCollection.php  |  8 ++++-
 .../tests/Unit/DataCollectionUnitTest.php     | 36 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 715166a87c5..73109113ac5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -245,3 +245,5 @@ For example, an empty or malformed JSON file will now throw an exception like th
 ```php
 InvalidArgumentException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
+
+In order to normalize the thrown exceptions, we now rethrow Yaml `ParseException` as `InvalidArgumentException` to match the JSON validation.
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index fdea66b8867..21c7a728674 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -11,6 +11,7 @@
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Framework\Actions\MarkdownFileParser;
+use Symfony\Component\Yaml\Exception\ParseException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
@@ -69,7 +70,12 @@ public static function yaml(string $name): static
             $content = Filesystem::getContents($file);
 
             $content = Str::between($content, '---', '---');
-            $parsed = Yaml::parse($content) ?: [];
+
+            try {
+                $parsed = Yaml::parse($content) ?: [];
+            } catch (ParseException $exception) {
+                throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, $exception->getMessage()), previous: $exception);
+            }
 
             return new FrontMatter($parsed);
         });
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 7f3eab684f5..08b9ffc0404 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -217,6 +217,42 @@ public function testYamlCollectionsHandleLeadingAndTrailingNewlinesAndTrailingWh
         ], MockableDataCollection::yaml('foo'));
     }
 
+    public function testYamlCollectionsThrowExceptionForInvalidYaml()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => "---\nfoo: 'bar",
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\").)");
+
+        MockableDataCollection::yaml('foo');
+    }
+
+    public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorWithUtfError()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/utf.yml' => "foo: \xB1\x31",
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8.)");
+
+        MockableDataCollection::yaml('foo');
+    }
+
+    public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorWithTabsError()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/tabs.yml' => "foo:\n\tbar",
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\").)");
+
+        MockableDataCollection::yaml('foo');
+    }
+
     public function testJsonMethodReturnsCollectionOfJsonDecodedObjects()
     {
         MockableDataCollection::mockFiles([

From d08b1873b0ef0083569073f4a77c9a2af9d71527 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:13:28 +0200
Subject: [PATCH 1925/2811] Throw parse exception for empty Yaml to match
 `json_validate`

See https://github.com/hydephp/develop/issues/1736#issuecomment-2188298689
---
 RELEASE_NOTES.md                              |  1 +
 .../framework/src/Support/DataCollection.php  |  4 ++++
 .../tests/Feature/DataCollectionTest.php      |  2 --
 .../tests/Unit/DataCollectionUnitTest.php     | 24 +++++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 73109113ac5..15cd68599a1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -247,3 +247,4 @@ InvalidArgumentException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
 
 In order to normalize the thrown exceptions, we now rethrow Yaml `ParseException` as `InvalidArgumentException` to match the JSON validation.
+Additionally, an exception will be thrown if a JSON or YAML file is empty, as this is unlikely to be intentional.
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 21c7a728674..a551eb60c37 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -72,6 +72,10 @@ public static function yaml(string $name): static
             $content = Str::between($content, '---', '---');
 
             try {
+                if (blank(trim($content))) {
+                    throw new ParseException('File is empty');
+                }
+
                 $parsed = Yaml::parse($content) ?: [];
             } catch (ParseException $exception) {
                 throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, $exception->getMessage()), previous: $exception);
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 70587bdd95d..09ac73dacd0 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -33,12 +33,10 @@ public function testYamlCollections()
         $this->directory('resources/collections/foo');
         $this->markdown('resources/collections/foo/foo.yaml', matter: ['title' => 'Foo']);
         $this->file('resources/collections/foo/bar.yml', "---\ntitle: Bar\n---");
-        $this->file('resources/collections/foo/baz.yml');
 
         $this->assertEquals(new DataCollection([
             'foo/foo.yaml' => new FrontMatter(['title' => 'Foo']),
             'foo/bar.yml' => new FrontMatter(['title' => 'Bar']),
-            'foo/baz.yml' => new FrontMatter([]),
         ]), DataCollection::yaml('foo'));
     }
 
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 08b9ffc0404..cb64171a241 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -229,6 +229,30 @@ public function testYamlCollectionsThrowExceptionForInvalidYaml()
         MockableDataCollection::yaml('foo');
     }
 
+    public function testYamlCollectionsThrowExceptionForEmptyYaml()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => '',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (File is empty)");
+
+        MockableDataCollection::yaml('foo');
+    }
+
+    public function testYamlCollectionsThrowExceptionForBlankYaml()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.yml' => ' ',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (File is empty)");
+
+        MockableDataCollection::yaml('foo');
+    }
+
     public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorWithUtfError()
     {
         MockableDataCollection::mockFiles([

From f93cb0eec23bd2cfb27f1a31221bf23f96573a29 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:19:07 +0200
Subject: [PATCH 1926/2811] Document code reasoning

---
 packages/framework/src/Support/DataCollection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index a551eb60c37..2559eadd7ed 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -73,6 +73,7 @@ public static function yaml(string $name): static
 
             try {
                 if (blank(trim($content))) {
+                    // We throw an exception here in order to match the behavior of the JSON validation.
                     throw new ParseException('File is empty');
                 }
 

From b0d1e224072791a12e98eeaadf986eaf88e8b2ee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:26:16 +0200
Subject: [PATCH 1927/2811] Remove unreachable null coalesce

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 2559eadd7ed..98b2d3f735f 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -77,7 +77,7 @@ public static function yaml(string $name): static
                     throw new ParseException('File is empty');
                 }
 
-                $parsed = Yaml::parse($content) ?: [];
+                $parsed = Yaml::parse($content);
             } catch (ParseException $exception) {
                 throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, $exception->getMessage()), previous: $exception);
             }

From 65aadb5b6ad20871d292e1b15b232db93a2ef70b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:27:52 +0200
Subject: [PATCH 1928/2811] Trim trailing periods to make message fit in better

---
 packages/framework/src/Support/DataCollection.php        | 2 +-
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 98b2d3f735f..443ce5831b9 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -79,7 +79,7 @@ public static function yaml(string $name): static
 
                 $parsed = Yaml::parse($content);
             } catch (ParseException $exception) {
-                throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, $exception->getMessage()), previous: $exception);
+                throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
             }
 
             return new FrontMatter($parsed);
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cb64171a241..20de280cb73 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -224,7 +224,7 @@ public function testYamlCollectionsThrowExceptionForInvalidYaml()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\").)");
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\"))");
 
         MockableDataCollection::yaml('foo');
     }
@@ -260,7 +260,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8.)");
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8)");
 
         MockableDataCollection::yaml('foo');
     }
@@ -272,7 +272,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\").)");
+        $this->expectExceptionMessage("Invalid YAML in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\"))");
 
         MockableDataCollection::yaml('foo');
     }

From d4c970e947b98cb417fd8e2038e4c85cfcaa7c8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:28:46 +0200
Subject: [PATCH 1929/2811] Import used functions

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 443ce5831b9..96549f18d9f 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -15,10 +15,14 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
+use function trim;
+use function blank;
+use function rtrim;
 use function implode;
 use function json_decode;
 use function sprintf;
 use function unslash;
+use function json_last_error_msg;
 
 /**
  * Automatically generates Laravel Collections from static data files,

From 9f52220f8e2db60f297ad27b80987c55583b5a2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:31:49 +0200
Subject: [PATCH 1930/2811] Extract helper methods responsible for parsing each
 file

---
 .../framework/src/Support/DataCollection.php  | 63 ++++++++++++-------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 96549f18d9f..375a6f978ad 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -57,7 +57,7 @@ class DataCollection extends Collection
     public static function markdown(string $name): static
     {
         return static::discover($name, 'md', function (string $file): MarkdownDocument {
-            return MarkdownFileParser::parse($file);
+            return static::parseMarkdownFile($file);
         });
     }
 
@@ -71,22 +71,7 @@ public static function markdown(string $name): static
     public static function yaml(string $name): static
     {
         return static::discover($name, ['yaml', 'yml'], function (string $file): FrontMatter {
-            $content = Filesystem::getContents($file);
-
-            $content = Str::between($content, '---', '---');
-
-            try {
-                if (blank(trim($content))) {
-                    // We throw an exception here in order to match the behavior of the JSON validation.
-                    throw new ParseException('File is empty');
-                }
-
-                $parsed = Yaml::parse($content);
-            } catch (ParseException $exception) {
-                throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
-            }
-
-            return new FrontMatter($parsed);
+            return static::parseYamlFile($file);
         });
     }
 
@@ -100,13 +85,7 @@ public static function yaml(string $name): static
     public static function json(string $name, bool $asArray = false): static
     {
         return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array {
-            $contents = Filesystem::getContents($file);
-
-            if (! json_validate($contents)) {
-                throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s' (%s)", $file, json_last_error_msg()));
-            }
-
-            return json_decode($contents, $asArray);
+            return static::parseJsonFile($file, $asArray);
         });
     }
 
@@ -137,4 +116,40 @@ protected static function makeIdentifier(string $path): string
     {
         return unslash(Str::after($path, static::$sourceDirectory));
     }
+
+    protected static function parseMarkdownFile(string $file): MarkdownDocument
+    {
+        return MarkdownFileParser::parse($file);
+    }
+
+    protected static function parseYamlFile(string $file): FrontMatter
+    {
+        $content = Filesystem::getContents($file);
+
+        $content = Str::between($content, '---', '---');
+
+        try {
+            if (blank(trim($content))) {
+                // We throw an exception here in order to match the behavior of the JSON validation.
+                throw new ParseException('File is empty');
+            }
+
+            $parsed = Yaml::parse($content);
+        } catch (ParseException $exception) {
+            throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+        }
+
+        return new FrontMatter($parsed);
+    }
+
+    protected static function parseJsonFile(string $file, bool $asArray): stdClass|array
+    {
+        $contents = Filesystem::getContents($file);
+
+        if (! json_validate($contents)) {
+            throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s' (%s)", $file, json_last_error_msg()));
+        }
+
+        return json_decode($contents, $asArray);
+    }
 }

From 2d2cfe8c42cde32c7d1f2bb373e3a220437080d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:33:04 +0200
Subject: [PATCH 1931/2811] Convert simplified closures to arrow functions

---
 packages/framework/src/Support/DataCollection.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 375a6f978ad..b6a405409ea 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -56,9 +56,7 @@ class DataCollection extends Collection
      */
     public static function markdown(string $name): static
     {
-        return static::discover($name, 'md', function (string $file): MarkdownDocument {
-            return static::parseMarkdownFile($file);
-        });
+        return static::discover($name, 'md', fn (string $file): MarkdownDocument => static::parseMarkdownFile($file));
     }
 
     /**
@@ -70,9 +68,7 @@ public static function markdown(string $name): static
      */
     public static function yaml(string $name): static
     {
-        return static::discover($name, ['yaml', 'yml'], function (string $file): FrontMatter {
-            return static::parseYamlFile($file);
-        });
+        return static::discover($name, ['yaml', 'yml'], fn (string $file): FrontMatter => static::parseYamlFile($file));
     }
 
     /**
@@ -84,9 +80,7 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return static::discover($name, 'json', function (string $file) use ($asArray): stdClass|array {
-            return static::parseJsonFile($file, $asArray);
-        });
+        return static::discover($name, 'json', fn (string $file): stdClass|array => static::parseJsonFile($file, $asArray));
     }
 
     /**

From a99947a13b77b7e6d0cecabc9633921d5851ece5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:35:49 +0200
Subject: [PATCH 1932/2811] Document throws

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index b6a405409ea..5d5bce3a0f0 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -116,6 +116,7 @@ protected static function parseMarkdownFile(string $file): MarkdownDocument
         return MarkdownFileParser::parse($file);
     }
 
+    /** @throws InvalidArgumentException If the YAML is invalid and cannot be parsed. */
     protected static function parseYamlFile(string $file): FrontMatter
     {
         $content = Filesystem::getContents($file);
@@ -136,6 +137,7 @@ protected static function parseYamlFile(string $file): FrontMatter
         return new FrontMatter($parsed);
     }
 
+    /** @throws InvalidArgumentException If the JSON is invalid and cannot be parsed. */
     protected static function parseJsonFile(string $file, bool $asArray): stdClass|array
     {
         $contents = Filesystem::getContents($file);

From df820efa5af9bd304c6abbc19c7d8a7039c37c09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:37:50 +0200
Subject: [PATCH 1933/2811] Move return into try/catch block

Makes the intended execution flow clearer
---
 packages/framework/src/Support/DataCollection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 5d5bce3a0f0..4497f0043ee 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -130,11 +130,11 @@ protected static function parseYamlFile(string $file): FrontMatter
             }
 
             $parsed = Yaml::parse($content);
+
+            return new FrontMatter($parsed);
         } catch (ParseException $exception) {
             throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
         }
-
-        return new FrontMatter($parsed);
     }
 
     /** @throws InvalidArgumentException If the JSON is invalid and cannot be parsed. */

From 9b33cfd1ee464d83d775de65c345769926dbf479 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:38:06 +0200
Subject: [PATCH 1934/2811] Inline local variable

---
 packages/framework/src/Support/DataCollection.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 4497f0043ee..afde91abdac 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -129,9 +129,7 @@ protected static function parseYamlFile(string $file): FrontMatter
                 throw new ParseException('File is empty');
             }
 
-            $parsed = Yaml::parse($content);
-
-            return new FrontMatter($parsed);
+            return new FrontMatter(Yaml::parse($content));
         } catch (ParseException $exception) {
             throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
         }

From b933be67e91f275a29f66a775996fdaa62c5073a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:38:18 +0200
Subject: [PATCH 1935/2811] Cleanup formatting

---
 packages/framework/src/Support/DataCollection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index afde91abdac..8fffc214795 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -120,7 +120,6 @@ protected static function parseMarkdownFile(string $file): MarkdownDocument
     protected static function parseYamlFile(string $file): FrontMatter
     {
         $content = Filesystem::getContents($file);
-
         $content = Str::between($content, '---', '---');
 
         try {

From fc67b1178a364f321b4f028add769d265f2a395e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:41:35 +0200
Subject: [PATCH 1936/2811] Use first class callable syntax where possible

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 8fffc214795..e0a5dcef0fc 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -56,7 +56,7 @@ class DataCollection extends Collection
      */
     public static function markdown(string $name): static
     {
-        return static::discover($name, 'md', fn (string $file): MarkdownDocument => static::parseMarkdownFile($file));
+        return static::discover($name, 'md', static::parseMarkdownFile(...));
     }
 
     /**
@@ -68,7 +68,7 @@ public static function markdown(string $name): static
      */
     public static function yaml(string $name): static
     {
-        return static::discover($name, ['yaml', 'yml'], fn (string $file): FrontMatter => static::parseYamlFile($file));
+        return static::discover($name, ['yaml', 'yml'], static::parseYamlFile(...));
     }
 
     /**

From 88a92042295302ce208c00c9c2cdda67e19ff0c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:43:54 +0200
Subject: [PATCH 1937/2811] Support passing extra arguments to discover method

In order to support first class callables
---
 packages/framework/src/Support/DataCollection.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index e0a5dcef0fc..704e48a9c6b 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -80,7 +80,7 @@ public static function yaml(string $name): static
      */
     public static function json(string $name, bool $asArray = false): static
     {
-        return static::discover($name, 'json', fn (string $file): stdClass|array => static::parseJsonFile($file, $asArray));
+        return static::discover($name, 'json', static::parseJsonFile(...), [$asArray]);
     }
 
     /**
@@ -88,10 +88,10 @@ public static function json(string $name, bool $asArray = false): static
      * @param  callable(string): mixed  $parseUsing
      * @return static<string, mixed>
      */
-    protected static function discover(string $name, array|string $extensions, callable $parseUsing): static
+    protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $args = []): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing): array {
-            return [static::makeIdentifier($file) => $parseUsing($file)];
+        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $args): array {
+            return [static::makeIdentifier($file) => $parseUsing($file, ...$args)];
         }));
     }
 

From dc26d8826d26ebda2d38ba46b3e072b4271fc658 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:44:29 +0200
Subject: [PATCH 1938/2811] Clarify parameter name

---
 packages/framework/src/Support/DataCollection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 704e48a9c6b..9e6ea8c80d2 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -88,10 +88,10 @@ public static function json(string $name, bool $asArray = false): static
      * @param  callable(string): mixed  $parseUsing
      * @return static<string, mixed>
      */
-    protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $args = []): static
+    protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $args): array {
-            return [static::makeIdentifier($file) => $parseUsing($file, ...$args)];
+        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $extraArgs): array {
+            return [static::makeIdentifier($file) => $parseUsing($file, ...$extraArgs)];
         }));
     }
 

From ea04ed1448bb3fa8b1f4a204ce21c4c42515d94d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:45:31 +0200
Subject: [PATCH 1939/2811] Narrow down mixed generic return type to actual
 supported types

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 9e6ea8c80d2..a709d76cce8 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -86,7 +86,7 @@ public static function json(string $name, bool $asArray = false): static
     /**
      * @param  array<string>|string  $extensions
      * @param  callable(string): mixed  $parseUsing
-     * @return static<string, mixed>
+     * @return static<string, MarkdownDocument|FrontMatter|stdClass|array>
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {

From 670dd7aeeb4b7482dea96fd0039f16bac5e4212a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:53:24 +0200
Subject: [PATCH 1940/2811] Extract testing helper

---
 .../tests/Unit/DataCollectionUnitTest.php         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 20de280cb73..313147c5fea 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -112,14 +112,10 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
             'foo/baz.md' => 'baz',
         ]);
 
-        $collection = MockableDataCollection::markdown('foo');
-
-        $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
-
-        $this->assertSame([
+        $this->asserMarkdownCollectionStructure([
             'foo/bar.md' => 'bar',
             'foo/baz.md' => 'baz',
-        ], $collection->map(fn ($value) => (string) $value)->all());
+        ], MockableDataCollection::markdown('foo'));
     }
 
     public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
@@ -388,6 +384,13 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithC
         MockableDataCollection::json('foo');
     }
 
+    protected function asserMarkdownCollectionStructure(array $expected, DataCollection $collection): void
+    {
+        $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
+
+        $this->assertSame($expected, $collection->map(fn ($value) => (string) $value)->all());
+    }
+
     protected function assertFrontMatterCollectionStructure(array $expected, DataCollection $collection): void
     {
         $this->assertContainsOnlyInstancesOf(FrontMatter::class, $collection);

From e32f6f8508cecd6e9fb9f9541011d660a57145d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 12:58:17 +0200
Subject: [PATCH 1941/2811] Update testing helper to compare front matter

---
 .../tests/Unit/DataCollectionUnitTest.php        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 313147c5fea..204b4713a1b 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -388,7 +388,21 @@ protected function asserMarkdownCollectionStructure(array $expected, DataCollect
     {
         $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
 
-        $this->assertSame($expected, $collection->map(fn ($value) => (string) $value)->all());
+        if ($collection->contains(fn (MarkdownDocument $document) => filled($document->matter()->toArray()))) {
+            $expected = collect($expected)->map(fn ($value) => [
+                'matter' => $value['matter'],
+                'content' => $value['content'],
+            ])->all();
+
+            $collection = $collection->map(fn (MarkdownDocument $document) => [
+                'matter' => $document->matter()->toArray(),
+                'content' => $document->markdown()->body(),
+            ]);
+
+            $this->assertSame($expected, $collection->all());
+        } else {
+            $this->assertSame($expected, $collection->map(fn ($value) => (string) $value)->all());
+        }
     }
 
     protected function assertFrontMatterCollectionStructure(array $expected, DataCollection $collection): void

From 6c1497b321bbadb5f9f3819ceb8fecf623212c78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:00:08 +0200
Subject: [PATCH 1942/2811] Support mixed states

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 204b4713a1b..ca9fe6d3c77 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -389,10 +389,10 @@ protected function asserMarkdownCollectionStructure(array $expected, DataCollect
         $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
 
         if ($collection->contains(fn (MarkdownDocument $document) => filled($document->matter()->toArray()))) {
-            $expected = collect($expected)->map(fn ($value) => [
+            $expected = collect($expected)->map(fn ($value) => is_array($value) ? [
                 'matter' => $value['matter'],
                 'content' => $value['content'],
-            ])->all();
+            ] : (string) $value)->all();
 
             $collection = $collection->map(fn (MarkdownDocument $document) => [
                 'matter' => $document->matter()->toArray(),

From 8be9527a9cd55396c0561c160196bd9e58b8f55e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:00:20 +0200
Subject: [PATCH 1943/2811] Test Markdown collections with front matter

---
 .../tests/Unit/DataCollectionUnitTest.php     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index ca9fe6d3c77..9666bea8426 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -118,6 +118,44 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
         ], MockableDataCollection::markdown('foo'));
     }
 
+    public function testMarkdownMethodReturnsCollectionOfMarkdownDocumentsWithFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\nfoo: bar\n---\nbar",
+            'foo/baz.md' => "---\nfoo: baz\n---\nbaz",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => [
+                'matter' => ['foo' => 'bar'],
+                'content' => 'bar',
+            ],
+            'foo/baz.md' => [
+                'matter' => ['foo' => 'baz'],
+                'content' => 'baz',
+            ],
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodReturnsCollectionOfMarkdownDocumentsWithOnlyOneHavingFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => 'bar',
+            'foo/baz.md' => "---\nfoo: baz\n---\nbaz",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => [
+                'matter' => [],
+                'content' => 'bar',
+            ],
+            'foo/baz.md' => [
+                'matter' => ['foo' => 'baz'],
+                'content' => 'baz',
+            ],
+        ], MockableDataCollection::markdown('foo'));
+    }
+
     public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
     {
         MockableDataCollection::mockFiles([

From bde59d8c9683de7cb119213015e510fc33dca8ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:07:03 +0200
Subject: [PATCH 1944/2811] Add edge case tests

---
 .../tests/Unit/DataCollectionUnitTest.php     | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 9666bea8426..ee03c4cff40 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -156,6 +156,75 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocumentsWithOnlyOn
         ], MockableDataCollection::markdown('foo'));
     }
 
+    public function testMarkdownMethodWithEmptyFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\n---\nbar",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => 'bar',
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodWithEmptyFrontMatterAndContent()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\n---",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => '',
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodWithEmptyContent()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\nfoo: bar\n---",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => [
+                'matter' => ['foo' => 'bar'],
+                'content' => '',
+            ],
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodWithEmptyFile()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => '',
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => '',
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodWithUnterminatedFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\nfoo: bar\nbar",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => "---\nfoo: bar\nbar",
+        ], MockableDataCollection::markdown('foo'));
+    }
+
+    public function testMarkdownMethodWithUninitializedFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "foo: bar\n---\nbar",
+        ]);
+
+        $this->asserMarkdownCollectionStructure([
+            'foo/bar.md' => "foo: bar\n---\nbar",
+        ], MockableDataCollection::markdown('foo'));
+    }
+
     public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
     {
         MockableDataCollection::mockFiles([

From 11a9205e99b1c6cdf5ad49b62e628bf7639e5448 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:07:33 +0200
Subject: [PATCH 1945/2811] Fix typo in testing helper name

---
 .../tests/Unit/DataCollectionUnitTest.php     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index ee03c4cff40..5566c291862 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -112,7 +112,7 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocuments()
             'foo/baz.md' => 'baz',
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => 'bar',
             'foo/baz.md' => 'baz',
         ], MockableDataCollection::markdown('foo'));
@@ -125,7 +125,7 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocumentsWithFrontM
             'foo/baz.md' => "---\nfoo: baz\n---\nbaz",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => [
                 'matter' => ['foo' => 'bar'],
                 'content' => 'bar',
@@ -144,7 +144,7 @@ public function testMarkdownMethodReturnsCollectionOfMarkdownDocumentsWithOnlyOn
             'foo/baz.md' => "---\nfoo: baz\n---\nbaz",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => [
                 'matter' => [],
                 'content' => 'bar',
@@ -162,7 +162,7 @@ public function testMarkdownMethodWithEmptyFrontMatter()
             'foo/bar.md' => "---\n---\nbar",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => 'bar',
         ], MockableDataCollection::markdown('foo'));
     }
@@ -173,7 +173,7 @@ public function testMarkdownMethodWithEmptyFrontMatterAndContent()
             'foo/bar.md' => "---\n---",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => '',
         ], MockableDataCollection::markdown('foo'));
     }
@@ -184,7 +184,7 @@ public function testMarkdownMethodWithEmptyContent()
             'foo/bar.md' => "---\nfoo: bar\n---",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => [
                 'matter' => ['foo' => 'bar'],
                 'content' => '',
@@ -198,7 +198,7 @@ public function testMarkdownMethodWithEmptyFile()
             'foo/bar.md' => '',
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => '',
         ], MockableDataCollection::markdown('foo'));
     }
@@ -209,7 +209,7 @@ public function testMarkdownMethodWithUnterminatedFrontMatter()
             'foo/bar.md' => "---\nfoo: bar\nbar",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => "---\nfoo: bar\nbar",
         ], MockableDataCollection::markdown('foo'));
     }
@@ -220,7 +220,7 @@ public function testMarkdownMethodWithUninitializedFrontMatter()
             'foo/bar.md' => "foo: bar\n---\nbar",
         ]);
 
-        $this->asserMarkdownCollectionStructure([
+        $this->assertMarkdownCollectionStructure([
             'foo/bar.md' => "foo: bar\n---\nbar",
         ], MockableDataCollection::markdown('foo'));
     }
@@ -491,7 +491,7 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithC
         MockableDataCollection::json('foo');
     }
 
-    protected function asserMarkdownCollectionStructure(array $expected, DataCollection $collection): void
+    protected function assertMarkdownCollectionStructure(array $expected, DataCollection $collection): void
     {
         $this->assertContainsOnlyInstancesOf(MarkdownDocument::class, $collection);
 

From 30c2a7425332f7b57d3ca77f4454c1aa6dccc0db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:08:07 +0200
Subject: [PATCH 1946/2811] Test Markdown method with invalid front matter

---
 .../framework/tests/Unit/DataCollectionUnitTest.php  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 5566c291862..07d1a408727 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -14,6 +14,7 @@
 use Mockery;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
+use Symfony\Component\Yaml\Exception\ParseException;
 
 /**
  * @covers \Hyde\Support\DataCollection
@@ -225,6 +226,17 @@ public function testMarkdownMethodWithUninitializedFrontMatter()
         ], MockableDataCollection::markdown('foo'));
     }
 
+    public function testMarkdownMethodWithInvalidFrontMatter()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => "---\nfoo: 'bar\n---\nbar",
+        ]);
+
+        $this->expectException(ParseException::class);
+
+        MockableDataCollection::markdown('foo');
+    }
+
     public function testYamlMethodReturnsCollectionOfFrontMatterObjects()
     {
         MockableDataCollection::mockFiles([

From 9ca7a795f37817d84a35e7e245a30ba7769fcb8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 13:13:18 +0200
Subject: [PATCH 1947/2811] Normalize exception handling for Markdown data
 files

---
 packages/framework/src/Support/DataCollection.php        | 7 ++++++-
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index a709d76cce8..f72f471aa82 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -111,9 +111,14 @@ protected static function makeIdentifier(string $path): string
         return unslash(Str::after($path, static::$sourceDirectory));
     }
 
+    /** @throws InvalidArgumentException If the Markdown is invalid and cannot be parsed. */
     protected static function parseMarkdownFile(string $file): MarkdownDocument
     {
-        return MarkdownFileParser::parse($file);
+        try {
+            return MarkdownFileParser::parse($file);
+        } catch (ParseException $exception) {
+            throw new InvalidArgumentException(sprintf("Invalid Markdown in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+        }
     }
 
     /** @throws InvalidArgumentException If the YAML is invalid and cannot be parsed. */
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 07d1a408727..097712f0490 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -14,7 +14,6 @@
 use Mockery;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
-use Symfony\Component\Yaml\Exception\ParseException;
 
 /**
  * @covers \Hyde\Support\DataCollection
@@ -232,7 +231,8 @@ public function testMarkdownMethodWithInvalidFrontMatter()
             'foo/bar.md' => "---\nfoo: 'bar\n---\nbar",
         ]);
 
-        $this->expectException(ParseException::class);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (Malformed inline YAML string at line 1 (near \"foo: 'bar\"))");
 
         MockableDataCollection::markdown('foo');
     }

From 4ecabc9a581a439e559a9ebfbb00e7a835cf5b7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 14:14:25 +0200
Subject: [PATCH 1948/2811] Throw an exception when Markdown data file is empty

And no front matter is set
---
 .../framework/src/Support/DataCollection.php  |  8 ++++-
 .../tests/Feature/DataCollectionTest.php      | 32 +++++++++----------
 .../tests/Unit/DataCollectionUnitTest.php     | 20 ++++++------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index f72f471aa82..995c44bb174 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -115,7 +115,13 @@ protected static function makeIdentifier(string $path): string
     protected static function parseMarkdownFile(string $file): MarkdownDocument
     {
         try {
-            return MarkdownFileParser::parse($file);
+            $document = MarkdownFileParser::parse($file);
+
+            if (blank(trim($document->markdown()->body())) && $document->matter()->toArray() === []) {
+                throw new ParseException('File is empty');
+            }
+
+            return $document;
         } catch (ParseException $exception) {
             throw new InvalidArgumentException(sprintf("Invalid Markdown in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
         }
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 09ac73dacd0..7577da7de8a 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -20,11 +20,11 @@ public function testMarkdownCollections()
     {
         $this->directory('resources/collections/foo');
         $this->markdown('resources/collections/foo/foo.md', 'Hello World', ['title' => 'Foo']);
-        $this->file('resources/collections/foo/bar.md');
+        $this->file('resources/collections/foo/bar.md', 'Foo');
 
         $this->assertEquals(new DataCollection([
             'foo/foo.md' => new MarkdownDocument(['title' => 'Foo'], 'Hello World'),
-            'foo/bar.md' => new MarkdownDocument([], ''),
+            'foo/bar.md' => new MarkdownDocument([], 'Foo'),
         ]), DataCollection::markdown('foo'));
     }
 
@@ -91,8 +91,8 @@ public function testFindMarkdownFilesMethodReturnsEmptyArrayIfNoFilesAreFoundInS
     public function testFindMarkdownFilesMethodReturnsAnArrayOfMarkdownFilesInTheSpecifiedDirectory()
     {
         $this->directory('resources/collections/foo');
-        $this->file('resources/collections/foo/foo.md');
-        $this->file('resources/collections/foo/bar.md');
+        $this->file('resources/collections/foo/foo.md', 'Foo');
+        $this->file('resources/collections/foo/bar.md', 'Bar');
 
         $this->assertSame([
             'foo/bar.md',
@@ -104,8 +104,8 @@ public function testFindMarkdownFilesMethodDoesNotIncludeFilesInSubdirectories()
     {
         $this->directory('resources/collections/foo');
         $this->directory('resources/collections/foo/bar');
-        $this->file('resources/collections/foo/foo.md');
-        $this->file('resources/collections/foo/bar/bar.md');
+        $this->file('resources/collections/foo/foo.md', 'Foo');
+        $this->file('resources/collections/foo/bar/bar.md', 'Bar');
 
         $this->assertSame([
             'foo/foo.md',
@@ -115,8 +115,8 @@ public function testFindMarkdownFilesMethodDoesNotIncludeFilesInSubdirectories()
     public function testFindMarkdownFilesMethodDoesNotIncludeFilesWithExtensionsOtherThanMd()
     {
         $this->directory('resources/collections/foo');
-        $this->file('resources/collections/foo/foo.md');
-        $this->file('resources/collections/foo/bar.txt');
+        $this->file('resources/collections/foo/foo.md', 'Foo');
+        $this->file('resources/collections/foo/bar.txt', 'Bar');
 
         $this->assertSame([
             'foo/foo.md',
@@ -126,7 +126,7 @@ public function testFindMarkdownFilesMethodDoesNotIncludeFilesWithExtensionsOthe
     public function testFindMarkdownFilesMethodDoesNotRemoveFilesStartingWithAnUnderscore()
     {
         $this->directory('resources/collections/foo');
-        $this->file('resources/collections/foo/_foo.md');
+        $this->file('resources/collections/foo/_foo.md', 'Foo');
 
         $this->assertSame([
             'foo/_foo.md',
@@ -136,20 +136,20 @@ public function testFindMarkdownFilesMethodDoesNotRemoveFilesStartingWithAnUnder
     public function testStaticMarkdownHelperDiscoversAndParsesMarkdownFilesInTheSpecifiedDirectory()
     {
         $this->directory('resources/collections/foo');
-        $this->file('resources/collections/foo/foo.md');
-        $this->file('resources/collections/foo/bar.md');
+        $this->file('resources/collections/foo/foo.md', 'Foo');
+        $this->file('resources/collections/foo/bar.md', 'Bar');
 
         $this->assertEquals([
-            'foo/foo.md' => new MarkdownDocument([], ''),
-            'foo/bar.md' => new MarkdownDocument([], ''),
+            'foo/foo.md' => new MarkdownDocument([], 'Foo'),
+            'foo/bar.md' => new MarkdownDocument([], 'Bar'),
         ], DataCollection::markdown('foo')->toArray());
     }
 
     public function testStaticMarkdownHelperDoestNotIgnoreFilesStartingWithAnUnderscore()
     {
         $this->directory('resources/collections/foo');
-        $this->file('resources/collections/foo/foo.md');
-        $this->file('resources/collections/foo/_bar.md');
+        $this->file('resources/collections/foo/foo.md', 'Foo');
+        $this->file('resources/collections/foo/_bar.md', 'Bar');
 
         $this->assertCount(2, DataCollection::markdown('foo'));
     }
@@ -158,7 +158,7 @@ public function testSourceDirectoryCanBeChanged()
     {
         DataCollection::$sourceDirectory = 'foo';
         $this->directory('foo/bar');
-        $this->file('foo/bar/foo.md');
+        $this->file('foo/bar/foo.md', 'Foo');
 
         $this->assertSame([
             'bar/foo.md',
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 097712f0490..696f6fbfdbf 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -167,18 +167,19 @@ public function testMarkdownMethodWithEmptyFrontMatter()
         ], MockableDataCollection::markdown('foo'));
     }
 
-    public function testMarkdownMethodWithEmptyFrontMatterAndContent()
+    public function testMarkdownMethodWithEmptyFrontMatterAndContentThrowsException()
     {
         MockableDataCollection::mockFiles([
             'foo/bar.md' => "---\n---",
         ]);
 
-        $this->assertMarkdownCollectionStructure([
-            'foo/bar.md' => '',
-        ], MockableDataCollection::markdown('foo'));
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
+
+        MockableDataCollection::markdown('foo');
     }
 
-    public function testMarkdownMethodWithEmptyContent()
+    public function testMarkdownMethodWithEmptyContentIsAcceptableIfFrontMatterIsSet()
     {
         MockableDataCollection::mockFiles([
             'foo/bar.md' => "---\nfoo: bar\n---",
@@ -192,15 +193,16 @@ public function testMarkdownMethodWithEmptyContent()
         ], MockableDataCollection::markdown('foo'));
     }
 
-    public function testMarkdownMethodWithEmptyFile()
+    public function testMarkdownMethodWithEmptyFileThrowsException()
     {
         MockableDataCollection::mockFiles([
             'foo/bar.md' => '',
         ]);
 
-        $this->assertMarkdownCollectionStructure([
-            'foo/bar.md' => '',
-        ], MockableDataCollection::markdown('foo'));
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
+
+        MockableDataCollection::markdown('foo');
     }
 
     public function testMarkdownMethodWithUnterminatedFrontMatter()

From 005dc15f0a1a863505eb97a54fdeb3883f458dad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 14:14:44 +0200
Subject: [PATCH 1949/2811] Reorder test methods

---
 .../tests/Unit/DataCollectionUnitTest.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 696f6fbfdbf..b8bcc94aae8 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -167,6 +167,18 @@ public function testMarkdownMethodWithEmptyFrontMatter()
         ], MockableDataCollection::markdown('foo'));
     }
 
+    public function testMarkdownMethodWithEmptyFileThrowsException()
+    {
+        MockableDataCollection::mockFiles([
+            'foo/bar.md' => '',
+        ]);
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
+
+        MockableDataCollection::markdown('foo');
+    }
+
     public function testMarkdownMethodWithEmptyFrontMatterAndContentThrowsException()
     {
         MockableDataCollection::mockFiles([
@@ -193,18 +205,6 @@ public function testMarkdownMethodWithEmptyContentIsAcceptableIfFrontMatterIsSet
         ], MockableDataCollection::markdown('foo'));
     }
 
-    public function testMarkdownMethodWithEmptyFileThrowsException()
-    {
-        MockableDataCollection::mockFiles([
-            'foo/bar.md' => '',
-        ]);
-
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
-
-        MockableDataCollection::markdown('foo');
-    }
-
     public function testMarkdownMethodWithUnterminatedFrontMatter()
     {
         MockableDataCollection::mockFiles([

From ab762b917524d63e98cbb002ff9c32d337d57695 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 14:15:13 +0200
Subject: [PATCH 1950/2811] Remove unnecessary trim already run in blank
 function

---
 packages/framework/src/Support/DataCollection.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 995c44bb174..26f1d064780 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -15,7 +15,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
-use function trim;
 use function blank;
 use function rtrim;
 use function implode;
@@ -117,7 +116,7 @@ protected static function parseMarkdownFile(string $file): MarkdownDocument
         try {
             $document = MarkdownFileParser::parse($file);
 
-            if (blank(trim($document->markdown()->body())) && $document->matter()->toArray() === []) {
+            if (blank($document->markdown()->body()) && $document->matter()->toArray() === []) {
                 throw new ParseException('File is empty');
             }
 
@@ -134,7 +133,7 @@ protected static function parseYamlFile(string $file): FrontMatter
         $content = Str::between($content, '---', '---');
 
         try {
-            if (blank(trim($content))) {
+            if (blank($content)) {
                 // We throw an exception here in order to match the behavior of the JSON validation.
                 throw new ParseException('File is empty');
             }

From 6d81d4188db719b2c0b1153d3be151a6c131660d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 15:41:10 +0200
Subject: [PATCH 1951/2811] Cleanup code

---
 packages/framework/src/Support/DataCollection.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 26f1d064780..49677e51a72 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -134,7 +134,6 @@ protected static function parseYamlFile(string $file): FrontMatter
 
         try {
             if (blank($content)) {
-                // We throw an exception here in order to match the behavior of the JSON validation.
                 throw new ParseException('File is empty');
             }
 

From 5cf056db63ca44da5674e6d609eab8ddc1ebc9dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 15:41:53 +0200
Subject: [PATCH 1952/2811] Introduce local variable

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

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 49677e51a72..387a7593f85 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -90,7 +90,9 @@ public static function json(string $name, bool $asArray = false): static
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
         return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $extraArgs): array {
-            return [static::makeIdentifier($file) => $parseUsing($file, ...$extraArgs)];
+            $parsed = $parseUsing($file, ...$extraArgs);
+
+            return [static::makeIdentifier($file) => $parsed];
         }));
     }
 

From 6ffd6f94fa7aa804354d96ca0552d992e977bcef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 15:47:57 +0200
Subject: [PATCH 1953/2811] Refactor to have single try/catch block in loop

---
 .../framework/src/Support/DataCollection.php  | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 387a7593f85..3e3be1eabb3 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -5,6 +5,7 @@
 namespace Hyde\Support;
 
 use stdClass;
+use Illuminate\Support\Arr;
 use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 use Symfony\Component\Yaml\Yaml;
@@ -86,11 +87,25 @@ public static function json(string $name, bool $asArray = false): static
      * @param  array<string>|string  $extensions
      * @param  callable(string): mixed  $parseUsing
      * @return static<string, MarkdownDocument|FrontMatter|stdClass|array>
+     *
+     * @throws \InvalidArgumentException if the file is empty or cannot be parsed.
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $extraArgs): array {
-            $parsed = $parseUsing($file, ...$extraArgs);
+        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($extensions, $parseUsing, $extraArgs): array {
+            try {
+                $parsed = $parseUsing($file, ...$extraArgs);
+            } catch (ParseException $exception) {
+                $array = Arr::wrap($extensions);
+                $type = match (array_shift($array)) {
+                    'md' => 'Markdown',
+                    'yaml', 'yml' => 'YAML',
+                    'json' => 'JSON',
+                    default => 'Unknown',
+                };
+
+                throw new InvalidArgumentException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+            }
 
             return [static::makeIdentifier($file) => $parsed];
         }));
@@ -112,46 +127,35 @@ protected static function makeIdentifier(string $path): string
         return unslash(Str::after($path, static::$sourceDirectory));
     }
 
-    /** @throws InvalidArgumentException If the Markdown is invalid and cannot be parsed. */
     protected static function parseMarkdownFile(string $file): MarkdownDocument
     {
-        try {
-            $document = MarkdownFileParser::parse($file);
-
-            if (blank($document->markdown()->body()) && $document->matter()->toArray() === []) {
-                throw new ParseException('File is empty');
-            }
+        $document = MarkdownFileParser::parse($file);
 
-            return $document;
-        } catch (ParseException $exception) {
-            throw new InvalidArgumentException(sprintf("Invalid Markdown in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+        if (blank($document->markdown()->body()) && $document->matter()->toArray() === []) {
+            throw new ParseException('File is empty');
         }
+
+        return $document;
     }
 
-    /** @throws InvalidArgumentException If the YAML is invalid and cannot be parsed. */
     protected static function parseYamlFile(string $file): FrontMatter
     {
         $content = Filesystem::getContents($file);
         $content = Str::between($content, '---', '---');
 
-        try {
-            if (blank($content)) {
-                throw new ParseException('File is empty');
-            }
-
-            return new FrontMatter(Yaml::parse($content));
-        } catch (ParseException $exception) {
-            throw new InvalidArgumentException(sprintf("Invalid YAML in file: '%s' (%s)", $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+        if (blank($content)) {
+            throw new ParseException('File is empty');
         }
+
+        return new FrontMatter(Yaml::parse($content));
     }
 
-    /** @throws InvalidArgumentException If the JSON is invalid and cannot be parsed. */
     protected static function parseJsonFile(string $file, bool $asArray): stdClass|array
     {
         $contents = Filesystem::getContents($file);
 
         if (! json_validate($contents)) {
-            throw new InvalidArgumentException(sprintf("Invalid JSON in file: '%s' (%s)", $file, json_last_error_msg()));
+            throw new ParseException(json_last_error_msg());
         }
 
         return json_decode($contents, $asArray);

From 415a32ae102721207a3e2beac855544295b88546 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 15:55:50 +0200
Subject: [PATCH 1954/2811] Simplify and cleanup exception file type label
 handing

---
 .../framework/src/Support/DataCollection.php  |  8 +------
 .../tests/Unit/DataCollectionUnitTest.php     | 24 +++++++++----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 3e3be1eabb3..d37624d34a7 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -96,13 +96,7 @@ protected static function discover(string $name, array|string $extensions, calla
             try {
                 $parsed = $parseUsing($file, ...$extraArgs);
             } catch (ParseException $exception) {
-                $array = Arr::wrap($extensions);
-                $type = match (array_shift($array)) {
-                    'md' => 'Markdown',
-                    'yaml', 'yml' => 'YAML',
-                    'json' => 'JSON',
-                    default => 'Unknown',
-                };
+                $type = $extensions === 'md' ? 'Markdown' : ucfirst(Arr::first(Arr::wrap($extensions)));
 
                 throw new InvalidArgumentException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
             }
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index b8bcc94aae8..cc7a3a92044 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -341,7 +341,7 @@ public function testYamlCollectionsThrowExceptionForInvalidYaml()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\"))");
+        $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\"))");
 
         MockableDataCollection::yaml('foo');
     }
@@ -353,7 +353,7 @@ public function testYamlCollectionsThrowExceptionForEmptyYaml()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (File is empty)");
+        $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (File is empty)");
 
         MockableDataCollection::yaml('foo');
     }
@@ -365,7 +365,7 @@ public function testYamlCollectionsThrowExceptionForBlankYaml()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/bar.yml' (File is empty)");
+        $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (File is empty)");
 
         MockableDataCollection::yaml('foo');
     }
@@ -377,7 +377,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8)");
+        $this->expectExceptionMessage("Invalid Yaml in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8)");
 
         MockableDataCollection::yaml('foo');
     }
@@ -389,7 +389,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid YAML in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\"))");
+        $this->expectExceptionMessage("Invalid Yaml in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\"))");
 
         MockableDataCollection::yaml('foo');
     }
@@ -427,7 +427,7 @@ public function testJsonMethodThrowsExceptionForInvalidJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -439,7 +439,7 @@ public function testJsonMethodThrowsExceptionForInvalidJsonWithArray()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo', true);
     }
@@ -451,7 +451,7 @@ public function testJsonMethodThrowsExceptionForEmptyJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -463,7 +463,7 @@ public function testJsonMethodThrowsExceptionForBlankJson()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/bar.json' (Syntax error)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -476,7 +476,7 @@ public function testJsonMethodThrowsExceptionWhenJustOneFileIsInvalid()
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/baz.json' (Syntax error)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/baz.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
     }
@@ -488,7 +488,7 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithU
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/utf.json' (Malformed UTF-8 characters, possibly incorrectly encoded)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/utf.json' (Malformed UTF-8 characters, possibly incorrectly encoded)");
 
         MockableDataCollection::json('foo');
     }
@@ -500,7 +500,7 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithC
         ]);
 
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage("Invalid JSON in file: 'foo/control.json' (Control character error, possibly incorrectly encoded)");
+        $this->expectExceptionMessage("Invalid Json in file: 'foo/control.json' (Control character error, possibly incorrectly encoded)");
 
         MockableDataCollection::json('foo');
     }

From 558f407d9559e2d18c601cb297a8b43aeb65ef1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:03:07 +0200
Subject: [PATCH 1955/2811] Create ParseException.php

---
 .../src/Markdown/Exceptions/ParseException.php       | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/framework/src/Markdown/Exceptions/ParseException.php

diff --git a/packages/framework/src/Markdown/Exceptions/ParseException.php b/packages/framework/src/Markdown/Exceptions/ParseException.php
new file mode 100644
index 00000000000..e2ebc466a16
--- /dev/null
+++ b/packages/framework/src/Markdown/Exceptions/ParseException.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Markdown\Exceptions;
+
+use RuntimeException;
+
+class ParseException extends RunTimeException
+{
+    //
+}

From 86c6147bcd75c14b2d7ee702f3b0b83916ccc46f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:04:26 +0200
Subject: [PATCH 1956/2811] Throw our ParseException instead of
 InvalidArgumentException

Gives us more control, and adds more clarity and makes it easier to debug errors.
---
 RELEASE_NOTES.md                              |  6 ++--
 .../framework/src/Support/DataCollection.php  |  5 ++-
 .../tests/Unit/DataCollectionUnitTest.php     | 32 +++++++++----------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 15cd68599a1..567af1b8217 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -236,15 +236,15 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 
 #### Issues that may arise
 
-If you start getting `InvalidArgumentException` when using the `DataCollection` class, it may be due to malformed data collection files.
+If you start getting a `ParseException` when using the `DataCollection` class, it may be due to malformed data collection files.
 Starting from this version, we validate the syntax of JSON and YAML files during discovery, to help you catch errors early.
 See https://github.com/hydephp/develop/issues/1736 for more information.
 
 For example, an empty or malformed JSON file will now throw an exception like this:
  
 ```php
-InvalidArgumentException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
+\Hyde\Markdown\Exceptions\ParseException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
 
-In order to normalize the thrown exceptions, we now rethrow Yaml `ParseException` as `InvalidArgumentException` to match the JSON validation.
+In order to normalize the thrown exceptions, we now rethrow `Symfony/Yaml` `ParseException` as our custom `ParseException` to match the JSON validation.
 Additionally, an exception will be thrown if a JSON or YAML file is empty, as this is unlikely to be intentional.
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index d37624d34a7..d884da176b0 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -7,7 +7,6 @@
 use stdClass;
 use Illuminate\Support\Arr;
 use Hyde\Facades\Filesystem;
-use InvalidArgumentException;
 use Symfony\Component\Yaml\Yaml;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
@@ -88,7 +87,7 @@ public static function json(string $name, bool $asArray = false): static
      * @param  callable(string): mixed  $parseUsing
      * @return static<string, MarkdownDocument|FrontMatter|stdClass|array>
      *
-     * @throws \InvalidArgumentException if the file is empty or cannot be parsed.
+     * @throws \Hyde\Markdown\Exceptions\ParseException If the file is empty or invalid.
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
@@ -98,7 +97,7 @@ protected static function discover(string $name, array|string $extensions, calla
             } catch (ParseException $exception) {
                 $type = $extensions === 'md' ? 'Markdown' : ucfirst(Arr::first(Arr::wrap($extensions)));
 
-                throw new InvalidArgumentException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+                throw new \Hyde\Markdown\Exceptions\ParseException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
             }
 
             return [static::makeIdentifier($file) => $parsed];
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cc7a3a92044..863206af5d9 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
+use Hyde\Markdown\Exceptions\ParseException;
 use Hyde\Support\DataCollection;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Filesystem\Filesystem;
@@ -173,7 +173,7 @@ public function testMarkdownMethodWithEmptyFileThrowsException()
             'foo/bar.md' => '',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
 
         MockableDataCollection::markdown('foo');
@@ -185,7 +185,7 @@ public function testMarkdownMethodWithEmptyFrontMatterAndContentThrowsException(
             'foo/bar.md' => "---\n---",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (File is empty)");
 
         MockableDataCollection::markdown('foo');
@@ -233,7 +233,7 @@ public function testMarkdownMethodWithInvalidFrontMatter()
             'foo/bar.md' => "---\nfoo: 'bar\n---\nbar",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Markdown in file: 'foo/bar.md' (Malformed inline YAML string at line 1 (near \"foo: 'bar\"))");
 
         MockableDataCollection::markdown('foo');
@@ -340,7 +340,7 @@ public function testYamlCollectionsThrowExceptionForInvalidYaml()
             'foo/bar.yml' => "---\nfoo: 'bar",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (Malformed inline YAML string at line 2 (near \"foo: 'bar\"))");
 
         MockableDataCollection::yaml('foo');
@@ -352,7 +352,7 @@ public function testYamlCollectionsThrowExceptionForEmptyYaml()
             'foo/bar.yml' => '',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (File is empty)");
 
         MockableDataCollection::yaml('foo');
@@ -364,7 +364,7 @@ public function testYamlCollectionsThrowExceptionForBlankYaml()
             'foo/bar.yml' => ' ',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Yaml in file: 'foo/bar.yml' (File is empty)");
 
         MockableDataCollection::yaml('foo');
@@ -376,7 +376,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
             'foo/utf.yml' => "foo: \xB1\x31",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Yaml in file: 'foo/utf.yml' (The YAML value does not appear to be valid UTF-8)");
 
         MockableDataCollection::yaml('foo');
@@ -388,7 +388,7 @@ public function testYamlCollectionsThrowExceptionForOtherReasonsThanSyntaxErrorW
             'foo/tabs.yml' => "foo:\n\tbar",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Yaml in file: 'foo/tabs.yml' (A YAML file cannot contain tabs as indentation at line 2 (near \"	bar\"))");
 
         MockableDataCollection::yaml('foo');
@@ -426,7 +426,7 @@ public function testJsonMethodThrowsExceptionForInvalidJson()
             'foo/bar.json' => '{"foo": "bar"',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
@@ -438,7 +438,7 @@ public function testJsonMethodThrowsExceptionForInvalidJsonWithArray()
             'foo/bar.json' => '{"foo": "bar"',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo', true);
@@ -450,7 +450,7 @@ public function testJsonMethodThrowsExceptionForEmptyJson()
             'foo/bar.json' => '',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
@@ -462,7 +462,7 @@ public function testJsonMethodThrowsExceptionForBlankJson()
             'foo/bar.json' => ' ',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/bar.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
@@ -475,7 +475,7 @@ public function testJsonMethodThrowsExceptionWhenJustOneFileIsInvalid()
             'foo/baz.json' => '{"foo": "baz"',
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/baz.json' (Syntax error)");
 
         MockableDataCollection::json('foo');
@@ -487,7 +487,7 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithU
             'foo/utf.json' => "\xB1\x31",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/utf.json' (Malformed UTF-8 characters, possibly incorrectly encoded)");
 
         MockableDataCollection::json('foo');
@@ -499,7 +499,7 @@ public function testJsonMethodThrowsExceptionForOtherReasonsThanSyntaxErrorWithC
             'foo/control.json' => "\x19\x31",
         ]);
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(ParseException::class);
         $this->expectExceptionMessage("Invalid Json in file: 'foo/control.json' (Control character error, possibly incorrectly encoded)");
 
         MockableDataCollection::json('foo');

From 1c7114a9e38e7e838976fcb5c647cbffdd81b435 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:05:27 +0200
Subject: [PATCH 1957/2811] Improve wording

---
 RELEASE_NOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 567af1b8217..8d86e490c8b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -246,5 +246,5 @@ For example, an empty or malformed JSON file will now throw an exception like th
 \Hyde\Markdown\Exceptions\ParseException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
 
-In order to normalize the thrown exceptions, we now rethrow `Symfony/Yaml` `ParseException` as our custom `ParseException` to match the JSON validation.
-Additionally, an exception will be thrown if a JSON or YAML file is empty, as this is unlikely to be intentional.
+In order to normalize the thrown exceptions, we now rethrow `Symfony/Yaml` `ParseException` as our custom `ParseException` to match the JSON and Markdown validation.
+Additionally, an exception will be thrown if a data file is empty, as this is unlikely to be intentional.

From c5bc3748b1fbbc5b79851bba531f70b981681085 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:11:55 +0200
Subject: [PATCH 1958/2811] Simplify type label generator to use the file
 extension

---
 packages/framework/src/Support/DataCollection.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index d884da176b0..32921d0850d 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -18,9 +18,12 @@
 use function blank;
 use function rtrim;
 use function implode;
+use function explode;
+use function ucfirst;
 use function json_decode;
 use function sprintf;
 use function unslash;
+use function str_replace;
 use function json_last_error_msg;
 
 /**
@@ -91,11 +94,12 @@ public static function json(string $name, bool $asArray = false): static
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
-        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($extensions, $parseUsing, $extraArgs): array {
+        return new static(static::findFiles($name, $extensions)->mapWithKeys(function (string $file) use ($parseUsing, $extraArgs): array {
             try {
                 $parsed = $parseUsing($file, ...$extraArgs);
             } catch (ParseException $exception) {
-                $type = $extensions === 'md' ? 'Markdown' : ucfirst(Arr::first(Arr::wrap($extensions)));
+                $extension = Arr::last(explode('.', $file));
+                $type = ucfirst(str_replace(['md', 'yml'], ['markdown', 'yaml'], $extension));
 
                 throw new \Hyde\Markdown\Exceptions\ParseException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
             }

From 260ce224db57bfd5307ed7f6a927c2923173234f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:13:36 +0200
Subject: [PATCH 1959/2811] Fix parse exception namespace

---
 RELEASE_NOTES.md                                       |  2 +-
 .../Exceptions/ParseException.php                      |  2 +-
 packages/framework/src/Support/DataCollection.php      | 10 +++++-----
 .../framework/tests/Unit/DataCollectionUnitTest.php    |  8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/framework/src/{Markdown => Framework}/Exceptions/ParseException.php (75%)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 8d86e490c8b..08dc7771ea2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -243,7 +243,7 @@ See https://github.com/hydephp/develop/issues/1736 for more information.
 For example, an empty or malformed JSON file will now throw an exception like this:
  
 ```php
-\Hyde\Markdown\Exceptions\ParseException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
+\Hyde\Framework\Exceptions\ParseException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
 
 In order to normalize the thrown exceptions, we now rethrow `Symfony/Yaml` `ParseException` as our custom `ParseException` to match the JSON and Markdown validation.
diff --git a/packages/framework/src/Markdown/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
similarity index 75%
rename from packages/framework/src/Markdown/Exceptions/ParseException.php
rename to packages/framework/src/Framework/Exceptions/ParseException.php
index e2ebc466a16..0c138a58718 100644
--- a/packages/framework/src/Markdown/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Markdown\Exceptions;
+namespace Hyde\Framework\Exceptions;
 
 use RuntimeException;
 
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index 32921d0850d..f05f4d032e7 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -6,23 +6,23 @@
 
 use stdClass;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Hyde\Facades\Filesystem;
 use Symfony\Component\Yaml\Yaml;
+use Illuminate\Support\Collection;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Symfony\Component\Yaml\Exception\ParseException;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 
 use function blank;
 use function rtrim;
 use function implode;
 use function explode;
 use function ucfirst;
-use function json_decode;
 use function sprintf;
 use function unslash;
+use function json_decode;
 use function str_replace;
 use function json_last_error_msg;
 
@@ -90,7 +90,7 @@ public static function json(string $name, bool $asArray = false): static
      * @param  callable(string): mixed  $parseUsing
      * @return static<string, MarkdownDocument|FrontMatter|stdClass|array>
      *
-     * @throws \Hyde\Markdown\Exceptions\ParseException If the file is empty or invalid.
+     * @throws \Hyde\Framework\Exceptions\ParseException If the file is empty or invalid.
      */
     protected static function discover(string $name, array|string $extensions, callable $parseUsing, array $extraArgs = []): static
     {
@@ -101,7 +101,7 @@ protected static function discover(string $name, array|string $extensions, calla
                 $extension = Arr::last(explode('.', $file));
                 $type = ucfirst(str_replace(['md', 'yml'], ['markdown', 'yaml'], $extension));
 
-                throw new \Hyde\Markdown\Exceptions\ParseException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+                throw new \Hyde\Framework\Exceptions\ParseException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
             }
 
             return [static::makeIdentifier($file) => $parsed];
diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 863206af5d9..cf1c8122ffc 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -4,16 +4,16 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Mockery;
 use Hyde\Hyde;
 use Illuminate\Support\Str;
-use Hyde\Markdown\Exceptions\ParseException;
-use Hyde\Support\DataCollection;
 use Hyde\Testing\UnitTestCase;
-use Illuminate\Filesystem\Filesystem;
+use Hyde\Support\DataCollection;
 use Illuminate\Support\Collection;
-use Mockery;
+use Illuminate\Filesystem\Filesystem;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\MarkdownDocument;
+use Hyde\Framework\Exceptions\ParseException;
 
 /**
  * @covers \Hyde\Support\DataCollection

From cf953e64d54c3da30b99e62bd238317d463eacbb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:15:00 +0200
Subject: [PATCH 1960/2811] Fix class name capitalization

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

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 0c138a58718..371dc1a77c3 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -6,7 +6,7 @@
 
 use RuntimeException;
 
-class ParseException extends RunTimeException
+class ParseException extends RuntimeException
 {
     //
 }

From 2783e0d4949896014277661f5c859cb5a169e6b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:15:09 +0200
Subject: [PATCH 1961/2811] Document exception scope

---
 packages/framework/src/Framework/Exceptions/ParseException.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 371dc1a77c3..020a6cd6068 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -6,6 +6,9 @@
 
 use RuntimeException;
 
+/**
+ * Exception class thrown when an error occurs during parsing.
+ */
 class ParseException extends RuntimeException
 {
     //

From 54285af13c9da77b9e618a91763adf9da5374a91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:15:26 +0200
Subject: [PATCH 1962/2811] Revert "Document exception scope"

This reverts commit 2783e0d4949896014277661f5c859cb5a169e6b2 as it should be obvious by the class name already.
---
 packages/framework/src/Framework/Exceptions/ParseException.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 020a6cd6068..371dc1a77c3 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -6,9 +6,6 @@
 
 use RuntimeException;
 
-/**
- * Exception class thrown when an error occurs during parsing.
- */
 class ParseException extends RuntimeException
 {
     //

From 2fba023e1b7f556128d1ab3265007a80f3025198 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:16:27 +0200
Subject: [PATCH 1963/2811] Mark ParseException class as experimental

---
 packages/framework/src/Framework/Exceptions/ParseException.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 371dc1a77c3..fe1340b7259 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -6,6 +6,7 @@
 
 use RuntimeException;
 
+/** @experimental This class may change significantly before its release. */
 class ParseException extends RuntimeException
 {
     //

From d2829f296c9d12683ea1a4bdb32938e857d6eb49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:23:32 +0200
Subject: [PATCH 1964/2811] Test covers ParseException

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 684501c3b0c..8cc198dfc88 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -18,6 +18,7 @@
  * @covers \Hyde\Framework\Exceptions\RouteNotFoundException
  * @covers \Hyde\Framework\Exceptions\BaseUrlNotSetException
  * @covers \Hyde\Framework\Exceptions\UnsupportedPageTypeException
+ * @covers \Hyde\Framework\Exceptions\ParseException
  */
 class CustomExceptionsTest extends UnitTestCase
 {

From 7f4d48db4577c3070247f9eda58c44ea3a1fc580 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:17:31 +0200
Subject: [PATCH 1965/2811] Override parent constructor

---
 .../framework/src/Framework/Exceptions/ParseException.php   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index fe1340b7259..ddad2f37df5 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -4,10 +4,14 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Throwable;
 use RuntimeException;
 
 /** @experimental This class may change significantly before its release. */
 class ParseException extends RuntimeException
 {
-    //
+    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
 }

From 796035714d39d1af5182b73c2965af0f834f143e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:24:10 +0200
Subject: [PATCH 1966/2811] Unit test covers ParseException

---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index cf1c8122ffc..832612952f1 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -17,6 +17,7 @@
 
 /**
  * @covers \Hyde\Support\DataCollection
+ * @covers \Hyde\Framework\Exceptions\ParseException
  *
  * @see \Hyde\Framework\Testing\Feature\DataCollectionTest
  */

From e5d4c820f5c5726571bfe16283b72a665a62f9bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 16:22:45 +0200
Subject: [PATCH 1967/2811] Refactor to move exception message assembly to
 custom exception

---
 .../src/Framework/Exceptions/ParseException.php    | 14 ++++++++++++--
 packages/framework/src/Support/DataCollection.php  | 10 +---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index ddad2f37df5..547050d20ca 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -6,12 +6,22 @@
 
 use Throwable;
 use RuntimeException;
+use Illuminate\Support\Arr;
+
+use function rtrim;
+use function sprintf;
+use function explode;
+use function ucfirst;
+use function str_replace;
 
 /** @experimental This class may change significantly before its release. */
 class ParseException extends RuntimeException
 {
-    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
+    public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        parent::__construct($message, $code, $previous);
+        $extension = Arr::last(explode('.', $file));
+        $type = ucfirst(str_replace(['md', 'yml'], ['markdown', 'yaml'], $extension));
+
+        parent::__construct(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($previous->getMessage(), '.')), previous: $previous);
     }
 }
diff --git a/packages/framework/src/Support/DataCollection.php b/packages/framework/src/Support/DataCollection.php
index f05f4d032e7..af70ff38a3e 100644
--- a/packages/framework/src/Support/DataCollection.php
+++ b/packages/framework/src/Support/DataCollection.php
@@ -5,7 +5,6 @@
 namespace Hyde\Support;
 
 use stdClass;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Hyde\Facades\Filesystem;
 use Symfony\Component\Yaml\Yaml;
@@ -16,14 +15,10 @@
 use Symfony\Component\Yaml\Exception\ParseException;
 
 use function blank;
-use function rtrim;
 use function implode;
-use function explode;
-use function ucfirst;
 use function sprintf;
 use function unslash;
 use function json_decode;
-use function str_replace;
 use function json_last_error_msg;
 
 /**
@@ -98,10 +93,7 @@ protected static function discover(string $name, array|string $extensions, calla
             try {
                 $parsed = $parseUsing($file, ...$extraArgs);
             } catch (ParseException $exception) {
-                $extension = Arr::last(explode('.', $file));
-                $type = ucfirst(str_replace(['md', 'yml'], ['markdown', 'yaml'], $extension));
-
-                throw new \Hyde\Framework\Exceptions\ParseException(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($exception->getMessage(), '.')), previous: $exception);
+                throw new \Hyde\Framework\Exceptions\ParseException($file, $exception);
             }
 
             return [static::makeIdentifier($file) => $parsed];

From f4e18ba75a6ad97e2ea8c2c1a0fb3dbaaed2f0bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:01:37 +0200
Subject: [PATCH 1968/2811] Add unit tests for custom ParseException

---
 .../tests/Unit/CustomExceptionsTest.php       | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 8cc198dfc88..4c002d7bda7 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -11,6 +11,10 @@
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
+use Hyde\Framework\Exceptions\ParseException;
+use RuntimeException;
+use Throwable;
+use Exception;
 
 /**
  * @covers \Hyde\Framework\Exceptions\FileConflictException
@@ -108,4 +112,64 @@ public function testBaseUrlNotSetExceptionCode()
     {
         $this->assertSame(500, (new BaseUrlNotSetException())->getCode());
     }
+
+    public function testParseExceptionWithDefaultMessage()
+    {
+        $exception = new ParseException();
+        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithFileName()
+    {
+        $exception = new ParseException('example.md');
+        $this->assertSame("Invalid Markdown in file: 'example.md'", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithFileNameAndCustomMessage()
+    {
+        $previous = new RuntimeException('Custom error message.');
+        $exception = new ParseException('example.yml', $previous);
+        $this->assertSame("Invalid Yaml in file: 'example.yml' (Custom error message)", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithTxtExtension()
+    {
+        $exception = new ParseException('example.txt');
+        $this->assertSame("Invalid Text in file: 'example.txt'", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithUnsupportedExtension()
+    {
+        $exception = new ParseException('example.foo'); // Todo should be data?
+        $this->assertSame("Invalid Foo in file: 'example.foo'", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithEmptyFileNameAndCustomMessage()
+    {
+        $previous = new RuntimeException('Custom error message.');
+        $exception = new ParseException('', $previous);
+        $this->assertSame("Invalid data in file: '' (Custom error message)", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithEmptyFileNameAndEmptyPreviousMessage()
+    {
+        $previous = new RuntimeException('');
+        $exception = new ParseException('', $previous);
+        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+    }
+
+    public function testParseExceptionWithNoPrevious()
+    {
+        $exception = new ParseException('example.md');
+        $this->assertSame("Invalid Markdown in file: 'example.md'", $exception->getMessage());
+        $this->assertNull($exception->getPrevious());
+    }
+
+    public function testParseExceptionWithPrevious()
+    {
+        $previous = new Exception('Parsing error.');
+        $exception = new ParseException('example.md', $previous);
+        $this->assertSame("Invalid Markdown in file: 'example.md' (Parsing error)", $exception->getMessage());
+        $this->assertSame($previous, $exception->getPrevious());
+    }
 }

From 301c44ca423df55725f75ad2f4b1322c2e3d0a64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:02:36 +0200
Subject: [PATCH 1969/2811] Improve parse exception message assembly

---
 .../framework/src/Framework/Exceptions/ParseException.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 547050d20ca..7fd16e9fdfc 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,8 +20,10 @@ class ParseException extends RuntimeException
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
         $extension = Arr::last(explode('.', $file));
-        $type = ucfirst(str_replace(['md', 'yml'], ['markdown', 'yaml'], $extension));
+        $type = ucfirst(str_replace(['md', 'txt', 'yml'], ['markdown', 'text', 'yaml'], $extension)) ?: 'data';
 
-        parent::__construct(sprintf("Invalid %s in file: '%s' (%s)", $type, $file, rtrim($previous->getMessage(), '.')), previous: $previous);
+        $context = ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+
+        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $type, $file, $context)), previous: $previous);
     }
 }

From fcab984bc2b54ac144366ff2b07c3ecdc15ee6ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:02:41 +0200
Subject: [PATCH 1970/2811] Revert "Unit test covers ParseException"

This reverts commit 796035714d39d1af5182b73c2965af0f834f143e.
---
 packages/framework/tests/Unit/DataCollectionUnitTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/DataCollectionUnitTest.php b/packages/framework/tests/Unit/DataCollectionUnitTest.php
index 832612952f1..cf1c8122ffc 100644
--- a/packages/framework/tests/Unit/DataCollectionUnitTest.php
+++ b/packages/framework/tests/Unit/DataCollectionUnitTest.php
@@ -17,7 +17,6 @@
 
 /**
  * @covers \Hyde\Support\DataCollection
- * @covers \Hyde\Framework\Exceptions\ParseException
  *
  * @see \Hyde\Framework\Testing\Feature\DataCollectionTest
  */

From c604c93e5a83ccb02a8283add4d3264c584129cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:02:52 +0200
Subject: [PATCH 1971/2811] Test parse exception code

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 4c002d7bda7..c532b2503b4 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -113,6 +113,11 @@ public function testBaseUrlNotSetExceptionCode()
         $this->assertSame(500, (new BaseUrlNotSetException())->getCode());
     }
 
+    public function testParseExceptionCode()
+    {
+        $this->assertSame(0, (new ParseException())->getCode());
+    }
+
     public function testParseExceptionWithDefaultMessage()
     {
         $exception = new ParseException();

From eaa3045e78d85485f787cfd34e12ed90ec26862d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:03:22 +0200
Subject: [PATCH 1972/2811] Remove unused use statement

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index c532b2503b4..e841e303c83 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -13,7 +13,6 @@
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
 use Hyde\Framework\Exceptions\ParseException;
 use RuntimeException;
-use Throwable;
 use Exception;
 
 /**

From 4348f1ce85b4148724514c830360711ad05f502f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:09:29 +0200
Subject: [PATCH 1973/2811] Set parse exception status code to 422

---
 packages/framework/src/Framework/Exceptions/ParseException.php | 3 +++
 packages/framework/tests/Unit/CustomExceptionsTest.php         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 7fd16e9fdfc..fe89cc2e677 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -17,6 +17,9 @@
 /** @experimental This class may change significantly before its release. */
 class ParseException extends RuntimeException
 {
+    /** @var int */
+    protected $code = 422;
+
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
         $extension = Arr::last(explode('.', $file));
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index e841e303c83..cef337a39fc 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -114,7 +114,7 @@ public function testBaseUrlNotSetExceptionCode()
 
     public function testParseExceptionCode()
     {
-        $this->assertSame(0, (new ParseException())->getCode());
+        $this->assertSame(422, (new ParseException())->getCode());
     }
 
     public function testParseExceptionWithDefaultMessage()

From 5fb82c140f178ede8aca31b644832ae5ebb8fb38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:11:24 +0200
Subject: [PATCH 1974/2811] Replace string replacement with match expression

More verbose, but clearer, and probably more accurate. Has cases for the exceptions we throw this for.
---
 .../src/Framework/Exceptions/ParseException.php          | 9 ++++++---
 packages/framework/tests/Unit/CustomExceptionsTest.php   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index fe89cc2e677..dbac34a03b7 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -11,8 +11,6 @@
 use function rtrim;
 use function sprintf;
 use function explode;
-use function ucfirst;
-use function str_replace;
 
 /** @experimental This class may change significantly before its release. */
 class ParseException extends RuntimeException
@@ -23,7 +21,12 @@ class ParseException extends RuntimeException
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
         $extension = Arr::last(explode('.', $file));
-        $type = ucfirst(str_replace(['md', 'txt', 'yml'], ['markdown', 'text', 'yaml'], $extension)) ?: 'data';
+        $type = match ($extension) {
+            'md' => 'Markdown',
+            'yaml', 'yml' => 'Yaml',
+            'json' => 'Json',
+            default => 'data',
+        };
 
         $context = ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
 
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index cef337a39fc..68d9313769b 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -139,13 +139,13 @@ public function testParseExceptionWithFileNameAndCustomMessage()
     public function testParseExceptionWithTxtExtension()
     {
         $exception = new ParseException('example.txt');
-        $this->assertSame("Invalid Text in file: 'example.txt'", $exception->getMessage());
+        $this->assertSame("Invalid data in file: 'example.txt'", $exception->getMessage());
     }
 
     public function testParseExceptionWithUnsupportedExtension()
     {
-        $exception = new ParseException('example.foo'); // Todo should be data?
-        $this->assertSame("Invalid Foo in file: 'example.foo'", $exception->getMessage());
+        $exception = new ParseException('example.foo');
+        $this->assertSame("Invalid data in file: 'example.foo'", $exception->getMessage());
     }
 
     public function testParseExceptionWithEmptyFileNameAndCustomMessage()

From ad15064946a8cbb1a23bc4aca4449227b71cc996 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:12:07 +0200
Subject: [PATCH 1975/2811] Add source code spacing

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 68d9313769b..fcaeb77b1f3 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -120,12 +120,14 @@ public function testParseExceptionCode()
     public function testParseExceptionWithDefaultMessage()
     {
         $exception = new ParseException();
+
         $this->assertSame("Invalid data in file: ''", $exception->getMessage());
     }
 
     public function testParseExceptionWithFileName()
     {
         $exception = new ParseException('example.md');
+
         $this->assertSame("Invalid Markdown in file: 'example.md'", $exception->getMessage());
     }
 
@@ -133,18 +135,21 @@ public function testParseExceptionWithFileNameAndCustomMessage()
     {
         $previous = new RuntimeException('Custom error message.');
         $exception = new ParseException('example.yml', $previous);
+
         $this->assertSame("Invalid Yaml in file: 'example.yml' (Custom error message)", $exception->getMessage());
     }
 
     public function testParseExceptionWithTxtExtension()
     {
         $exception = new ParseException('example.txt');
+
         $this->assertSame("Invalid data in file: 'example.txt'", $exception->getMessage());
     }
 
     public function testParseExceptionWithUnsupportedExtension()
     {
         $exception = new ParseException('example.foo');
+
         $this->assertSame("Invalid data in file: 'example.foo'", $exception->getMessage());
     }
 
@@ -152,6 +157,7 @@ public function testParseExceptionWithEmptyFileNameAndCustomMessage()
     {
         $previous = new RuntimeException('Custom error message.');
         $exception = new ParseException('', $previous);
+
         $this->assertSame("Invalid data in file: '' (Custom error message)", $exception->getMessage());
     }
 
@@ -159,12 +165,14 @@ public function testParseExceptionWithEmptyFileNameAndEmptyPreviousMessage()
     {
         $previous = new RuntimeException('');
         $exception = new ParseException('', $previous);
+
         $this->assertSame("Invalid data in file: ''", $exception->getMessage());
     }
 
     public function testParseExceptionWithNoPrevious()
     {
         $exception = new ParseException('example.md');
+
         $this->assertSame("Invalid Markdown in file: 'example.md'", $exception->getMessage());
         $this->assertNull($exception->getPrevious());
     }
@@ -173,6 +181,7 @@ public function testParseExceptionWithPrevious()
     {
         $previous = new Exception('Parsing error.');
         $exception = new ParseException('example.md', $previous);
+
         $this->assertSame("Invalid Markdown in file: 'example.md' (Parsing error)", $exception->getMessage());
         $this->assertSame($previous, $exception->getPrevious());
     }

From 05910f3880b260494f6ca029bbaed762d31053e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:13:21 +0200
Subject: [PATCH 1976/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 08dc7771ea2..aaa55ca2fcf 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -12,6 +12,7 @@ This serves two purposes:
 ### Added
 - You can now specify navigation priorities by adding a numeric prefix to the source file names in https://github.com/hydephp/develop/pull/1709
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
+- Added a new `\Hyde\Framework\Exceptions\ParseException` exception class to handle parsing exceptions in data collection files in https://github.com/hydephp/develop/pull/1732
 - The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
 
 ### Changed

From 68b096df48586cc40d95bd59f6e5da5ac21f3578 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 17:15:02 +0200
Subject: [PATCH 1977/2811] Extract helper method

---
 .../framework/src/Framework/Exceptions/ParseException.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index dbac34a03b7..0475c5427d0 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -28,8 +28,13 @@ public function __construct(string $file = '', ?Throwable $previous = null)
             default => 'data',
         };
 
-        $context = ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+        $context = $this->getContext($previous);
 
         parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $type, $file, $context)), previous: $previous);
     }
+
+    protected function getContext(?Throwable $previous): string
+    {
+        return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+    }
 }

From 19ac8dfdd9cad303d8d5a8f1d69367614911db6e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:41:00 +0200
Subject: [PATCH 1978/2811] Inline local variable

---
 packages/framework/src/Framework/Exceptions/ParseException.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 0475c5427d0..78a38bd3351 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,8 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        $extension = Arr::last(explode('.', $file));
-        $type = match ($extension) {
+        $type = match (Arr::last(explode('.', $file))) {
             'md' => 'Markdown',
             'yaml', 'yml' => 'Yaml',
             'json' => 'Json',

From 5393e369474e61f3d3b8688ab2442f835f67e508 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:41:35 +0200
Subject: [PATCH 1979/2811] Extract helper method

---
 .../src/Framework/Exceptions/ParseException.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 78a38bd3351..cbeb87032ac 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,12 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        $type = match (Arr::last(explode('.', $file))) {
-            'md' => 'Markdown',
-            'yaml', 'yml' => 'Yaml',
-            'json' => 'Json',
-            default => 'data',
-        };
+        $type = $this->getTypeLabel($file);
 
         $context = $this->getContext($previous);
 
@@ -36,4 +31,14 @@ protected function getContext(?Throwable $previous): string
     {
         return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
     }
+
+    protected function getTypeLabel(string $file): string
+    {
+        return match (Arr::last(explode('.', $file))) {
+            'md' => 'Markdown',
+            'yaml', 'yml' => 'Yaml',
+            'json' => 'Json',
+            default => 'data',
+        };
+    }
 }

From 6fc3d21aa8914ae5efeebe7bd9f6b68d51e665b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:41:44 +0200
Subject: [PATCH 1980/2811] Move up method in source

---
 .../src/Framework/Exceptions/ParseException.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index cbeb87032ac..d0feec9aa41 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -27,11 +27,6 @@ public function __construct(string $file = '', ?Throwable $previous = null)
         parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $type, $file, $context)), previous: $previous);
     }
 
-    protected function getContext(?Throwable $previous): string
-    {
-        return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
-    }
-
     protected function getTypeLabel(string $file): string
     {
         return match (Arr::last(explode('.', $file))) {
@@ -41,4 +36,9 @@ protected function getTypeLabel(string $file): string
             default => 'data',
         };
     }
+
+    protected function getContext(?Throwable $previous): string
+    {
+        return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+    }
 }

From 177185bac7523873086a25fe233a76f9cd5f09f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:41:52 +0200
Subject: [PATCH 1981/2811] Inline local variables

---
 .../framework/src/Framework/Exceptions/ParseException.php   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index d0feec9aa41..c78361b7415 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,11 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        $type = $this->getTypeLabel($file);
-
-        $context = $this->getContext($previous);
-
-        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $type, $file, $context)), previous: $previous);
+        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous))), previous: $previous);
     }
 
     protected function getTypeLabel(string $file): string

From 770df88e5b7ee31d25c455cc65739c22e4f1b0ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:42:22 +0200
Subject: [PATCH 1982/2811] Convert a 'sprintf()' call to string interpolation

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

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index c78361b7415..a5e0df0400e 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,7 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous))), previous: $previous);
+        parent::__construct(rtrim("Invalid {$this->getTypeLabel($file)} in file: '{$file}' {$this->getContext($previous)}"), previous: $previous);
     }
 
     protected function getTypeLabel(string $file): string

From e1ce0c3460a47f27be47db39ba49c8a5cbf15b3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:42:26 +0200
Subject: [PATCH 1983/2811] Revert "Convert a 'sprintf()' call to string
 interpolation"

This reverts commit 770df88e5b7ee31d25c455cc65739c22e4f1b0ce.
---
 packages/framework/src/Framework/Exceptions/ParseException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index a5e0df0400e..c78361b7415 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,7 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        parent::__construct(rtrim("Invalid {$this->getTypeLabel($file)} in file: '{$file}' {$this->getContext($previous)}"), previous: $previous);
+        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous))), previous: $previous);
     }
 
     protected function getTypeLabel(string $file): string

From 3d05b2f2a6114861c72f8334ffd3ff7bf3d772fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:42:49 +0200
Subject: [PATCH 1984/2811] Split comma-separated values into multiple lines

---
 .../framework/src/Framework/Exceptions/ParseException.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index c78361b7415..4dc1e899d0d 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,7 +20,9 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous))), previous: $previous);
+        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s",
+            $this->getTypeLabel($file), $file, $this->getContext($previous))
+        ), previous: $previous);
     }
 
     protected function getTypeLabel(string $file): string

From b2d3282a1b6b06b5deb566b9d18be411dd4da42f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:43:16 +0200
Subject: [PATCH 1985/2811] Extract helper method

---
 .../src/Framework/Exceptions/ParseException.php          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 4dc1e899d0d..3452b493648 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -20,9 +20,7 @@ class ParseException extends RuntimeException
 
     public function __construct(string $file = '', ?Throwable $previous = null)
     {
-        parent::__construct(rtrim(sprintf("Invalid %s in file: '%s' %s",
-            $this->getTypeLabel($file), $file, $this->getContext($previous))
-        ), previous: $previous);
+        parent::__construct($this->formatMessage($file, $previous), previous: $previous);
     }
 
     protected function getTypeLabel(string $file): string
@@ -39,4 +37,9 @@ protected function getContext(?Throwable $previous): string
     {
         return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
     }
+
+    protected function formatMessage(string $file, ?Throwable $previous): string
+    {
+        return rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous)));
+    }
 }

From 323abb1cf21f3bd3a65e5a74a4e8b09caa36cbae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:43:31 +0200
Subject: [PATCH 1986/2811] Move up method in source

---
 .../src/Framework/Exceptions/ParseException.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 3452b493648..753cb870780 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -23,6 +23,11 @@ public function __construct(string $file = '', ?Throwable $previous = null)
         parent::__construct($this->formatMessage($file, $previous), previous: $previous);
     }
 
+    protected function formatMessage(string $file, ?Throwable $previous): string
+    {
+        return rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous)));
+    }
+
     protected function getTypeLabel(string $file): string
     {
         return match (Arr::last(explode('.', $file))) {
@@ -37,9 +42,4 @@ protected function getContext(?Throwable $previous): string
     {
         return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
     }
-
-    protected function formatMessage(string $file, ?Throwable $previous): string
-    {
-        return rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous)));
-    }
 }

From 8fba6af90c92c11e287963f2cc9bbc66f4debb8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 18:46:18 +0200
Subject: [PATCH 1987/2811] Conditionally assemble file path string

---
 .../framework/src/Framework/Exceptions/ParseException.php   | 4 +++-
 packages/framework/tests/Unit/CustomExceptionsTest.php      | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 753cb870780..aaf4724ae0a 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -25,7 +25,9 @@ public function __construct(string $file = '', ?Throwable $previous = null)
 
     protected function formatMessage(string $file, ?Throwable $previous): string
     {
-        return rtrim(sprintf("Invalid %s in file: '%s' %s", $this->getTypeLabel($file), $file, $this->getContext($previous)));
+        $fileLabel = $file ? sprintf(": '%s'", $file) : '';
+
+        return rtrim(sprintf('Invalid %s in file%s %s', $this->getTypeLabel($file), $fileLabel, $this->getContext($previous)));
     }
 
     protected function getTypeLabel(string $file): string
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index fcaeb77b1f3..e3894eec0a0 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -121,7 +121,7 @@ public function testParseExceptionWithDefaultMessage()
     {
         $exception = new ParseException();
 
-        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+        $this->assertSame('Invalid data in file', $exception->getMessage());
     }
 
     public function testParseExceptionWithFileName()
@@ -158,7 +158,7 @@ public function testParseExceptionWithEmptyFileNameAndCustomMessage()
         $previous = new RuntimeException('Custom error message.');
         $exception = new ParseException('', $previous);
 
-        $this->assertSame("Invalid data in file: '' (Custom error message)", $exception->getMessage());
+        $this->assertSame('Invalid data in file (Custom error message)', $exception->getMessage());
     }
 
     public function testParseExceptionWithEmptyFileNameAndEmptyPreviousMessage()
@@ -166,7 +166,7 @@ public function testParseExceptionWithEmptyFileNameAndEmptyPreviousMessage()
         $previous = new RuntimeException('');
         $exception = new ParseException('', $previous);
 
-        $this->assertSame("Invalid data in file: ''", $exception->getMessage());
+        $this->assertSame('Invalid data in file', $exception->getMessage());
     }
 
     public function testParseExceptionWithNoPrevious()

From 694b1cdd72933665a5b3f51d04175756e84304ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:29:53 +0200
Subject: [PATCH 1988/2811] Refactor and cleanup code

---
 .../src/Framework/Exceptions/ParseException.php          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index aaf4724ae0a..1611bdbd347 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -25,9 +25,7 @@ public function __construct(string $file = '', ?Throwable $previous = null)
 
     protected function formatMessage(string $file, ?Throwable $previous): string
     {
-        $fileLabel = $file ? sprintf(": '%s'", $file) : '';
-
-        return rtrim(sprintf('Invalid %s in file%s %s', $this->getTypeLabel($file), $fileLabel, $this->getContext($previous)));
+        return rtrim(sprintf('Invalid %s in file%s %s', $this->getTypeLabel($file), $this->getFileLabel($file), $this->getContext($previous)));
     }
 
     protected function getTypeLabel(string $file): string
@@ -40,6 +38,11 @@ protected function getTypeLabel(string $file): string
         };
     }
 
+    protected function getFileLabel(string $file): string
+    {
+        return $file ? sprintf(": '%s'", $file) : '';
+    }
+
     protected function getContext(?Throwable $previous): string
     {
         return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';

From f1e82a173c49f42c1734df54902b8382fce844e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:43:48 +0200
Subject: [PATCH 1989/2811] Remove unnecessary parentheses

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

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index 1611bdbd347..a53680dce61 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -45,6 +45,6 @@ protected function getFileLabel(string $file): string
 
     protected function getContext(?Throwable $previous): string
     {
-        return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+        return $previous && $previous->getMessage() ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
     }
 }

From e976cee951d770b17d6692f77eeeaebd5c525e59 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:43:52 +0200
Subject: [PATCH 1990/2811] Revert "Remove unnecessary parentheses"

This reverts commit f1e82a173c49f42c1734df54902b8382fce844e6.
---
 packages/framework/src/Framework/Exceptions/ParseException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/ParseException.php b/packages/framework/src/Framework/Exceptions/ParseException.php
index a53680dce61..1611bdbd347 100644
--- a/packages/framework/src/Framework/Exceptions/ParseException.php
+++ b/packages/framework/src/Framework/Exceptions/ParseException.php
@@ -45,6 +45,6 @@ protected function getFileLabel(string $file): string
 
     protected function getContext(?Throwable $previous): string
     {
-        return $previous && $previous->getMessage() ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
+        return ($previous && $previous->getMessage()) ? sprintf('(%s)', rtrim($previous->getMessage(), '.')) : '';
     }
 }

From d6a619f0b507f6ca41fb48a469c69d9796a910d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:47:08 +0200
Subject: [PATCH 1991/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index aaa55ca2fcf..010e925d2ac 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -231,9 +231,10 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 
 - The `DataCollections` class has been renamed to `DataCollection`. If you have used the `DataCollections` class in your code, you will need to update your code to use the new class name.
 
-#### Minor impact
+#### Changes
 
 - Calling the `DataCollection` methods will no longer create the data collections directory automatically
+- The `DataCollection` class now validates the syntax of all data collection files during discovery, and throws a `ParseException` if the syntax is invalid
 
 #### Issues that may arise
 

From b2912a3d3227711a36b49bfea2528e721280daf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:47:59 +0200
Subject: [PATCH 1992/2811] Draft upcoming change notes

See https://github.com/hydephp/develop/pull/1732#issuecomment-2186498121
---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 010e925d2ac..7fe5c37db0c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -235,6 +235,7 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 
 - Calling the `DataCollection` methods will no longer create the data collections directory automatically
 - The `DataCollection` class now validates the syntax of all data collection files during discovery, and throws a `ParseException` if the syntax is invalid
+- The collections are now no longer keyed by the relative file path, instead only the basename identifier is used (see https://github.com/hydephp/develop/pull/1732#issuecomment-2186498121)
 
 #### Issues that may arise
 

From 227db4f8faa338798c526bfc407e8f0f99743af4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:51:17 +0200
Subject: [PATCH 1993/2811] Revert "Draft upcoming change notes"

This reverts commit b2912a3d3227711a36b49bfea2528e721280daf1.
---
 RELEASE_NOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7fe5c37db0c..010e925d2ac 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -235,7 +235,6 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 
 - Calling the `DataCollection` methods will no longer create the data collections directory automatically
 - The `DataCollection` class now validates the syntax of all data collection files during discovery, and throws a `ParseException` if the syntax is invalid
-- The collections are now no longer keyed by the relative file path, instead only the basename identifier is used (see https://github.com/hydephp/develop/pull/1732#issuecomment-2186498121)
 
 #### Issues that may arise
 

From 0a3a65a694584ca5054588b18163731995ee5540 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 25 Jun 2024 19:57:12 +0200
Subject: [PATCH 1994/2811] Clean up release notes

---
 RELEASE_NOTES.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 010e925d2ac..a62b07d4786 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -233,14 +233,14 @@ Unfortunately, this means that existing setups may need to be adjusted to work w
 
 #### Changes
 
-- Calling the `DataCollection` methods will no longer create the data collections directory automatically
-- The `DataCollection` class now validates the syntax of all data collection files during discovery, and throws a `ParseException` if the syntax is invalid
+- Calling the `DataCollection` methods will no longer create the data collections directory automatically.
+- The `DataCollection` class now validates the syntax of all data collection files during discovery, and throws a `ParseException` if the syntax is invalid.
 
 #### Issues that may arise
 
 If you start getting a `ParseException` when using the `DataCollection` class, it may be due to malformed data collection files.
-Starting from this version, we validate the syntax of JSON and YAML files during discovery, to help you catch errors early.
-See https://github.com/hydephp/develop/issues/1736 for more information.
+Starting from this version, we validate the syntax of JSON and YAML in data files during discovery, including any front matter in Markdown data files. 
+We do this to help you catch errors early. See https://github.com/hydephp/develop/issues/1736 for more information.
 
 For example, an empty or malformed JSON file will now throw an exception like this:
  
@@ -248,5 +248,5 @@ For example, an empty or malformed JSON file will now throw an exception like th
 \Hyde\Framework\Exceptions\ParseException: Invalid JSON in file: 'foo/baz.json' (Syntax error)
 ```
 
-In order to normalize the thrown exceptions, we now rethrow `Symfony/Yaml` `ParseException` as our custom `ParseException` to match the JSON and Markdown validation.
-Additionally, an exception will be thrown if a data file is empty, as this is unlikely to be intentional.
+In order to normalize the thrown exceptions, we now rethrow the `ParseException` from `Symfony/Yaml` as our custom `ParseException` to match the JSON and Markdown validation.
+Additionally, an exception will be thrown if a data file is empty, as this is unlikely to be intentional. Markdown files can have an empty body if front matter is present.

From 25733a12470fd8e6617ca5000a83f05a19542a74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 09:51:11 +0200
Subject: [PATCH 1995/2811] Extract helper method

---
 packages/framework/src/Support/Includes.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 21b0eab2620..6d262acea23 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -64,7 +64,7 @@ public static function get(string $filename, ?string $default = null): ?string
      */
     public static function html(string $filename, ?string $default = null): ?string
     {
-        $path = static::path(basename($filename, '.html').'.html');
+        $path = static::normalizePath($filename, '.html');
 
         if (! file_exists($path)) {
             return $default === null ? null : $default;
@@ -82,7 +82,7 @@ public static function html(string $filename, ?string $default = null): ?string
      */
     public static function markdown(string $filename, ?string $default = null): ?string
     {
-        $path = static::path(basename($filename, '.md').'.md');
+        $path = static::normalizePath($filename, '.md');
 
         if (! file_exists($path)) {
             return $default === null ? null : Markdown::render($default);
@@ -100,7 +100,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
      */
     public static function blade(string $filename, ?string $default = null): ?string
     {
-        $path = static::path(basename($filename, '.blade.php').'.blade.php');
+        $path = static::normalizePath($filename, '.blade.php');
 
         if (! file_exists($path)) {
             return $default === null ? null : Blade::render($default);
@@ -108,4 +108,9 @@ public static function blade(string $filename, ?string $default = null): ?string
 
         return Blade::render(file_get_contents($path));
     }
+
+    protected static function normalizePath(string $filename, string $extension): string
+    {
+        return static::path(basename($filename, $extension).$extension);
+    }
 }

From 2da4e75f2eda3aa1738e07efc76836d987203b66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:00:05 +0200
Subject: [PATCH 1996/2811] Get file contents using filesystem facade

---
 packages/framework/src/Support/Includes.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 6d262acea23..3e4e2785805 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -5,12 +5,12 @@
 namespace Hyde\Support;
 
 use Hyde\Hyde;
+use Hyde\Facades\Filesystem;
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
 use function basename;
 use function file_exists;
-use function file_get_contents;
 
 /**
  * The Includes facade provides a simple way to access partials in the includes directory.
@@ -52,7 +52,7 @@ public static function get(string $filename, ?string $default = null): ?string
             return $default;
         }
 
-        return file_get_contents($path);
+        return Filesystem::getContents($path);
     }
 
     /**
@@ -70,7 +70,7 @@ public static function html(string $filename, ?string $default = null): ?string
             return $default === null ? null : $default;
         }
 
-        return file_get_contents($path);
+        return Filesystem::getContents($path);
     }
 
     /**
@@ -88,7 +88,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
             return $default === null ? null : Markdown::render($default);
         }
 
-        return Markdown::render(file_get_contents($path));
+        return Markdown::render(Filesystem::getContents($path));
     }
 
     /**
@@ -106,7 +106,7 @@ public static function blade(string $filename, ?string $default = null): ?string
             return $default === null ? null : Blade::render($default);
         }
 
-        return Blade::render(file_get_contents($path));
+        return Blade::render(Filesystem::getContents($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string

From 2df07d5b949b31ec3a78cb28c4e7fe9dc0005fbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:02:03 +0200
Subject: [PATCH 1997/2811] Get file existence using filesystem facade

---
 packages/framework/src/Support/Includes.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 3e4e2785805..b477b20615e 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\Blade;
 
 use function basename;
-use function file_exists;
 
 /**
  * The Includes facade provides a simple way to access partials in the includes directory.
@@ -48,7 +47,7 @@ public static function get(string $filename, ?string $default = null): ?string
     {
         $path = static::path($filename);
 
-        if (! file_exists($path)) {
+        if (! Filesystem::exists($path)) {
             return $default;
         }
 
@@ -66,7 +65,7 @@ public static function html(string $filename, ?string $default = null): ?string
     {
         $path = static::normalizePath($filename, '.html');
 
-        if (! file_exists($path)) {
+        if (! Filesystem::exists($path)) {
             return $default === null ? null : $default;
         }
 
@@ -84,7 +83,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
     {
         $path = static::normalizePath($filename, '.md');
 
-        if (! file_exists($path)) {
+        if (! Filesystem::exists($path)) {
             return $default === null ? null : Markdown::render($default);
         }
 
@@ -102,7 +101,7 @@ public static function blade(string $filename, ?string $default = null): ?string
     {
         $path = static::normalizePath($filename, '.blade.php');
 
-        if (! file_exists($path)) {
+        if (! Filesystem::exists($path)) {
             return $default === null ? null : Blade::render($default);
         }
 

From 3a7373641cba3d7237a923bc12de794ae307b795 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:03:49 +0200
Subject: [PATCH 1998/2811] Create IncludesFacadeUnitTest.php

---
 .../tests/Unit/IncludesFacadeUnitTest.php         | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/IncludesFacadeUnitTest.php

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
new file mode 100644
index 00000000000..2c73a531566
--- /dev/null
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Support\Includes
+ */
+class IncludesFacadeUnitTest extends UnitTestCase
+{
+    //
+}

From dfc5581e473fdb17931a847a8143618c4ff95670 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:15:09 +0200
Subject: [PATCH 1999/2811] Add test crosslinks

---
 packages/framework/tests/Feature/IncludesFacadeTest.php  | 2 ++
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index e2c95bc7c3d..cffcbb79f3c 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -11,6 +11,8 @@
 
 /**
  * @covers \Hyde\Support\Includes
+ *
+ * @see \Hyde\Framework\Testing\Unit\IncludesFacadeUnitTest
  */
 class IncludesFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 2c73a531566..2ca2b2f0fed 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -8,6 +8,8 @@
 
 /**
  * @covers \Hyde\Support\Includes
+ *
+ * @see \Hyde\Framework\Testing\Feature\IncludesFacadeTest
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {

From 48180bc9dd3ef982645487549b1e121198670586 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:19:54 +0200
Subject: [PATCH 2000/2811] Generate unit test with GPT 4

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 193 +++++++++++++++++-
 1 file changed, 192 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 2ca2b2f0fed..c8a8a9ee3db 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Mockery;
+use Hyde\Hyde;
+use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\Facades\Blade;
+use Hyde\Facades\Filesystem;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -13,5 +18,191 @@
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {
-    //
+    protected function tearDown(): void
+    {
+        Mockery::close();
+        parent::tearDown();
+    }
+
+    public function testPathReturnsTheIncludesDirectory()
+    {
+        $this->assertSame(Hyde::path('resources/includes'), Includes::path());
+    }
+
+    public function testPathReturnsAPartialWithinTheIncludesDirectory()
+    {
+        $this->assertSame(Hyde::path('resources/includes/partial.html'), Includes::path('partial.html'));
+    }
+
+    public function testGetReturnsPartial()
+    {
+        $filename = 'foo.txt';
+        $expected = 'foo bar';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        $this->assertSame($expected, Includes::get($filename));
+    }
+
+    public function testGetReturnsDefaultValueWhenNotFound()
+    {
+        $filename = 'foo.txt';
+        $default = 'default';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        $this->assertNull(Includes::get($filename));
+        $this->assertSame($default, Includes::get($filename, $default));
+    }
+
+    public function testHtmlReturnsRenderedPartial()
+    {
+        $filename = 'foo.html';
+        $expected = '<h1>foo bar</h1>';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        $this->assertSame($expected, Includes::html($filename));
+    }
+
+    public function testHtmlReturnsDefaultValueWhenNotFound()
+    {
+        $filename = 'foo.html';
+        $default = '<h1>default</h1>';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        $this->assertNull(Includes::html($filename));
+        $this->assertSame($default, Includes::html($filename, $default));
+    }
+
+    public function testHtmlWithAndWithoutExtension()
+    {
+        $filename = 'foo.html';
+        $content = '<h1>foo bar</h1>';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        $this->assertSame(Includes::html('foo.html'), Includes::html('foo'));
+    }
+
+    public function testMarkdownReturnsRenderedPartial()
+    {
+        $filename = 'foo.md';
+        $content = '# foo bar';
+        $expected = "<h1>foo bar</h1>\n";
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Markdown::shouldReceive('render')->with($content)->andReturn($expected);
+
+        $this->assertSame($expected, Includes::markdown($filename));
+    }
+
+    public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
+    {
+        $filename = 'foo.md';
+        $default = '# default';
+        $expected = "<h1>default</h1>\n";
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Markdown::shouldReceive('render')->with($default)->andReturn($expected);
+
+        $this->assertNull(Includes::markdown($filename));
+        $this->assertSame($expected, Includes::markdown($filename, $default));
+    }
+
+    public function testMarkdownWithAndWithoutExtension()
+    {
+        $filename = 'foo.md';
+        $content = '# foo bar';
+        $expected = "<h1>foo bar</h1>\n";
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Markdown::shouldReceive('render')->with($content)->andReturn($expected);
+
+        $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
+    }
+
+    public function testBladeReturnsRenderedPartial()
+    {
+        $filename = 'foo.blade.php';
+        $content = '{{ "foo bar" }}';
+        $expected = 'foo bar';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+
+        $this->assertSame($expected, Includes::blade($filename));
+    }
+
+    public function testBladeWithAndWithoutExtension()
+    {
+        $filename = 'foo.blade.php';
+        $content = '{{ "foo bar" }}';
+        $expected = 'foo bar';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+
+        $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
+    }
+
+    public function testBladeReturnsDefaultValueWhenNotFound()
+    {
+        $filename = 'foo.blade.php';
+        $default = '{{ "default" }}';
+        $expected = 'default';
+
+        $filesystem = Mockery::mock(Filesystem::class);
+        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+
+        app()->instance(Filesystem::class, $filesystem);
+
+        Blade::shouldReceive('render')->with($default)->andReturn($expected);
+
+        $this->assertNull(Includes::blade($filename));
+        $this->assertSame($expected, Includes::blade($filename, $default));
+    }
 }

From 8a776ef4dfeb1cb5a7358550a1bc19945596d24d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:20:21 +0200
Subject: [PATCH 2001/2811] Test needs kernel

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index c8a8a9ee3db..473c126e11d 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -18,6 +18,8 @@
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+
     protected function tearDown(): void
     {
         Mockery::close();

From b117a3768d21e694d6f126073ee97a67e91730fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:20:39 +0200
Subject: [PATCH 2002/2811] Clean up formatting

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 473c126e11d..e4cee2d1a5c 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -23,6 +23,7 @@ class IncludesFacadeUnitTest extends UnitTestCase
     protected function tearDown(): void
     {
         Mockery::close();
+
         parent::tearDown();
     }
 

From d66537d6b1ead15dfb305417f0d9c8044aab5d89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:24:42 +0200
Subject: [PATCH 2003/2811] Use mockable get instead of get contents

---
 packages/framework/src/Support/Includes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index b477b20615e..2f02b38d801 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -51,7 +51,7 @@ public static function get(string $filename, ?string $default = null): ?string
             return $default;
         }
 
-        return Filesystem::getContents($path);
+        return Filesystem::get($path);
     }
 
     /**
@@ -69,7 +69,7 @@ public static function html(string $filename, ?string $default = null): ?string
             return $default === null ? null : $default;
         }
 
-        return Filesystem::getContents($path);
+        return Filesystem::get($path);
     }
 
     /**
@@ -87,7 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
             return $default === null ? null : Markdown::render($default);
         }
 
-        return Markdown::render(Filesystem::getContents($path));
+        return Markdown::render(Filesystem::get($path));
     }
 
     /**
@@ -105,7 +105,7 @@ public static function blade(string $filename, ?string $default = null): ?string
             return $default === null ? null : Blade::render($default);
         }
 
-        return Blade::render(Filesystem::getContents($path));
+        return Blade::render(Filesystem::get($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string

From 85314bfbd3b3a3b0b4520b8f1d235098c9e4f966 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:24:45 +0200
Subject: [PATCH 2004/2811] Revert "Use mockable get instead of get contents"

This reverts commit d66537d6b1ead15dfb305417f0d9c8044aab5d89.
---
 packages/framework/src/Support/Includes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 2f02b38d801..b477b20615e 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -51,7 +51,7 @@ public static function get(string $filename, ?string $default = null): ?string
             return $default;
         }
 
-        return Filesystem::get($path);
+        return Filesystem::getContents($path);
     }
 
     /**
@@ -69,7 +69,7 @@ public static function html(string $filename, ?string $default = null): ?string
             return $default === null ? null : $default;
         }
 
-        return Filesystem::get($path);
+        return Filesystem::getContents($path);
     }
 
     /**
@@ -87,7 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
             return $default === null ? null : Markdown::render($default);
         }
 
-        return Markdown::render(Filesystem::get($path));
+        return Markdown::render(Filesystem::getContents($path));
     }
 
     /**
@@ -105,7 +105,7 @@ public static function blade(string $filename, ?string $default = null): ?string
             return $default === null ? null : Blade::render($default);
         }
 
-        return Blade::render(Filesystem::get($path));
+        return Blade::render(Filesystem::getContents($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string

From 37e7ddd7b626095d7d18b0b00100eaed723e278c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:25:44 +0200
Subject: [PATCH 2005/2811] Reapply "Use mockable get instead of get contents"

This reverts commit 85314bfbd3b3a3b0b4520b8f1d235098c9e4f966.
---
 packages/framework/src/Support/Includes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index b477b20615e..2f02b38d801 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -51,7 +51,7 @@ public static function get(string $filename, ?string $default = null): ?string
             return $default;
         }
 
-        return Filesystem::getContents($path);
+        return Filesystem::get($path);
     }
 
     /**
@@ -69,7 +69,7 @@ public static function html(string $filename, ?string $default = null): ?string
             return $default === null ? null : $default;
         }
 
-        return Filesystem::getContents($path);
+        return Filesystem::get($path);
     }
 
     /**
@@ -87,7 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?str
             return $default === null ? null : Markdown::render($default);
         }
 
-        return Markdown::render(Filesystem::getContents($path));
+        return Markdown::render(Filesystem::get($path));
     }
 
     /**
@@ -105,7 +105,7 @@ public static function blade(string $filename, ?string $default = null): ?string
             return $default === null ? null : Blade::render($default);
         }
 
-        return Blade::render(Filesystem::getContents($path));
+        return Blade::render(Filesystem::get($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string

From 84a6d9384c6523276945bdf69e50f12f05ec4fe2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:25:55 +0200
Subject: [PATCH 2006/2811] Use Illuminate filesystem

---
 .../tests/Unit/IncludesFacadeUnitTest.php       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index e4cee2d1a5c..1eea8568033 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,7 +9,7 @@
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Facades\Blade;
-use Hyde\Facades\Filesystem;
+use Illuminate\Filesystem\Filesystem;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -43,8 +43,9 @@ public function testGetReturnsPartial()
         $expected = 'foo bar';
 
         $filesystem = Mockery::mock(Filesystem::class);
+
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -72,7 +73,7 @@ public function testHtmlReturnsRenderedPartial()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -100,7 +101,7 @@ public function testHtmlWithAndWithoutExtension()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -115,7 +116,7 @@ public function testMarkdownReturnsRenderedPartial()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -149,7 +150,7 @@ public function testMarkdownWithAndWithoutExtension()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -166,7 +167,7 @@ public function testBladeReturnsRenderedPartial()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
         app()->instance(Filesystem::class, $filesystem);
 
@@ -183,7 +184,7 @@ public function testBladeWithAndWithoutExtension()
 
         $filesystem = Mockery::mock(Filesystem::class);
         $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('getContents')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
         app()->instance(Filesystem::class, $filesystem);
 

From a216620716561cdf5b73f651cf2b4be2f4f5a3e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:28:08 +0200
Subject: [PATCH 2007/2811] Don't mock Markdown class

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 1eea8568033..b5cfde5e7d5 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -120,8 +120,6 @@ public function testMarkdownReturnsRenderedPartial()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Markdown::shouldReceive('render')->with($content)->andReturn($expected);
-
         $this->assertSame($expected, Includes::markdown($filename));
     }
 
@@ -136,8 +134,6 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Markdown::shouldReceive('render')->with($default)->andReturn($expected);
-
         $this->assertNull(Includes::markdown($filename));
         $this->assertSame($expected, Includes::markdown($filename, $default));
     }
@@ -154,8 +150,6 @@ public function testMarkdownWithAndWithoutExtension()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Markdown::shouldReceive('render')->with($content)->andReturn($expected);
-
         $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
     }
 

From 5bcb54da0aa4557da05eb55808541c9ba5463cd6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:29:32 +0200
Subject: [PATCH 2008/2811] Add missing assertions

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index b5cfde5e7d5..dd4019c6038 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -150,7 +150,9 @@ public function testMarkdownWithAndWithoutExtension()
 
         app()->instance(Filesystem::class, $filesystem);
 
+        $this->assertSame($expected, Includes::markdown('foo.md'));
         $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
+        $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo.md'));
     }
 
     public function testBladeReturnsRenderedPartial()

From bfa129c21823d1671dd70c81c724e8ea8052fba6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:33:29 +0200
Subject: [PATCH 2009/2811] Clear resolved Blade instances

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index dd4019c6038..3a46f44d5f1 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -23,6 +23,7 @@ class IncludesFacadeUnitTest extends UnitTestCase
     protected function tearDown(): void
     {
         Mockery::close();
+        Blade::clearResolvedInstances();
 
         parent::tearDown();
     }

From 6288483c76b71abceb63c3c78cbfb53d56411582 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:35:11 +0200
Subject: [PATCH 2010/2811] Revert "Clear resolved Blade instances"

This reverts commit bfa129c21823d1671dd70c81c724e8ea8052fba6.
---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 3a46f44d5f1..dd4019c6038 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -23,7 +23,6 @@ class IncludesFacadeUnitTest extends UnitTestCase
     protected function tearDown(): void
     {
         Mockery::close();
-        Blade::clearResolvedInstances();
 
         parent::tearDown();
     }

From 852cb99d147d4f5e0d0beda110795f43956fbedf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:39:36 +0200
Subject: [PATCH 2011/2811] Remove Blade mocks

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index dd4019c6038..032080898c5 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -167,8 +167,6 @@ public function testBladeReturnsRenderedPartial()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Blade::shouldReceive('render')->with($content)->andReturn($expected);
-
         $this->assertSame($expected, Includes::blade($filename));
     }
 
@@ -184,8 +182,6 @@ public function testBladeWithAndWithoutExtension()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Blade::shouldReceive('render')->with($content)->andReturn($expected);
-
         $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
     }
 
@@ -200,8 +196,6 @@ public function testBladeReturnsDefaultValueWhenNotFound()
 
         app()->instance(Filesystem::class, $filesystem);
 
-        Blade::shouldReceive('render')->with($default)->andReturn($expected);
-
         $this->assertNull(Includes::blade($filename));
         $this->assertSame($expected, Includes::blade($filename, $default));
     }

From 60c21346cd1b419f16e41894870e1f3c4c3497da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:39:49 +0200
Subject: [PATCH 2012/2811] Revert "Remove Blade mocks"

This reverts commit 852cb99d147d4f5e0d0beda110795f43956fbedf.
---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 032080898c5..dd4019c6038 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -167,6 +167,8 @@ public function testBladeReturnsRenderedPartial()
 
         app()->instance(Filesystem::class, $filesystem);
 
+        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+
         $this->assertSame($expected, Includes::blade($filename));
     }
 
@@ -182,6 +184,8 @@ public function testBladeWithAndWithoutExtension()
 
         app()->instance(Filesystem::class, $filesystem);
 
+        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+
         $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
     }
 
@@ -196,6 +200,8 @@ public function testBladeReturnsDefaultValueWhenNotFound()
 
         app()->instance(Filesystem::class, $filesystem);
 
+        Blade::shouldReceive('render')->with($default)->andReturn($expected);
+
         $this->assertNull(Includes::blade($filename));
         $this->assertSame($expected, Includes::blade($filename, $default));
     }

From bd04137f1b753a3a28180945e9cb4ae939e82d08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:40:30 +0200
Subject: [PATCH 2013/2811] Swap Blade for a mock

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index dd4019c6038..c6f36f2606c 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -20,6 +20,13 @@ class IncludesFacadeUnitTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Blade::swap(Mockery::mock());
+    }
+
     protected function tearDown(): void
     {
         Mockery::close();

From 2661b8ed4058c84c3d72ef7811b8c55c1c9b1313 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:56:47 +0200
Subject: [PATCH 2014/2811] Refactor to extract helper method

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index c6f36f2606c..b79ca9d45fb 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Mockery;
+use Closure;
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
@@ -49,12 +50,10 @@ public function testGetReturnsPartial()
         $filename = 'foo.txt';
         $expected = 'foo bar';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+        });
 
         $this->assertSame($expected, Includes::get($filename));
     }
@@ -212,4 +211,13 @@ public function testBladeReturnsDefaultValueWhenNotFound()
         $this->assertNull(Includes::blade($filename));
         $this->assertSame($expected, Includes::blade($filename, $default));
     }
+
+    protected function mockFilesystem(Closure $config): void
+    {
+        $filesystem = Mockery::mock(Filesystem::class);
+
+        $config($filesystem);
+
+        app()->instance(Filesystem::class, $filesystem);
+    }
 }

From d950c906eb7f369297603f0d3261c505321f0484 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:57:49 +0200
Subject: [PATCH 2015/2811] Refactor with GPT 4 to use the added helper method

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 82 ++++++++-----------
 1 file changed, 36 insertions(+), 46 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index b79ca9d45fb..6aaca573af0 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -63,10 +63,9 @@ public function testGetReturnsDefaultValueWhenNotFound()
         $filename = 'foo.txt';
         $default = 'default';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+        });
 
         $this->assertNull(Includes::get($filename));
         $this->assertSame($default, Includes::get($filename, $default));
@@ -77,11 +76,10 @@ public function testHtmlReturnsRenderedPartial()
         $filename = 'foo.html';
         $expected = '<h1>foo bar</h1>';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+        });
 
         $this->assertSame($expected, Includes::html($filename));
     }
@@ -91,10 +89,9 @@ public function testHtmlReturnsDefaultValueWhenNotFound()
         $filename = 'foo.html';
         $default = '<h1>default</h1>';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+        });
 
         $this->assertNull(Includes::html($filename));
         $this->assertSame($default, Includes::html($filename, $default));
@@ -105,11 +102,10 @@ public function testHtmlWithAndWithoutExtension()
         $filename = 'foo.html';
         $content = '<h1>foo bar</h1>';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        });
 
         $this->assertSame(Includes::html('foo.html'), Includes::html('foo'));
     }
@@ -120,11 +116,10 @@ public function testMarkdownReturnsRenderedPartial()
         $content = '# foo bar';
         $expected = "<h1>foo bar</h1>\n";
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        });
 
         $this->assertSame($expected, Includes::markdown($filename));
     }
@@ -135,10 +130,9 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
         $default = '# default';
         $expected = "<h1>default</h1>\n";
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+        });
 
         $this->assertNull(Includes::markdown($filename));
         $this->assertSame($expected, Includes::markdown($filename, $default));
@@ -150,11 +144,10 @@ public function testMarkdownWithAndWithoutExtension()
         $content = '# foo bar';
         $expected = "<h1>foo bar</h1>\n";
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        });
 
         $this->assertSame($expected, Includes::markdown('foo.md'));
         $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
@@ -167,11 +160,10 @@ public function testBladeReturnsRenderedPartial()
         $content = '{{ "foo bar" }}';
         $expected = 'foo bar';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        });
 
         Blade::shouldReceive('render')->with($content)->andReturn($expected);
 
@@ -184,11 +176,10 @@ public function testBladeWithAndWithoutExtension()
         $content = '{{ "foo bar" }}';
         $expected = 'foo bar';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-        $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+        });
 
         Blade::shouldReceive('render')->with($content)->andReturn($expected);
 
@@ -201,10 +192,9 @@ public function testBladeReturnsDefaultValueWhenNotFound()
         $default = '{{ "default" }}';
         $expected = 'default';
 
-        $filesystem = Mockery::mock(Filesystem::class);
-        $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
-
-        app()->instance(Filesystem::class, $filesystem);
+        $this->mockFilesystem(function ($filesystem) use ($filename) {
+            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+        });
 
         Blade::shouldReceive('render')->with($default)->andReturn($expected);
 

From 5e7869fbad9e7d474496de3c938877f3f73e5328 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 10:59:12 +0200
Subject: [PATCH 2016/2811] Move variable assignments inside closures

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 6aaca573af0..c13fd8065f1 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -99,10 +99,10 @@ public function testHtmlReturnsDefaultValueWhenNotFound()
 
     public function testHtmlWithAndWithoutExtension()
     {
-        $filename = 'foo.html';
-        $content = '<h1>foo bar</h1>';
 
-        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+        $this->mockFilesystem(function ($filesystem) {
+            $filename = 'foo.html';
+            $content = '<h1>foo bar</h1>';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -113,10 +113,10 @@ public function testHtmlWithAndWithoutExtension()
     public function testMarkdownReturnsRenderedPartial()
     {
         $filename = 'foo.md';
-        $content = '# foo bar';
         $expected = "<h1>foo bar</h1>\n";
 
-        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+        $this->mockFilesystem(function ($filesystem) use ($filename) {
+            $content = '# foo bar';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -140,11 +140,11 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
 
     public function testMarkdownWithAndWithoutExtension()
     {
-        $filename = 'foo.md';
-        $content = '# foo bar';
         $expected = "<h1>foo bar</h1>\n";
 
-        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+        $this->mockFilesystem(function ($filesystem) {
+            $content = '# foo bar';
+            $filename = 'foo.md';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -172,11 +172,11 @@ public function testBladeReturnsRenderedPartial()
 
     public function testBladeWithAndWithoutExtension()
     {
-        $filename = 'foo.blade.php';
         $content = '{{ "foo bar" }}';
         $expected = 'foo bar';
 
-        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+        $this->mockFilesystem(function ($filesystem) use ($content) {
+            $filename = 'foo.blade.php';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });

From 4868497000d4b32e524d79d0ab9d523a60ff7b9d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 11:00:57 +0200
Subject: [PATCH 2017/2811] Refactor to move Blade mocks into closure

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index c13fd8065f1..33c226116c7 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -157,31 +157,31 @@ public function testMarkdownWithAndWithoutExtension()
     public function testBladeReturnsRenderedPartial()
     {
         $filename = 'foo.blade.php';
-        $content = '{{ "foo bar" }}';
         $expected = 'foo bar';
 
-        $this->mockFilesystem(function ($filesystem) use ($content, $filename) {
+        $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
+            $content = '{{ "foo bar" }}';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-        });
 
-        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+            Blade::shouldReceive('render')->with($content)->andReturn($expected);
+        });
 
         $this->assertSame($expected, Includes::blade($filename));
     }
 
     public function testBladeWithAndWithoutExtension()
     {
-        $content = '{{ "foo bar" }}';
-        $expected = 'foo bar';
 
-        $this->mockFilesystem(function ($filesystem) use ($content) {
+        $this->mockFilesystem(function ($filesystem) {
+            $expected = 'foo bar';
+            $content = '{{ "foo bar" }}';
             $filename = 'foo.blade.php';
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
-        });
 
-        Blade::shouldReceive('render')->with($content)->andReturn($expected);
+            Blade::shouldReceive('render')->with($content)->andReturn($expected);
+        });
 
         $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
     }
@@ -192,12 +192,11 @@ public function testBladeReturnsDefaultValueWhenNotFound()
         $default = '{{ "default" }}';
         $expected = 'default';
 
-        $this->mockFilesystem(function ($filesystem) use ($filename) {
+        $this->mockFilesystem(function ($filesystem) use ($default, $expected, $filename) {
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+            Blade::shouldReceive('render')->with($default)->andReturn($expected);
         });
 
-        Blade::shouldReceive('render')->with($default)->andReturn($expected);
-
         $this->assertNull(Includes::blade($filename));
         $this->assertSame($expected, Includes::blade($filename, $default));
     }

From 45e59cec354854878c89af9c66801e3db2ea709f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 11:01:28 +0200
Subject: [PATCH 2018/2811] Cleanup formatting

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 33c226116c7..853b000adf8 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -99,10 +99,10 @@ public function testHtmlReturnsDefaultValueWhenNotFound()
 
     public function testHtmlWithAndWithoutExtension()
     {
-
         $this->mockFilesystem(function ($filesystem) {
             $filename = 'foo.html';
             $content = '<h1>foo bar</h1>';
+
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -117,6 +117,7 @@ public function testMarkdownReturnsRenderedPartial()
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
             $content = '# foo bar';
+
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -145,6 +146,7 @@ public function testMarkdownWithAndWithoutExtension()
         $this->mockFilesystem(function ($filesystem) {
             $content = '# foo bar';
             $filename = 'foo.md';
+
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
         });
@@ -161,6 +163,7 @@ public function testBladeReturnsRenderedPartial()
 
         $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
             $content = '{{ "foo bar" }}';
+
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
@@ -172,11 +175,11 @@ public function testBladeReturnsRenderedPartial()
 
     public function testBladeWithAndWithoutExtension()
     {
-
         $this->mockFilesystem(function ($filesystem) {
             $expected = 'foo bar';
             $content = '{{ "foo bar" }}';
             $filename = 'foo.blade.php';
+
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
             $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
 
@@ -194,6 +197,7 @@ public function testBladeReturnsDefaultValueWhenNotFound()
 
         $this->mockFilesystem(function ($filesystem) use ($default, $expected, $filename) {
             $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+
             Blade::shouldReceive('render')->with($default)->andReturn($expected);
         });
 

From 26587084b390f7123e9a6054205dd6f27ff5c0cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 11:23:03 +0200
Subject: [PATCH 2019/2811] Add broader level feature test

---
 .../tests/Feature/IncludesFacadeTest.php      | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index cffcbb79f3c..5e7cbd70cd4 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -115,4 +115,59 @@ public function testBladeReturnsRenderedDefaultValueWhenNotFound()
         $this->assertNull(Includes::blade('foo.blade.php'));
         $this->assertSame('default', Includes::blade('foo.blade.php', '{{ "default" }}'));
     }
+
+    public function testAdvancedMarkdownDocumentIsCompiledToHtml()
+    {
+        $markdown = <<<'MARKDOWN'
+        # Heading
+        
+        This is a paragraph. It has some **bold** and *italic* text.
+        
+        >info Info Blockquote
+        
+        ```php
+        // filepath: hello.php
+        echo 'Hello, World!';
+        ```
+        
+        ## Subheading
+        
+        
+        - [x] Checked task list
+        - [ ] Unchecked task list
+        
+        ### Table
+        
+        | Syntax | Description |
+        | ----------- | ----------- |
+        | Header | Title |
+        | Paragraph | Text |
+        
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <h1>Heading</h1>
+        <p>This is a paragraph. It has some <strong>bold</strong> and <em>italic</em> text.</p>
+        <blockquote>
+        <p>info Info Blockquote</p>
+        </blockquote>
+        <pre><code class="language-php">// filepath: hello.php
+        echo 'Hello, World!';
+        </code></pre>
+        <h2>Subheading</h2>
+        <ul>
+        <li>[x] Checked task list</li>
+        <li>[ ] Unchecked task list</li>
+        </ul>
+        <h3>Table</h3>
+        <p>| Syntax | Description |
+        | ----------- | ----------- |
+        | Header | Title |
+        | Paragraph | Text |</p>
+
+        HTML;
+
+        $this->file('resources/includes/advanced.md', $markdown);
+        $this->assertSame($expected, Includes::markdown('advanced.md'));
+    }
 }

From 9f6a57918ee93722c33e79230985cd503ace8fc5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 11:28:12 +0200
Subject: [PATCH 2020/2811] Specify page class to use the custom Markdown
 features

---
 packages/framework/src/Support/Includes.php   |  5 +--
 .../tests/Feature/IncludesFacadeTest.php      | 33 ++++++++++++-------
 .../tests/Unit/IncludesFacadeUnitTest.php     |  1 +
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 2f02b38d801..0f537a1f8f7 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Filesystem;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
@@ -84,10 +85,10 @@ public static function markdown(string $filename, ?string $default = null): ?str
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : Markdown::render($default);
+            return $default === null ? null : Markdown::render($default, HydePage::class);
         }
 
-        return Markdown::render(Filesystem::get($path));
+        return Markdown::render(Filesystem::get($path), HydePage::class);
     }
 
     /**
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 5e7cbd70cd4..9af0751f203 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -148,22 +148,33 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         $expected = <<<'HTML'
         <h1>Heading</h1>
         <p>This is a paragraph. It has some <strong>bold</strong> and <em>italic</em> text.</p>
-        <blockquote>
-        <p>info Info Blockquote</p>
-        </blockquote>
-        <pre><code class="language-php">// filepath: hello.php
-        echo 'Hello, World!';
+        <blockquote class="info"><p>Info Blockquote</p></blockquote>
+        <pre><code class="language-php"><small class="filepath not-prose"><span class="sr-only">Filepath: </span>hello.php</small>echo 'Hello, World!';
         </code></pre>
         <h2>Subheading</h2>
         <ul>
-        <li>[x] Checked task list</li>
-        <li>[ ] Unchecked task list</li>
+        <li><input checked="" disabled="" type="checkbox"> Checked task list</li>
+        <li><input disabled="" type="checkbox"> Unchecked task list</li>
         </ul>
         <h3>Table</h3>
-        <p>| Syntax | Description |
-        | ----------- | ----------- |
-        | Header | Title |
-        | Paragraph | Text |</p>
+        <table>
+        <thead>
+        <tr>
+        <th>Syntax</th>
+        <th>Description</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+        <td>Header</td>
+        <td>Title</td>
+        </tr>
+        <tr>
+        <td>Paragraph</td>
+        <td>Text</td>
+        </tr>
+        </tbody>
+        </table>
 
         HTML;
 
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 853b000adf8..9343147f18b 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -20,6 +20,7 @@
 class IncludesFacadeUnitTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
 
     protected function setUp(): void
     {

From f15bea8eb839e0121b166a9ed30c6b89811d0104 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:32:37 +0200
Subject: [PATCH 2021/2811] Change page class used to render Markdown partials
 to MarkdownDocument

See https://github.com/hydephp/develop/pull/1738#discussion_r1654660038
---
 packages/framework/src/Support/Includes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 0f537a1f8f7..6433d7561c5 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Filesystem;
-use Hyde\Pages\Concerns\HydePage;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
@@ -85,10 +85,10 @@ public static function markdown(string $filename, ?string $default = null): ?str
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : Markdown::render($default, HydePage::class);
+            return $default === null ? null : Markdown::render($default, MarkdownDocument::class);
         }
 
-        return Markdown::render(Filesystem::get($path), HydePage::class);
+        return Markdown::render(Filesystem::get($path), MarkdownDocument::class);
     }
 
     /**

From 9a8538c0a75b5255d44d739a3ff9affcb254179d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:35:20 +0200
Subject: [PATCH 2022/2811] Add test for current state

---
 .../tests/Feature/IncludesFacadeTest.php         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 9af0751f203..7ce41b0cfd9 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -181,4 +181,20 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         $this->file('resources/includes/advanced.md', $markdown);
         $this->assertSame($expected, Includes::markdown('advanced.md'));
     }
+
+    public function testTorchlightAttributionIsInjectedToMarkdownPartials()
+    {
+        $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
+
+        $this->assertSame(
+            '<p>Syntax highlighted by torchlight.dev</p>
+<br><p>
+    <i>
+        Syntax highlighting by <a href="https://torchlight.dev/" rel="noopener nofollow">Torchlight.dev</a>
+    </i>
+</p>
+',
+            Includes::markdown('without-torchlight.md')
+        );
+    }
 }

From 83c613649bcb2199a452251254e2d17479ed81ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:37:37 +0200
Subject: [PATCH 2023/2811] Do not inject Torchlight attribution for included
 partials

See https://github.com/hydephp/develop/pull/1738#discussion_r1654660038
---
 .../framework/src/Framework/Services/MarkdownService.php   | 2 ++
 packages/framework/tests/Feature/IncludesFacadeTest.php    | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 79bf560b41c..1e13044b681 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Config;
 use Hyde\Facades\Features;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Markdown\MarkdownConverter;
@@ -186,6 +187,7 @@ public function hasFeature(string $feature): bool
     protected function determineIfTorchlightAttributionShouldBeInjected(): bool
     {
         return ! $this->isDocumentationPage()
+            && ! (isset($this->pageClass) && $this->pageClass === MarkdownDocument::class)
             && Config::getBool('torchlight.attribution.enabled', true)
             && str_contains($this->html, 'Syntax highlighted by torchlight.dev');
     }
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 7ce41b0cfd9..71d5016af3f 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -182,17 +182,12 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         $this->assertSame($expected, Includes::markdown('advanced.md'));
     }
 
-    public function testTorchlightAttributionIsInjectedToMarkdownPartials()
+    public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
     {
         $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
 
         $this->assertSame(
             '<p>Syntax highlighted by torchlight.dev</p>
-<br><p>
-    <i>
-        Syntax highlighting by <a href="https://torchlight.dev/" rel="noopener nofollow">Torchlight.dev</a>
-    </i>
-</p>
 ',
             Includes::markdown('without-torchlight.md')
         );

From e56494d6f74b066a5dccffb2ef092fc654b1f442 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:38:14 +0200
Subject: [PATCH 2024/2811] Clean up formatting

---
 packages/framework/tests/Feature/IncludesFacadeTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 71d5016af3f..dbbc680fa9f 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -187,8 +187,7 @@ public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
         $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
 
         $this->assertSame(
-            '<p>Syntax highlighted by torchlight.dev</p>
-',
+            "<p>Syntax highlighted by torchlight.dev</p>\n",
             Includes::markdown('without-torchlight.md')
         );
     }

From 9d4a85bccde1b6f80a1129bdb470a74cd3cc2a39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:50:05 +0200
Subject: [PATCH 2025/2811] Move up test in source

---
 .../tests/Feature/IncludesFacadeTest.php      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index dbbc680fa9f..137824e3be0 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -116,6 +116,16 @@ public function testBladeReturnsRenderedDefaultValueWhenNotFound()
         $this->assertSame('default', Includes::blade('foo.blade.php', '{{ "default" }}'));
     }
 
+    public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
+    {
+        $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
+
+        $this->assertSame(
+            "<p>Syntax highlighted by torchlight.dev</p>\n",
+            Includes::markdown('without-torchlight.md')
+        );
+    }
+
     public function testAdvancedMarkdownDocumentIsCompiledToHtml()
     {
         $markdown = <<<'MARKDOWN'
@@ -181,14 +191,4 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         $this->file('resources/includes/advanced.md', $markdown);
         $this->assertSame($expected, Includes::markdown('advanced.md'));
     }
-
-    public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
-    {
-        $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
-
-        $this->assertSame(
-            "<p>Syntax highlighted by torchlight.dev</p>\n",
-            Includes::markdown('without-torchlight.md')
-        );
-    }
 }

From 0225eddf4ad7af57a8b51b9a6fb1002620f88887 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:51:58 +0200
Subject: [PATCH 2026/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a62b07d4786..65127708ac2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -29,6 +29,7 @@ This serves two purposes:
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
 - Calling the `DataCollection` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
+- Markdown includes are now converted to HTML using the custom HydePHP Markdown service, meaning they now support full GFM spec and custom Hyde features like colored blockquotes and code block filepath labels.
 
 ### Deprecated
 - for soon-to-be removed features.

From b7a7a79ae947919704de0dd8019c21b00139038d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 14:52:45 +0200
Subject: [PATCH 2027/2811] Extract helper method

---
 .../tests/Unit/IncludesFacadeUnitTest.php     | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 9343147f18b..d7eeb8f9269 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -52,8 +52,8 @@ public function testGetReturnsPartial()
         $expected = 'foo bar';
 
         $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($expected);
         });
 
         $this->assertSame($expected, Includes::get($filename));
@@ -65,7 +65,7 @@ public function testGetReturnsDefaultValueWhenNotFound()
         $default = 'default';
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(false);
         });
 
         $this->assertNull(Includes::get($filename));
@@ -78,8 +78,8 @@ public function testHtmlReturnsRenderedPartial()
         $expected = '<h1>foo bar</h1>';
 
         $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($expected);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($expected);
         });
 
         $this->assertSame($expected, Includes::html($filename));
@@ -91,7 +91,7 @@ public function testHtmlReturnsDefaultValueWhenNotFound()
         $default = '<h1>default</h1>';
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(false);
         });
 
         $this->assertNull(Includes::html($filename));
@@ -104,8 +104,8 @@ public function testHtmlWithAndWithoutExtension()
             $filename = 'foo.html';
             $content = '<h1>foo bar</h1>';
 
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
         $this->assertSame(Includes::html('foo.html'), Includes::html('foo'));
@@ -119,8 +119,8 @@ public function testMarkdownReturnsRenderedPartial()
         $this->mockFilesystem(function ($filesystem) use ($filename) {
             $content = '# foo bar';
 
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
         $this->assertSame($expected, Includes::markdown($filename));
@@ -133,7 +133,7 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
         $expected = "<h1>default</h1>\n";
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(false);
         });
 
         $this->assertNull(Includes::markdown($filename));
@@ -148,8 +148,8 @@ public function testMarkdownWithAndWithoutExtension()
             $content = '# foo bar';
             $filename = 'foo.md';
 
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
         $this->assertSame($expected, Includes::markdown('foo.md'));
@@ -165,8 +165,8 @@ public function testBladeReturnsRenderedPartial()
         $this->mockFilesystem(function ($filesystem) use ($expected, $filename) {
             $content = '{{ "foo bar" }}';
 
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
 
             Blade::shouldReceive('render')->with($content)->andReturn($expected);
         });
@@ -181,8 +181,8 @@ public function testBladeWithAndWithoutExtension()
             $content = '{{ "foo bar" }}';
             $filename = 'foo.blade.php';
 
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(true);
-            $filesystem->shouldReceive('get')->with(Hyde::path('resources/includes/'.$filename))->andReturn($content);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
 
             Blade::shouldReceive('render')->with($content)->andReturn($expected);
         });
@@ -197,7 +197,7 @@ public function testBladeReturnsDefaultValueWhenNotFound()
         $expected = 'default';
 
         $this->mockFilesystem(function ($filesystem) use ($default, $expected, $filename) {
-            $filesystem->shouldReceive('exists')->with(Hyde::path('resources/includes/'.$filename))->andReturn(false);
+            $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(false);
 
             Blade::shouldReceive('render')->with($default)->andReturn($expected);
         });
@@ -214,4 +214,9 @@ protected function mockFilesystem(Closure $config): void
 
         app()->instance(Filesystem::class, $filesystem);
     }
+
+    protected function includesPath(string $filename): string
+    {
+        return Hyde::path('resources/includes/'.$filename);
+    }
 }

From 5c1833ebf64ad0f90d82cdc597239619d7bafd90 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:32:33 +0200
Subject: [PATCH 2028/2811] Test advanced Blade partial is compiled to HTML

---
 .../tests/Feature/IncludesFacadeTest.php      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 137824e3be0..6019ffdf528 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -191,4 +191,37 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         $this->file('resources/includes/advanced.md', $markdown);
         $this->assertSame($expected, Includes::markdown('advanced.md'));
     }
+
+    public function testAdvancedBladePartialIsCompiledToHtml()
+    {
+        $blade = <<<'BLADE'
+        <h1>Heading</h1>
+        @foreach(range(1, 3) as $i)
+            <p>Paragraph {{ $i }}</p>
+        @endforeach
+
+        @include('hyde::components.link')
+        
+        {{-- This is a comment --}}
+
+        @php($foo = 'bar')
+
+        {{ 'foo' . $foo }}
+        BLADE;
+
+        $expected = <<<'HTML'
+        <h1>Heading</h1>
+            <p>Paragraph 1</p>
+            <p>Paragraph 2</p>
+            <p>Paragraph 3</p>
+        
+        
+        
+        
+        foobar
+        HTML;
+
+        $this->file('resources/includes/advanced.blade.php', $blade);
+        $this->assertSame($expected, Includes::blade('advanced.blade.php'));
+    }
 }

From 0127802f7e533a3c9eefb85648584a2e14f3d0cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:32:50 +0200
Subject: [PATCH 2029/2811] Remove link include requiring more setup

---
 packages/framework/tests/Feature/IncludesFacadeTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 6019ffdf528..87c8dd908f1 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -200,8 +200,6 @@ public function testAdvancedBladePartialIsCompiledToHtml()
             <p>Paragraph {{ $i }}</p>
         @endforeach
 
-        @include('hyde::components.link')
-        
         {{-- This is a comment --}}
 
         @php($foo = 'bar')

From 1d25d0100d1513b9a896a189821f797546fe9a95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:34:03 +0200
Subject: [PATCH 2030/2811] Clean up whitespace

---
 .../framework/tests/Feature/IncludesFacadeTest.php     | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 87c8dd908f1..8dd2594c9cb 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -199,12 +199,9 @@ public function testAdvancedBladePartialIsCompiledToHtml()
         @foreach(range(1, 3) as $i)
             <p>Paragraph {{ $i }}</p>
         @endforeach
-
         {{-- This is a comment --}}
-
         @php($foo = 'bar')
-
-        {{ 'foo' . $foo }}
+        {{ 'foo ' . $foo }}
         BLADE;
 
         $expected = <<<'HTML'
@@ -213,10 +210,7 @@ public function testAdvancedBladePartialIsCompiledToHtml()
             <p>Paragraph 2</p>
             <p>Paragraph 3</p>
         
-        
-        
-        
-        foobar
+        foo bar
         HTML;
 
         $this->file('resources/includes/advanced.blade.php', $blade);

From ffc8e7d42353989762fd22e2366eb536ff0c1c72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:43:31 +0200
Subject: [PATCH 2031/2811] Test includes usage from Blade view

Emulates the actual usage of the Includes facade from a Blade view
---
 .../tests/Feature/IncludesFacadeTest.php      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 8dd2594c9cb..66be0e393e3 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Includes;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Blade;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -216,4 +217,28 @@ public function testAdvancedBladePartialIsCompiledToHtml()
         $this->file('resources/includes/advanced.blade.php', $blade);
         $this->assertSame($expected, Includes::blade('advanced.blade.php'));
     }
+
+    public function testIncludesUsageFromBladeView()
+    {
+        // Emulates the actual usage of the Includes facade from a Blade view.
+
+        $this->file('resources/includes/foo.blade.php', '{{ "foo bar" }}');
+        $this->file('resources/includes/foo.md', '# foo bar');
+        $this->file('resources/includes/foo.html', '<h1>foo bar</h1>');
+
+        $view = <<<'BLADE'
+        {!! Includes::blade('foo.blade.php') !!}
+        {!! Includes::markdown('foo.md') !!}
+        {!! Includes::html('foo.html') !!}
+        BLADE;
+
+        $expected = <<<'HTML'
+        foo bar
+        <h1>foo bar</h1>
+
+        <h1>foo bar</h1>
+        HTML;
+
+        $this->assertSame($expected, Blade::render($view));
+    }
 }

From b64292050aa1dafe30ee69351a8a9bbfd74d2332 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:46:20 +0200
Subject: [PATCH 2032/2811] Test without extensions

---
 .../framework/tests/Feature/IncludesFacadeTest.php  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 66be0e393e3..5c2d60367c3 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -227,15 +227,28 @@ public function testIncludesUsageFromBladeView()
         $this->file('resources/includes/foo.html', '<h1>foo bar</h1>');
 
         $view = <<<'BLADE'
+        // With extension
         {!! Includes::blade('foo.blade.php') !!}
         {!! Includes::markdown('foo.md') !!}
         {!! Includes::html('foo.html') !!}
+        
+        // Without extension
+        {!! Includes::blade('foo') !!}
+        {!! Includes::markdown('foo') !!}
+        {!! Includes::html('foo') !!}
         BLADE;
 
         $expected = <<<'HTML'
+        // With extension
         foo bar
         <h1>foo bar</h1>
 
+        <h1>foo bar</h1>
+
+        // Without extension
+        foo bar
+        <h1>foo bar</h1>
+        
         <h1>foo bar</h1>
         HTML;
 

From f6d975564bebf74bd29590eef7fb014c155ff8b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:47:10 +0200
Subject: [PATCH 2033/2811] Add element to match others

---
 packages/framework/tests/Feature/IncludesFacadeTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 5c2d60367c3..c93d1d427e1 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -222,7 +222,7 @@ public function testIncludesUsageFromBladeView()
     {
         // Emulates the actual usage of the Includes facade from a Blade view.
 
-        $this->file('resources/includes/foo.blade.php', '{{ "foo bar" }}');
+        $this->file('resources/includes/foo.blade.php', '<h1>{{ "foo bar" }}</h1>');
         $this->file('resources/includes/foo.md', '# foo bar');
         $this->file('resources/includes/foo.html', '<h1>foo bar</h1>');
 
@@ -240,13 +240,13 @@ public function testIncludesUsageFromBladeView()
 
         $expected = <<<'HTML'
         // With extension
-        foo bar
+        <h1>foo bar</h1>
         <h1>foo bar</h1>
 
         <h1>foo bar</h1>
 
         // Without extension
-        foo bar
+        <h1>foo bar</h1>
         <h1>foo bar</h1>
         
         <h1>foo bar</h1>

From b207e9b79b3ac849d7432fac167af503c4def647 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:48:06 +0200
Subject: [PATCH 2034/2811] Clarify the test data

---
 .../tests/Feature/IncludesFacadeTest.php      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index c93d1d427e1..c2300c32520 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -222,9 +222,9 @@ public function testIncludesUsageFromBladeView()
     {
         // Emulates the actual usage of the Includes facade from a Blade view.
 
-        $this->file('resources/includes/foo.blade.php', '<h1>{{ "foo bar" }}</h1>');
-        $this->file('resources/includes/foo.md', '# foo bar');
-        $this->file('resources/includes/foo.html', '<h1>foo bar</h1>');
+        $this->file('resources/includes/foo.blade.php', '<h1>{{ "Rendered Blade" }}</h1>');
+        $this->file('resources/includes/foo.md', '# Compiled Markdown');
+        $this->file('resources/includes/foo.html', '<h1>Literal HTML</h1>');
 
         $view = <<<'BLADE'
         // With extension
@@ -240,16 +240,16 @@ public function testIncludesUsageFromBladeView()
 
         $expected = <<<'HTML'
         // With extension
-        <h1>foo bar</h1>
-        <h1>foo bar</h1>
+        <h1>Rendered Blade</h1>
+        <h1>Compiled Markdown</h1>
 
-        <h1>foo bar</h1>
+        <h1>Literal HTML</h1>
 
         // Without extension
-        <h1>foo bar</h1>
-        <h1>foo bar</h1>
-        
-        <h1>foo bar</h1>
+        <h1>Rendered Blade</h1>
+        <h1>Compiled Markdown</h1>
+
+        <h1>Literal HTML</h1>
         HTML;
 
         $this->assertSame($expected, Blade::render($view));

From 2d8a349ce729d54307ef6cbb9cb0673bc23c473e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:49:28 +0200
Subject: [PATCH 2035/2811] Reorder lines

---
 .../framework/tests/Feature/IncludesFacadeTest.php     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index c2300c32520..4b2a1426a2f 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -223,33 +223,33 @@ public function testIncludesUsageFromBladeView()
         // Emulates the actual usage of the Includes facade from a Blade view.
 
         $this->file('resources/includes/foo.blade.php', '<h1>{{ "Rendered Blade" }}</h1>');
-        $this->file('resources/includes/foo.md', '# Compiled Markdown');
         $this->file('resources/includes/foo.html', '<h1>Literal HTML</h1>');
+        $this->file('resources/includes/foo.md', '# Compiled Markdown');
 
         $view = <<<'BLADE'
         // With extension
+        {!! Includes::html('foo.html') !!}
         {!! Includes::blade('foo.blade.php') !!}
         {!! Includes::markdown('foo.md') !!}
-        {!! Includes::html('foo.html') !!}
         
         // Without extension
+        {!! Includes::html('foo') !!}
         {!! Includes::blade('foo') !!}
         {!! Includes::markdown('foo') !!}
-        {!! Includes::html('foo') !!}
         BLADE;
 
         $expected = <<<'HTML'
         // With extension
+        <h1>Literal HTML</h1>
         <h1>Rendered Blade</h1>
         <h1>Compiled Markdown</h1>
 
-        <h1>Literal HTML</h1>
 
         // Without extension
+        <h1>Literal HTML</h1>
         <h1>Rendered Blade</h1>
         <h1>Compiled Markdown</h1>
 
-        <h1>Literal HTML</h1>
         HTML;
 
         $this->assertSame($expected, Blade::render($view));

From 1365f1c7622b551c600301434010b77aac94c79b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:51:17 +0200
Subject: [PATCH 2036/2811] Document the associated PR

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 65127708ac2..3618c72eb0e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -29,7 +29,7 @@ This serves two purposes:
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
 - Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
 - Calling the `DataCollection` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
-- Markdown includes are now converted to HTML using the custom HydePHP Markdown service, meaning they now support full GFM spec and custom Hyde features like colored blockquotes and code block filepath labels.
+- Markdown includes are now converted to HTML using the custom HydePHP Markdown service, meaning they now support full GFM spec and custom Hyde features like colored blockquotes and code block filepath labels in https://github.com/hydephp/develop/pull/1738
 
 ### Deprecated
 - for soon-to-be removed features.

From 9cc70f67766e4dddd88c5f30a22dd599136f8497 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 19:53:09 +0200
Subject: [PATCH 2037/2811] Trim trailing whitespace from included Markdown

To normalize with the Blade and Html includes
---
 RELEASE_NOTES.md                                         | 1 +
 packages/framework/src/Support/Includes.php              | 5 +++--
 packages/framework/tests/Feature/IncludesFacadeTest.php  | 9 +++------
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3618c72eb0e..6e13734032e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -30,6 +30,7 @@ This serves two purposes:
 - Calling the `Include::path()` method will no longer create the includes directory in https://github.com/hydephp/develop/pull/1707
 - Calling the `DataCollection` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
 - Markdown includes are now converted to HTML using the custom HydePHP Markdown service, meaning they now support full GFM spec and custom Hyde features like colored blockquotes and code block filepath labels in https://github.com/hydephp/develop/pull/1738
+- Markdown returned from includes are now trimmed of trailing whitespace and newlines in https://github.com/hydephp/develop/pull/1738
 
 ### Deprecated
 - for soon-to-be removed features.
diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 6433d7561c5..a032e9ab2dd 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -10,6 +10,7 @@
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
+use function trim;
 use function basename;
 
 /**
@@ -85,10 +86,10 @@ public static function markdown(string $filename, ?string $default = null): ?str
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : Markdown::render($default, MarkdownDocument::class);
+            return $default === null ? null : trim(Markdown::render($default, MarkdownDocument::class));
         }
 
-        return Markdown::render(Filesystem::get($path), MarkdownDocument::class);
+        return trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class));
     }
 
     /**
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 4b2a1426a2f..13f2dbf89d7 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -77,7 +77,7 @@ public function testHtmlWithAndWithoutExtension()
 
     public function testMarkdownReturnsRenderedPartial()
     {
-        $expected = "<h1>foo bar</h1>\n";
+        $expected = '<h1>foo bar</h1>';
         file_put_contents(Hyde::path('resources/includes/foo.md'), '# foo bar');
         $this->assertSame($expected, Includes::markdown('foo.md'));
         Filesystem::unlink('resources/includes/foo.md');
@@ -86,7 +86,7 @@ public function testMarkdownReturnsRenderedPartial()
     public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
     {
         $this->assertNull(Includes::markdown('foo.md'));
-        $this->assertSame("<h1>default</h1>\n", Includes::markdown('foo.md', '# default'));
+        $this->assertSame('<h1>default</h1>', Includes::markdown('foo.md', '# default'));
     }
 
     public function testMarkdownWithAndWithoutExtension()
@@ -122,7 +122,7 @@ public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
         $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
 
         $this->assertSame(
-            "<p>Syntax highlighted by torchlight.dev</p>\n",
+            '<p>Syntax highlighted by torchlight.dev</p>',
             Includes::markdown('without-torchlight.md')
         );
     }
@@ -186,7 +186,6 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         </tr>
         </tbody>
         </table>
-
         HTML;
 
         $this->file('resources/includes/advanced.md', $markdown);
@@ -244,12 +243,10 @@ public function testIncludesUsageFromBladeView()
         <h1>Rendered Blade</h1>
         <h1>Compiled Markdown</h1>
 
-
         // Without extension
         <h1>Literal HTML</h1>
         <h1>Rendered Blade</h1>
         <h1>Compiled Markdown</h1>
-
         HTML;
 
         $this->assertSame($expected, Blade::render($view));
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index d7eeb8f9269..7abd16eb9a4 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -114,7 +114,7 @@ public function testHtmlWithAndWithoutExtension()
     public function testMarkdownReturnsRenderedPartial()
     {
         $filename = 'foo.md';
-        $expected = "<h1>foo bar</h1>\n";
+        $expected = '<h1>foo bar</h1>';
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
             $content = '# foo bar';
@@ -130,7 +130,7 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
     {
         $filename = 'foo.md';
         $default = '# default';
-        $expected = "<h1>default</h1>\n";
+        $expected = '<h1>default</h1>';
 
         $this->mockFilesystem(function ($filesystem) use ($filename) {
             $filesystem->shouldReceive('exists')->with($this->includesPath($filename))->andReturn(false);
@@ -142,7 +142,7 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
 
     public function testMarkdownWithAndWithoutExtension()
     {
-        $expected = "<h1>foo bar</h1>\n";
+        $expected = '<h1>foo bar</h1>';
 
         $this->mockFilesystem(function ($filesystem) {
             $content = '# foo bar';

From eeb1fe49171c48048575922287275bfc3085884d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:00:24 +0200
Subject: [PATCH 2038/2811] Clarify how the test works

---
 .../framework/tests/Feature/IncludesFacadeTest.php  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 13f2dbf89d7..99a5d1adfbf 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -119,12 +119,15 @@ public function testBladeReturnsRenderedDefaultValueWhenNotFound()
 
     public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
     {
-        $this->file('resources/includes/without-torchlight.md', 'Syntax highlighted by torchlight.dev');
+        $placeholder = 'Syntax highlighted by torchlight.dev';
+        $this->file('resources/includes/without-torchlight.md', $placeholder);
 
-        $this->assertSame(
-            '<p>Syntax highlighted by torchlight.dev</p>',
-            Includes::markdown('without-torchlight.md')
-        );
+        $rendered = Includes::markdown('without-torchlight.md');
+
+        $attribution = 'Syntax highlighting by <a href="https://torchlight.dev/" rel="noopener nofollow">Torchlight.dev</a>';
+
+        $this->assertStringNotContainsString($attribution, $rendered);
+        $this->assertSame("<p>$placeholder</p>", $rendered);
     }
 
     public function testAdvancedMarkdownDocumentIsCompiledToHtml()

From e9b877ae77e57d3e7e0a24903b3da76c6ae28028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:02:41 +0200
Subject: [PATCH 2039/2811] Add cases for the current escape state

---
 .../framework/tests/Feature/IncludesFacadeTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 99a5d1adfbf..860467c5656 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -238,6 +238,11 @@ public function testIncludesUsageFromBladeView()
         {!! Includes::html('foo') !!}
         {!! Includes::blade('foo') !!}
         {!! Includes::markdown('foo') !!}
+        
+        // With escaped
+        {{ Includes::html('foo.html') }}
+        {{ Includes::blade('foo.blade.php') }}
+        {{ Includes::markdown('foo.md') }}
         BLADE;
 
         $expected = <<<'HTML'
@@ -250,6 +255,11 @@ public function testIncludesUsageFromBladeView()
         <h1>Literal HTML</h1>
         <h1>Rendered Blade</h1>
         <h1>Compiled Markdown</h1>
+
+        // With escaped
+        &lt;h1&gt;Literal HTML&lt;/h1&gt;
+        &lt;h1&gt;Rendered Blade&lt;/h1&gt;
+        &lt;h1&gt;Compiled Markdown&lt;/h1&gt;
         HTML;
 
         $this->assertSame($expected, Blade::render($view));

From 6f656e4379e3a4b01e19d35f7b501b15320cf437 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:24:27 +0200
Subject: [PATCH 2040/2811] Extra comment clarification

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index a032e9ab2dd..6e88fb4506f 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -43,7 +43,7 @@ public static function path(?string $filename = null): string
      *
      * @param  string  $filename  The name of the partial file, including the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
-     * @return string|null The contents of the partial file, or the default value if not found.
+     * @return string|null The raw contents of the partial file, or the default value if not found.
      */
     public static function get(string $filename, ?string $default = null): ?string
     {

From cc3317414ed261237582546cdb9c3703ba6a74d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:43:58 +0200
Subject: [PATCH 2041/2811] Update `Includes` helpers to return `HtmlString`
 objects

Fixes https://github.com/hydephp/develop/issues/1734
---
 RELEASE_NOTES.md                              | 20 ++++++++++
 docs/digging-deeper/helpers.md                | 10 ++++-
 packages/framework/src/Support/Includes.php   | 25 ++++++------
 .../tests/Feature/IncludesFacadeTest.php      | 39 +++++++++++--------
 .../tests/Unit/IncludesFacadeUnitTest.php     | 29 ++++++++------
 5 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6e13734032e..c37997d25b4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -24,6 +24,7 @@ This serves two purposes:
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566
 - Minor: Changed the default build task message to make it more concise in https://github.com/hydephp/develop/pull/1659
 - Minor: Data collection files are now validated for syntax errors during discovery in https://github.com/hydephp/develop/pull/1732
+- Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
@@ -223,6 +224,25 @@ For example, if you triggered the media transfer with a build service method cal
 (new TransferMediaAssets())->run();
 ```
 
+### Includes facade changes
+
+The following methods in the `Includes` facade now return `HtmlString` objects instead of `string`:
+
+- `Includes::html()`
+- `Includes::blade()`
+- `Includes::markdown()`
+
+- This means that you no longer need to use `{!! !!}` to render the output of these methods in Blade templates, instead just use `{{ }}`.
+- If you have used the return value of these methods in custom code, you may need to adjust your code to work with the new return type.
+
+For more information, see the RFC that proposed this change: https://github.com/hydephp/develop/issues/1734
+The RFC was implemented in https://github.com/hydephp/develop/pull/1738
+
+#### Remember to escape output if necessary
+
+**Note:** Remember that this means that includes are **no longer escaped** by default, so make sure to escape the output if necessary, for example if the content is user-generated.
+- (Use `{{ e(Includes::html('foo')) }}` instead of `{{ Includes::html('foo') }}` to escape the output, matching the previous behavior.)
+
 ### DataCollection API changes
 
 The DataCollection feature has been reworked to improve the developer experience and make it more consistent with the rest of the API.
diff --git a/docs/digging-deeper/helpers.md b/docs/digging-deeper/helpers.md
index 6414fba758a..8cde4e71f1d 100644
--- a/docs/digging-deeper/helpers.md
+++ b/docs/digging-deeper/helpers.md
@@ -73,7 +73,15 @@ Includes::markdown('example') === Includes::markdown('example.md');
 
 All methods will return `null` if the file does not exist.
 However, you can supply a default value as the second argument to be used instead.
-Remember that Markdown and Blade defaults will still be rendered to HTML.
+Remember that Markdown and Blade defaults will also be rendered to HTML.
+
+Includes are particularly useful in Blade views, as you can echo them directly. You do not need to import the namespace, as it is already aliased.
+
+```blade
+<footer>
+    {{ Includes::markdown('footer.md') }}
+</footer>
+```
 
 ```php
 use Hyde\Support\Includes;
diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 6e88fb4506f..182ce218c7b 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Facades\Filesystem;
+use Illuminate\Support\HtmlString;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
@@ -61,17 +62,17 @@ public static function get(string $filename, ?string $default = null): ?string
      *
      * @param  string  $filename  The name of the partial file, with or without the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
-     * @return string|null The raw contents of the partial file, or the default value if not found.
+     * @return HtmlString|null The contents of the partial file, or the default value if not found.
      */
-    public static function html(string $filename, ?string $default = null): ?string
+    public static function html(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.html');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : $default;
+            return $default === null ? null : new HtmlString($default);
         }
 
-        return Filesystem::get($path);
+        return new HtmlString(Filesystem::get($path));
     }
 
     /**
@@ -79,17 +80,17 @@ public static function html(string $filename, ?string $default = null): ?string
      *
      * @param  string  $filename  The name of the partial file, with or without the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
-     * @return string|null The rendered contents of the partial file, or the default value if not found.
+     * @return HtmlString|null The rendered contents of the partial file, or the default value if not found.
      */
-    public static function markdown(string $filename, ?string $default = null): ?string
+    public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : trim(Markdown::render($default, MarkdownDocument::class));
+            return $default === null ? null : new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
         }
 
-        return trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class));
+        return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));
     }
 
     /**
@@ -97,17 +98,17 @@ public static function markdown(string $filename, ?string $default = null): ?str
      *
      * @param  string  $filename  The name of the partial file, with or without the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
-     * @return string|null The rendered contents of the partial file, or the default value if not found.
+     * @return HtmlString|null The rendered contents of the partial file, or the default value if not found.
      */
-    public static function blade(string $filename, ?string $default = null): ?string
+    public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.blade.php');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : Blade::render($default);
+            return $default === null ? null : new HtmlString(Blade::render($default));
         }
 
-        return Blade::render(Filesystem::get($path));
+        return new HtmlString(Blade::render(Filesystem::get($path)));
     }
 
     protected static function normalizePath(string $filename, string $extension): string
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 860467c5656..92ccdd2cb9a 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -8,6 +8,7 @@
 use Hyde\Support\Includes;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Facades\Blade;
 
 /**
@@ -58,20 +59,20 @@ public function testHtmlReturnsRenderedPartial()
     {
         $expected = '<h1>foo bar</h1>';
         file_put_contents(Hyde::path('resources/includes/foo.html'), '<h1>foo bar</h1>');
-        $this->assertSame($expected, Includes::html('foo.html'));
+        $this->assertHtmlStringIsSame($expected, Includes::html('foo.html'));
         Filesystem::unlink('resources/includes/foo.html');
     }
 
     public function testHtmlReturnsEfaultValueWhenNotFound()
     {
         $this->assertNull(Includes::html('foo.html'));
-        $this->assertSame('<h1>default</h1>', Includes::html('foo.html', '<h1>default</h1>'));
+        $this->assertHtmlStringIsSame('<h1>default</h1>', Includes::html('foo.html', '<h1>default</h1>'));
     }
 
     public function testHtmlWithAndWithoutExtension()
     {
         file_put_contents(Hyde::path('resources/includes/foo.html'), '# foo bar');
-        $this->assertSame(Includes::html('foo.html'), Includes::html('foo'));
+        $this->assertHtmlStringIsSame(Includes::html('foo.html'), Includes::html('foo'));
         Filesystem::unlink('resources/includes/foo.html');
     }
 
@@ -79,20 +80,20 @@ public function testMarkdownReturnsRenderedPartial()
     {
         $expected = '<h1>foo bar</h1>';
         file_put_contents(Hyde::path('resources/includes/foo.md'), '# foo bar');
-        $this->assertSame($expected, Includes::markdown('foo.md'));
+        $this->assertHtmlStringIsSame($expected, Includes::markdown('foo.md'));
         Filesystem::unlink('resources/includes/foo.md');
     }
 
     public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
     {
         $this->assertNull(Includes::markdown('foo.md'));
-        $this->assertSame('<h1>default</h1>', Includes::markdown('foo.md', '# default'));
+        $this->assertHtmlStringIsSame('<h1>default</h1>', Includes::markdown('foo.md', '# default'));
     }
 
     public function testMarkdownWithAndWithoutExtension()
     {
         file_put_contents(Hyde::path('resources/includes/foo.md'), '# foo bar');
-        $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
+        $this->assertHtmlStringIsSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
         Filesystem::unlink('resources/includes/foo.md');
     }
 
@@ -100,21 +101,21 @@ public function testBladeReturnsRenderedPartial()
     {
         $expected = 'foo bar';
         file_put_contents(Hyde::path('resources/includes/foo.blade.php'), '{{ "foo bar" }}');
-        $this->assertSame($expected, Includes::blade('foo.blade.php'));
+        $this->assertHtmlStringIsSame($expected, Includes::blade('foo.blade.php'));
         Filesystem::unlink('resources/includes/foo.blade.php');
     }
 
     public function testBladeWithAndWithoutExtension()
     {
         file_put_contents(Hyde::path('resources/includes/foo.blade.php'), '# foo bar');
-        $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
+        $this->assertHtmlStringIsSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
         Filesystem::unlink('resources/includes/foo.blade.php');
     }
 
     public function testBladeReturnsRenderedDefaultValueWhenNotFound()
     {
         $this->assertNull(Includes::blade('foo.blade.php'));
-        $this->assertSame('default', Includes::blade('foo.blade.php', '{{ "default" }}'));
+        $this->assertHtmlStringIsSame('default', Includes::blade('foo.blade.php', '{{ "default" }}'));
     }
 
     public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
@@ -126,8 +127,8 @@ public function testTorchlightAttributionIsNotInjectedToMarkdownPartials()
 
         $attribution = 'Syntax highlighting by <a href="https://torchlight.dev/" rel="noopener nofollow">Torchlight.dev</a>';
 
-        $this->assertStringNotContainsString($attribution, $rendered);
-        $this->assertSame("<p>$placeholder</p>", $rendered);
+        $this->assertStringNotContainsString($attribution, $rendered->toHtml());
+        $this->assertHtmlStringIsSame("<p>$placeholder</p>", $rendered);
     }
 
     public function testAdvancedMarkdownDocumentIsCompiledToHtml()
@@ -192,7 +193,7 @@ public function testAdvancedMarkdownDocumentIsCompiledToHtml()
         HTML;
 
         $this->file('resources/includes/advanced.md', $markdown);
-        $this->assertSame($expected, Includes::markdown('advanced.md'));
+        $this->assertHtmlStringIsSame($expected, Includes::markdown('advanced.md'));
     }
 
     public function testAdvancedBladePartialIsCompiledToHtml()
@@ -217,7 +218,7 @@ public function testAdvancedBladePartialIsCompiledToHtml()
         HTML;
 
         $this->file('resources/includes/advanced.blade.php', $blade);
-        $this->assertSame($expected, Includes::blade('advanced.blade.php'));
+        $this->assertHtmlStringIsSame($expected, Includes::blade('advanced.blade.php'));
     }
 
     public function testIncludesUsageFromBladeView()
@@ -257,11 +258,17 @@ public function testIncludesUsageFromBladeView()
         <h1>Compiled Markdown</h1>
 
         // With escaped
-        &lt;h1&gt;Literal HTML&lt;/h1&gt;
-        &lt;h1&gt;Rendered Blade&lt;/h1&gt;
-        &lt;h1&gt;Compiled Markdown&lt;/h1&gt;
+        <h1>Literal HTML</h1>
+        <h1>Rendered Blade</h1>
+        <h1>Compiled Markdown</h1>
         HTML;
 
         $this->assertSame($expected, Blade::render($view));
     }
+
+    protected function assertHtmlStringIsSame(string|HtmlString $expected, mixed $actual): void
+    {
+        $this->assertInstanceOf(HtmlString::class, $actual);
+        $this->assertSame((string) $expected, $actual->toHtml());
+    }
 }
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 7abd16eb9a4..dfd6c1b8a12 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,6 +9,7 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 
@@ -82,7 +83,7 @@ public function testHtmlReturnsRenderedPartial()
             $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($expected);
         });
 
-        $this->assertSame($expected, Includes::html($filename));
+        $this->assertHtmlStringIsSame($expected, Includes::html($filename));
     }
 
     public function testHtmlReturnsDefaultValueWhenNotFound()
@@ -95,7 +96,7 @@ public function testHtmlReturnsDefaultValueWhenNotFound()
         });
 
         $this->assertNull(Includes::html($filename));
-        $this->assertSame($default, Includes::html($filename, $default));
+        $this->assertHtmlStringIsSame($default, Includes::html($filename, $default));
     }
 
     public function testHtmlWithAndWithoutExtension()
@@ -108,7 +109,7 @@ public function testHtmlWithAndWithoutExtension()
             $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
-        $this->assertSame(Includes::html('foo.html'), Includes::html('foo'));
+        $this->assertHtmlStringIsSame(Includes::html('foo.html'), Includes::html('foo'));
     }
 
     public function testMarkdownReturnsRenderedPartial()
@@ -123,7 +124,7 @@ public function testMarkdownReturnsRenderedPartial()
             $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
-        $this->assertSame($expected, Includes::markdown($filename));
+        $this->assertHtmlStringIsSame($expected, Includes::markdown($filename));
     }
 
     public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
@@ -137,7 +138,7 @@ public function testMarkdownReturnsRenderedDefaultValueWhenNotFound()
         });
 
         $this->assertNull(Includes::markdown($filename));
-        $this->assertSame($expected, Includes::markdown($filename, $default));
+        $this->assertHtmlStringIsSame($expected, Includes::markdown($filename, $default));
     }
 
     public function testMarkdownWithAndWithoutExtension()
@@ -152,9 +153,9 @@ public function testMarkdownWithAndWithoutExtension()
             $filesystem->shouldReceive('get')->with($this->includesPath($filename))->andReturn($content);
         });
 
-        $this->assertSame($expected, Includes::markdown('foo.md'));
-        $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
-        $this->assertSame(Includes::markdown('foo.md'), Includes::markdown('foo.md'));
+        $this->assertHtmlStringIsSame($expected, Includes::markdown('foo.md'));
+        $this->assertHtmlStringIsSame(Includes::markdown('foo.md'), Includes::markdown('foo'));
+        $this->assertHtmlStringIsSame(Includes::markdown('foo.md'), Includes::markdown('foo.md'));
     }
 
     public function testBladeReturnsRenderedPartial()
@@ -171,7 +172,7 @@ public function testBladeReturnsRenderedPartial()
             Blade::shouldReceive('render')->with($content)->andReturn($expected);
         });
 
-        $this->assertSame($expected, Includes::blade($filename));
+        $this->assertHtmlStringIsSame($expected, Includes::blade($filename));
     }
 
     public function testBladeWithAndWithoutExtension()
@@ -187,7 +188,7 @@ public function testBladeWithAndWithoutExtension()
             Blade::shouldReceive('render')->with($content)->andReturn($expected);
         });
 
-        $this->assertSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
+        $this->assertHtmlStringIsSame(Includes::blade('foo.blade.php'), Includes::blade('foo'));
     }
 
     public function testBladeReturnsDefaultValueWhenNotFound()
@@ -203,7 +204,7 @@ public function testBladeReturnsDefaultValueWhenNotFound()
         });
 
         $this->assertNull(Includes::blade($filename));
-        $this->assertSame($expected, Includes::blade($filename, $default));
+        $this->assertHtmlStringIsSame($expected, Includes::blade($filename, $default));
     }
 
     protected function mockFilesystem(Closure $config): void
@@ -219,4 +220,10 @@ protected function includesPath(string $filename): string
     {
         return Hyde::path('resources/includes/'.$filename);
     }
+
+    protected function assertHtmlStringIsSame(string|HtmlString $expected, mixed $actual): void
+    {
+        $this->assertInstanceOf(HtmlString::class, $actual);
+        $this->assertSame((string) $expected, $actual->toHtml());
+    }
 }

From c527e9781f82a4057a50965899de2f2298cde2ff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:49:38 +0200
Subject: [PATCH 2042/2811] Replace ternary expression with if/else block

---
 packages/framework/src/Support/Includes.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 182ce218c7b..824e1ae3382 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,7 +87,11 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
+            if ($default === null) {
+                return null;
+            } else {
+                return new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
+            }
         }
 
         return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));

From 4d44b834f9a11b699a6c0b0f70bd9c5d5fa921c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:49:49 +0200
Subject: [PATCH 2043/2811] Introduce local variables

---
 packages/framework/src/Support/Includes.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 824e1ae3382..f667c2968b4 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -90,11 +90,13 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             if ($default === null) {
                 return null;
             } else {
-                return new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
+                $markdown = $default;
+                return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
             }
         }
 
-        return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));
+        $markdown = Filesystem::get($path);
+        return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
     }
 
     /**

From 2282b8e78282f1e7fdf1d2cb10544d39c7256a8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:50:09 +0200
Subject: [PATCH 2044/2811] Wrap declaration in else block

---
 packages/framework/src/Support/Includes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f667c2968b4..568df93c298 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -93,9 +93,10 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
                 $markdown = $default;
                 return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
             }
+        } else {
+            $markdown = Filesystem::get($path);
         }
 
-        $markdown = Filesystem::get($path);
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
     }
 

From 1e1520a06334d273ffde7733c248272caedf482e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:50:33 +0200
Subject: [PATCH 2045/2811] Unwrap common parts of if/else block

---
 packages/framework/src/Support/Includes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 568df93c298..8ca693185d6 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -91,7 +91,6 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
                 return null;
             } else {
                 $markdown = $default;
-                return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
             }
         } else {
             $markdown = Filesystem::get($path);

From 370524a5101248cc24e5e861b70eca50420a8694 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:50:52 +0200
Subject: [PATCH 2046/2811] Unwrap 'else'

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 8ca693185d6..bb9ce3b6368 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -89,9 +89,9 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         if (! Filesystem::exists($path)) {
             if ($default === null) {
                 return null;
-            } else {
-                $markdown = $default;
             }
+
+            $markdown = $default;
         } else {
             $markdown = Filesystem::get($path);
         }

From 667f7d9b103b0ec61ad33bff7825d4ff4a8895f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:52:13 +0200
Subject: [PATCH 2047/2811] Invert control flow to simply conditional paths

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index bb9ce3b6368..82e3cbc571a 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -86,14 +86,13 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
     {
         $path = static::normalizePath($filename, '.md');
 
-        if (! Filesystem::exists($path)) {
+        if (Filesystem::exists($path)) {
+            $markdown = Filesystem::get($path);
+        } else {
             if ($default === null) {
                 return null;
             }
-
             $markdown = $default;
-        } else {
-            $markdown = Filesystem::get($path);
         }
 
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));

From 6cd529fabbfdd1bcd6c0bb91206825f9b5286d22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:53:32 +0200
Subject: [PATCH 2048/2811] Move out return from condition

---
 packages/framework/src/Support/Includes.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 82e3cbc571a..904f941b737 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -90,9 +90,14 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             $markdown = Filesystem::get($path);
         } else {
             if ($default === null) {
-                return null;
+                $markdown = null;
+            } else {
+                $markdown = $default;
             }
-            $markdown = $default;
+        }
+
+        if ($markdown === null) {
+            return null;
         }
 
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));

From 130dd77e7661e2d7bed3e8d35c26f0042d7857e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:53:47 +0200
Subject: [PATCH 2049/2811] Merge into 'elseif'

---
 packages/framework/src/Support/Includes.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 904f941b737..9dcea75e042 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -88,12 +88,10 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
 
         if (Filesystem::exists($path)) {
             $markdown = Filesystem::get($path);
+        } elseif ($default === null) {
+            $markdown = null;
         } else {
-            if ($default === null) {
-                $markdown = null;
-            } else {
-                $markdown = $default;
-            }
+            $markdown = $default;
         }
 
         if ($markdown === null) {

From d0d67093237ac5fef32a794aaaf99f6e6929c264 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:35 +0200
Subject: [PATCH 2050/2811] Revert "Merge into 'elseif'"

This reverts commit 130dd77e7661e2d7bed3e8d35c26f0042d7857e6.
---
 packages/framework/src/Support/Includes.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 9dcea75e042..904f941b737 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -88,10 +88,12 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
 
         if (Filesystem::exists($path)) {
             $markdown = Filesystem::get($path);
-        } elseif ($default === null) {
-            $markdown = null;
         } else {
-            $markdown = $default;
+            if ($default === null) {
+                $markdown = null;
+            } else {
+                $markdown = $default;
+            }
         }
 
         if ($markdown === null) {

From d248f04f3cdafd537a0a0e35d68f06e4a61df860 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:38 +0200
Subject: [PATCH 2051/2811] Revert "Move out return from condition"

This reverts commit 6cd529fabbfdd1bcd6c0bb91206825f9b5286d22.
---
 packages/framework/src/Support/Includes.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 904f941b737..82e3cbc571a 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -90,14 +90,9 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             $markdown = Filesystem::get($path);
         } else {
             if ($default === null) {
-                $markdown = null;
-            } else {
-                $markdown = $default;
+                return null;
             }
-        }
-
-        if ($markdown === null) {
-            return null;
+            $markdown = $default;
         }
 
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));

From dc7c75cbdec2fcc1b852f5a538973642805bb993 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:39 +0200
Subject: [PATCH 2052/2811] Revert "Invert control flow to simply conditional
 paths"

This reverts commit 667f7d9b103b0ec61ad33bff7825d4ff4a8895f9.
---
 packages/framework/src/Support/Includes.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 82e3cbc571a..bb9ce3b6368 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -86,13 +86,14 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
     {
         $path = static::normalizePath($filename, '.md');
 
-        if (Filesystem::exists($path)) {
-            $markdown = Filesystem::get($path);
-        } else {
+        if (! Filesystem::exists($path)) {
             if ($default === null) {
                 return null;
             }
+
             $markdown = $default;
+        } else {
+            $markdown = Filesystem::get($path);
         }
 
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));

From 012a91da8eeb312560aa94462b13aa8d890ebbec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:40 +0200
Subject: [PATCH 2053/2811] Revert "Unwrap 'else'"

This reverts commit 370524a5101248cc24e5e861b70eca50420a8694.
---
 packages/framework/src/Support/Includes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index bb9ce3b6368..8ca693185d6 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -89,9 +89,9 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         if (! Filesystem::exists($path)) {
             if ($default === null) {
                 return null;
+            } else {
+                $markdown = $default;
             }
-
-            $markdown = $default;
         } else {
             $markdown = Filesystem::get($path);
         }

From de5131ec7ba0e94a2076f3f687b133e01e0f6f8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:40 +0200
Subject: [PATCH 2054/2811] Revert "Unwrap common parts of if/else block"

This reverts commit 1e1520a06334d273ffde7733c248272caedf482e.
---
 packages/framework/src/Support/Includes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 8ca693185d6..568df93c298 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -91,6 +91,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
                 return null;
             } else {
                 $markdown = $default;
+                return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
             }
         } else {
             $markdown = Filesystem::get($path);

From 59448a6303036ef734a8821de0dfbd9ee508cc7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:41 +0200
Subject: [PATCH 2055/2811] Revert "Wrap declaration in else block"

This reverts commit 2282b8e78282f1e7fdf1d2cb10544d39c7256a8c.
---
 packages/framework/src/Support/Includes.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 568df93c298..f667c2968b4 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -93,10 +93,9 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
                 $markdown = $default;
                 return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
             }
-        } else {
-            $markdown = Filesystem::get($path);
         }
 
+        $markdown = Filesystem::get($path);
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
     }
 

From fc6460d2f4d5250c0cbdd16a11a896ee8dd400eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:55:41 +0200
Subject: [PATCH 2056/2811] Revert "Introduce local variables"

This reverts commit 4d44b834f9a11b699a6c0b0f70bd9c5d5fa921c6.
---
 packages/framework/src/Support/Includes.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f667c2968b4..824e1ae3382 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -90,13 +90,11 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             if ($default === null) {
                 return null;
             } else {
-                $markdown = $default;
-                return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
+                return new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
             }
         }
 
-        $markdown = Filesystem::get($path);
-        return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
+        return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));
     }
 
     /**

From 80e6e1efaa18d010da8c23cac68abe53eb7963b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:56:30 +0200
Subject: [PATCH 2057/2811] Revert "Replace ternary expression with if/else
 block"

This reverts commit c527e9781f82a4057a50965899de2f2298cde2ff.
---
 packages/framework/src/Support/Includes.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 824e1ae3382..182ce218c7b 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,11 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            if ($default === null) {
-                return null;
-            } else {
-                return new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
-            }
+            return $default === null ? null : new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
         }
 
         return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));

From 66ced70ae45e8a85d21e156f854b1cfb402c56ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:57:30 +0200
Subject: [PATCH 2058/2811] Extract helper method to render Markdown

---
 packages/framework/src/Support/Includes.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 182ce218c7b..67b6214d096 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,10 +87,10 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : new HtmlString(trim(Markdown::render($default, MarkdownDocument::class)));
+            return $default === null ? null : static::renderMarkdown($default);
         }
 
-        return new HtmlString(trim(Markdown::render(Filesystem::get($path), MarkdownDocument::class)));
+        return static::renderMarkdown(Filesystem::get($path));
     }
 
     /**
@@ -115,4 +115,9 @@ protected static function normalizePath(string $filename, string $extension): st
     {
         return static::path(basename($filename, $extension).$extension);
     }
+
+    protected static function renderMarkdown(string $markdown): HtmlString
+    {
+        return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
+    }
 }

From b9232620407ac079f06495dafdab307c24d0cf9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 20:59:51 +0200
Subject: [PATCH 2059/2811] Extract helper method to render Blade

---
 packages/framework/src/Support/Includes.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 67b6214d096..e2517e927f3 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -105,10 +105,10 @@ public static function blade(string $filename, ?string $default = null): ?HtmlSt
         $path = static::normalizePath($filename, '.blade.php');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : new HtmlString(Blade::render($default));
+            return $default === null ? null : static::renderBlade($default);
         }
 
-        return new HtmlString(Blade::render(Filesystem::get($path)));
+        return static::renderBlade(Filesystem::get($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string
@@ -120,4 +120,9 @@ protected static function renderMarkdown(string $markdown): HtmlString
     {
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
     }
+
+    protected static function renderBlade(string $blade): HtmlString
+    {
+        return new HtmlString(Blade::render($blade));
+    }
 }

From 8d7b1cbd3ba9acfd4cc41fe7050eef31fe5c1f19 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:00:48 +0200
Subject: [PATCH 2060/2811] Extract helper method to render Html

Literally just for matching the code style
---
 packages/framework/src/Support/Includes.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index e2517e927f3..75a039f7b35 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -69,10 +69,10 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
         $path = static::normalizePath($filename, '.html');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : new HtmlString($default);
+            return $default === null ? null : static::renderHtml($default);
         }
 
-        return new HtmlString(Filesystem::get($path));
+        return static::renderHtml(Filesystem::get($path));
     }
 
     /**
@@ -116,6 +116,11 @@ protected static function normalizePath(string $filename, string $extension): st
         return static::path(basename($filename, $extension).$extension);
     }
 
+    protected static function renderHtml(string $html): HtmlString
+    {
+        return new HtmlString($html);
+    }
+
     protected static function renderMarkdown(string $markdown): HtmlString
     {
         return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));

From 9038ab07872f8c0c805d1627f82dec64142fa266 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:02:30 +0200
Subject: [PATCH 2061/2811] Refactor control flow

---
 packages/framework/src/Support/Includes.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 75a039f7b35..7b52c92351c 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,10 +87,16 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            return $default === null ? null : static::renderMarkdown($default);
+            if ($default === null) {
+                return null;
+            } else {
+                $contents = null;
+            }
+        } else {
+            $contents = Filesystem::get($path);
         }
 
-        return static::renderMarkdown(Filesystem::get($path));
+        return static::renderMarkdown($contents ?? $default);
     }
 
     /**

From e120ba3bbf700564fdff354ef00ce0e590406294 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:02:42 +0200
Subject: [PATCH 2062/2811] Unwrap 'else'

---
 packages/framework/src/Support/Includes.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 7b52c92351c..4147b63e2f3 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -89,9 +89,8 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         if (! Filesystem::exists($path)) {
             if ($default === null) {
                 return null;
-            } else {
-                $contents = null;
             }
+            $contents = null;
         } else {
             $contents = Filesystem::get($path);
         }

From c0efe456469520d115555dbed69ba75af3aa5c98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:04:30 +0200
Subject: [PATCH 2063/2811] Revert "Unwrap 'else'"

This reverts commit e120ba3bbf700564fdff354ef00ce0e590406294.
---
 packages/framework/src/Support/Includes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 4147b63e2f3..7b52c92351c 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -89,8 +89,9 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         if (! Filesystem::exists($path)) {
             if ($default === null) {
                 return null;
+            } else {
+                $contents = null;
             }
-            $contents = null;
         } else {
             $contents = Filesystem::get($path);
         }

From 760af6bd9cf08de13e1b6af9dae49a510ebf46ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:04:36 +0200
Subject: [PATCH 2064/2811] Revert "Refactor control flow"

This reverts commit 9038ab07872f8c0c805d1627f82dec64142fa266.
---
 packages/framework/src/Support/Includes.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 7b52c92351c..75a039f7b35 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,16 +87,10 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
 
         if (! Filesystem::exists($path)) {
-            if ($default === null) {
-                return null;
-            } else {
-                $contents = null;
-            }
-        } else {
-            $contents = Filesystem::get($path);
+            return $default === null ? null : static::renderMarkdown($default);
         }
 
-        return static::renderMarkdown($contents ?? $default);
+        return static::renderMarkdown(Filesystem::get($path));
     }
 
     /**

From ac255eea9a3b401c96a021a3a75333216d9f23ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:05:21 +0200
Subject: [PATCH 2065/2811] Extract helper to get file contents

---
 packages/framework/src/Support/Includes.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 75a039f7b35..917743f1e43 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -54,7 +54,7 @@ public static function get(string $filename, ?string $default = null): ?string
             return $default;
         }
 
-        return Filesystem::get($path);
+        return static::getFileContents($path);
     }
 
     /**
@@ -72,7 +72,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
             return $default === null ? null : static::renderHtml($default);
         }
 
-        return static::renderHtml(Filesystem::get($path));
+        return static::renderHtml(static::getFileContents($path));
     }
 
     /**
@@ -90,7 +90,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             return $default === null ? null : static::renderMarkdown($default);
         }
 
-        return static::renderMarkdown(Filesystem::get($path));
+        return static::renderMarkdown(static::getFileContents($path));
     }
 
     /**
@@ -108,7 +108,7 @@ public static function blade(string $filename, ?string $default = null): ?HtmlSt
             return $default === null ? null : static::renderBlade($default);
         }
 
-        return static::renderBlade(Filesystem::get($path));
+        return static::renderBlade(static::getFileContents($path));
     }
 
     protected static function normalizePath(string $filename, string $extension): string
@@ -130,4 +130,9 @@ protected static function renderBlade(string $blade): HtmlString
     {
         return new HtmlString(Blade::render($blade));
     }
+
+    protected static function getFileContents(string $path): string
+    {
+        return Filesystem::get($path);
+    }
 }

From 20f764a2551ee1d1a340eb995762b2f44ee717cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:05:57 +0200
Subject: [PATCH 2066/2811] Return null if file does not exist

---
 packages/framework/src/Support/Includes.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 917743f1e43..9706a49e593 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -131,8 +131,12 @@ protected static function renderBlade(string $blade): HtmlString
         return new HtmlString(Blade::render($blade));
     }
 
-    protected static function getFileContents(string $path): string
+    protected static function getFileContents(string $path): ?string
     {
+        if (! Filesystem::exists($path)) {
+            return null;
+        }
+
         return Filesystem::get($path);
     }
 }

From b1ad1fce1b5fc256a375a827328b970ac36e9b15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:06:32 +0200
Subject: [PATCH 2067/2811] Introduce local variable

---
 packages/framework/src/Support/Includes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 9706a49e593..76746e913f1 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -85,12 +85,13 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.md');
+        $contents = static::getFileContents($path);
 
         if (! Filesystem::exists($path)) {
             return $default === null ? null : static::renderMarkdown($default);
         }
 
-        return static::renderMarkdown(static::getFileContents($path));
+        return static::renderMarkdown($contents);
     }
 
     /**

From 4ac8f35074a2db92033ccae2c506a1234551ce1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:06:52 +0200
Subject: [PATCH 2068/2811] Check if contents is null

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 76746e913f1..f252c5f2eb8 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,7 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
         $contents = static::getFileContents($path);
 
-        if (! Filesystem::exists($path)) {
+        if ($contents === null) {
             return $default === null ? null : static::renderMarkdown($default);
         }
 

From 01d8833c23ab481d8f3b3ec7d4a0b9e2415a133c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:07:15 +0200
Subject: [PATCH 2069/2811] Replace ternary expression with if/else block

---
 packages/framework/src/Support/Includes.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f252c5f2eb8..34c8f5f4849 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -88,7 +88,11 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $contents = static::getFileContents($path);
 
         if ($contents === null) {
-            return $default === null ? null : static::renderMarkdown($default);
+            if ($default === null) {
+                return null;
+            } else {
+                return static::renderMarkdown($default);
+            }
         }
 
         return static::renderMarkdown($contents);

From 7eb2dab8920342e7e0341984f8badad211846a99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:07:34 +0200
Subject: [PATCH 2070/2811] Set contents to default

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 34c8f5f4849..ce7ac0d4a04 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -91,7 +91,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             if ($default === null) {
                 return null;
             } else {
-                return static::renderMarkdown($default);
+                $contents = $default;
             }
         }
 

From dae62babb92f64a6f71e5cd66472e042f7bb26c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:07:46 +0200
Subject: [PATCH 2071/2811] Unwrap 'else'

---
 packages/framework/src/Support/Includes.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index ce7ac0d4a04..593922ffb6c 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -90,9 +90,8 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         if ($contents === null) {
             if ($default === null) {
                 return null;
-            } else {
-                $contents = $default;
             }
+            $contents = $default;
         }
 
         return static::renderMarkdown($contents);

From a62671d6daff68eecdaa96b22fef3ad895092fcb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:08:20 +0200
Subject: [PATCH 2072/2811] Flatten nested conditions

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 593922ffb6c..5c7acb223b5 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,10 +87,11 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         $path = static::normalizePath($filename, '.md');
         $contents = static::getFileContents($path);
 
+        if ($contents === null && $default === null) {
+            return null;
+        }
+
         if ($contents === null) {
-            if ($default === null) {
-                return null;
-            }
             $contents = $default;
         }
 

From c2b9f6867658de7ed28b83392313e572a2788c5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:08:45 +0200
Subject: [PATCH 2073/2811] Null coalesce to default

---
 packages/framework/src/Support/Includes.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 5c7acb223b5..d7e5fc39778 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -91,11 +91,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
             return null;
         }
 
-        if ($contents === null) {
-            $contents = $default;
-        }
-
-        return static::renderMarkdown($contents);
+        return static::renderMarkdown($contents ?? $default);
     }
 
     /**

From dfdceb365baf32bb11f43d2f09a5c731e42f1c96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:09:33 +0200
Subject: [PATCH 2074/2811] Inline local variable

---
 packages/framework/src/Support/Includes.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index d7e5fc39778..cfec1f9e12b 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -84,8 +84,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        $path = static::normalizePath($filename, '.md');
-        $contents = static::getFileContents($path);
+        $contents = static::getFileContents(static::normalizePath($filename, '.md'));
 
         if ($contents === null && $default === null) {
             return null;

From 0e6b17f2a2e869652e07b53e9566b5af907729b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:09:48 +0200
Subject: [PATCH 2075/2811] Revert "Inline local variable"

This reverts commit dfdceb365baf32bb11f43d2f09a5c731e42f1c96.
---
 packages/framework/src/Support/Includes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index cfec1f9e12b..d7e5fc39778 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -84,7 +84,8 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        $contents = static::getFileContents(static::normalizePath($filename, '.md'));
+        $path = static::normalizePath($filename, '.md');
+        $contents = static::getFileContents($path);
 
         if ($contents === null && $default === null) {
             return null;

From 456bf344764f8bcb7ac0e26f7b34c74dadd5f454 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:10:50 +0200
Subject: [PATCH 2076/2811] Refactor other methods to use improved control flow

---
 packages/framework/src/Support/Includes.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index d7e5fc39778..30de07b015b 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -67,12 +67,13 @@ public static function get(string $filename, ?string $default = null): ?string
     public static function html(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.html');
+        $contents = static::getFileContents($path);
 
-        if (! Filesystem::exists($path)) {
-            return $default === null ? null : static::renderHtml($default);
+        if ($contents === null && $default === null) {
+            return null;
         }
 
-        return static::renderHtml(static::getFileContents($path));
+        return static::renderHtml($contents ?? $default);
     }
 
     /**
@@ -104,12 +105,13 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
     public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
         $path = static::normalizePath($filename, '.blade.php');
+        $contents = static::getFileContents($path);
 
-        if (! Filesystem::exists($path)) {
-            return $default === null ? null : static::renderBlade($default);
+        if ($contents === null && $default === null) {
+            return null;
         }
 
-        return static::renderBlade(static::getFileContents($path));
+        return static::renderBlade($contents ?? $default);
     }
 
     protected static function normalizePath(string $filename, string $extension): string

From acbe58b3b3873a1b9213250a897986ea6dde70cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:12:50 +0200
Subject: [PATCH 2077/2811] Extract helper method for shared code

---
 packages/framework/src/Support/Includes.php | 39 ++++++++-------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 30de07b015b..875563c1472 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -66,14 +66,7 @@ public static function get(string $filename, ?string $default = null): ?string
      */
     public static function html(string $filename, ?string $default = null): ?HtmlString
     {
-        $path = static::normalizePath($filename, '.html');
-        $contents = static::getFileContents($path);
-
-        if ($contents === null && $default === null) {
-            return null;
-        }
-
-        return static::renderHtml($contents ?? $default);
+        return static::getInclude($filename, '.html', $default, 'renderHtml');
     }
 
     /**
@@ -85,14 +78,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        $path = static::normalizePath($filename, '.md');
-        $contents = static::getFileContents($path);
-
-        if ($contents === null && $default === null) {
-            return null;
-        }
-
-        return static::renderMarkdown($contents ?? $default);
+        return static::getInclude($filename, '.md', $default, 'renderMarkdown');
     }
 
     /**
@@ -104,14 +90,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
      */
     public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
-        $path = static::normalizePath($filename, '.blade.php');
-        $contents = static::getFileContents($path);
-
-        if ($contents === null && $default === null) {
-            return null;
-        }
-
-        return static::renderBlade($contents ?? $default);
+        return static::getInclude($filename, '.blade.php', $default, 'renderBlade');
     }
 
     protected static function normalizePath(string $filename, string $extension): string
@@ -142,4 +121,16 @@ protected static function getFileContents(string $path): ?string
 
         return Filesystem::get($path);
     }
+
+    protected static function getInclude(string $filename, string $extension, ?string $default, string $method): ?HtmlString
+    {
+        $path = static::normalizePath($filename, $extension);
+        $contents = static::getFileContents($path);
+
+        if ($contents === null && $default === null) {
+            return null;
+        }
+
+        return static::$method($contents ?? $default);
+    }
 }

From 877aa043321b33b19bc88f5e3b3d6dbdd777453d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:16:17 +0200
Subject: [PATCH 2078/2811] Move up method parameter in signature

---
 packages/framework/src/Support/Includes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 875563c1472..9eb9f5c43a4 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -66,7 +66,7 @@ public static function get(string $filename, ?string $default = null): ?string
      */
     public static function html(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude($filename, '.html', $default, 'renderHtml');
+        return static::getInclude('renderHtml', '.html', $default, $filename);
     }
 
     /**
@@ -78,7 +78,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude($filename, '.md', $default, 'renderMarkdown');
+        return static::getInclude('renderMarkdown', '.md', $default, $filename);
     }
 
     /**
@@ -90,7 +90,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
      */
     public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude($filename, '.blade.php', $default, 'renderBlade');
+        return static::getInclude('renderBlade', '.blade.php', $default, $filename);
     }
 
     protected static function normalizePath(string $filename, string $extension): string
@@ -122,7 +122,7 @@ protected static function getFileContents(string $path): ?string
         return Filesystem::get($path);
     }
 
-    protected static function getInclude(string $filename, string $extension, ?string $default, string $method): ?HtmlString
+    protected static function getInclude(string $method, string $extension, ?string $default, string $filename): ?HtmlString
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents($path);

From 5fc1c1cd721511e4281f322e2bd4cb7b9fcd3930 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:17:36 +0200
Subject: [PATCH 2079/2811] Use callable method parameter

Gets better IDE support and doesn't report the methods as unused
---
 packages/framework/src/Support/Includes.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 9eb9f5c43a4..93cb4f62417 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -66,7 +66,7 @@ public static function get(string $filename, ?string $default = null): ?string
      */
     public static function html(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude('renderHtml', '.html', $default, $filename);
+        return static::getInclude([static::class, 'renderHtml'], '.html', $default, $filename);
     }
 
     /**
@@ -78,7 +78,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude('renderMarkdown', '.md', $default, $filename);
+        return static::getInclude([static::class, 'renderMarkdown'], '.md', $default, $filename);
     }
 
     /**
@@ -90,7 +90,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
      */
     public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude('renderBlade', '.blade.php', $default, $filename);
+        return static::getInclude([static::class, 'renderBlade'], '.blade.php', $default, $filename);
     }
 
     protected static function normalizePath(string $filename, string $extension): string
@@ -122,7 +122,7 @@ protected static function getFileContents(string $path): ?string
         return Filesystem::get($path);
     }
 
-    protected static function getInclude(string $method, string $extension, ?string $default, string $filename): ?HtmlString
+    protected static function getInclude(callable $method, string $extension, ?string $default, string $filename): ?HtmlString
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents($path);
@@ -131,6 +131,6 @@ protected static function getInclude(string $method, string $extension, ?string
             return null;
         }
 
-        return static::$method($contents ?? $default);
+        return $method($contents ?? $default);
     }
 }

From 6b8e32866c591ee2f4465160d0cc6f21c1859072 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:19:55 +0200
Subject: [PATCH 2080/2811] Reorder methods in source

Matches the execution flow and documentation order
---
 packages/framework/src/Support/Includes.php | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 93cb4f62417..f8ab257ddfc 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -70,47 +70,44 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
     }
 
     /**
-     * Get the rendered Markdown of a partial file in the includes directory.
+     * Get the rendered Blade of a partial file in the includes directory.
      *
      * @param  string  $filename  The name of the partial file, with or without the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
      * @return HtmlString|null The rendered contents of the partial file, or the default value if not found.
      */
-    public static function markdown(string $filename, ?string $default = null): ?HtmlString
+    public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude([static::class, 'renderMarkdown'], '.md', $default, $filename);
+        return static::getInclude([static::class, 'renderBlade'], '.blade.php', $default, $filename);
     }
 
     /**
-     * Get the rendered Blade of a partial file in the includes directory.
+     * Get the rendered Markdown of a partial file in the includes directory.
      *
      * @param  string  $filename  The name of the partial file, with or without the extension.
      * @param  string|null  $default  The default value to return if the partial is not found.
      * @return HtmlString|null The rendered contents of the partial file, or the default value if not found.
      */
-    public static function blade(string $filename, ?string $default = null): ?HtmlString
+    public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude([static::class, 'renderBlade'], '.blade.php', $default, $filename);
+        return static::getInclude([static::class, 'renderMarkdown'], '.md', $default, $filename);
     }
 
-    protected static function normalizePath(string $filename, string $extension): string
+    protected static function getInclude(callable $method, string $extension, ?string $default, string $filename): ?HtmlString
     {
-        return static::path(basename($filename, $extension).$extension);
-    }
+        $path = static::normalizePath($filename, $extension);
+        $contents = static::getFileContents($path);
 
-    protected static function renderHtml(string $html): HtmlString
-    {
-        return new HtmlString($html);
-    }
+        if ($contents === null && $default === null) {
+            return null;
+        }
 
-    protected static function renderMarkdown(string $markdown): HtmlString
-    {
-        return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
+        return $method($contents ?? $default);
     }
 
-    protected static function renderBlade(string $blade): HtmlString
+    protected static function normalizePath(string $filename, string $extension): string
     {
-        return new HtmlString(Blade::render($blade));
+        return static::path(basename($filename, $extension).$extension);
     }
 
     protected static function getFileContents(string $path): ?string
@@ -122,15 +119,18 @@ protected static function getFileContents(string $path): ?string
         return Filesystem::get($path);
     }
 
-    protected static function getInclude(callable $method, string $extension, ?string $default, string $filename): ?HtmlString
+    protected static function renderHtml(string $html): HtmlString
     {
-        $path = static::normalizePath($filename, $extension);
-        $contents = static::getFileContents($path);
+        return new HtmlString($html);
+    }
 
-        if ($contents === null && $default === null) {
-            return null;
-        }
+    protected static function renderBlade(string $blade): HtmlString
+    {
+        return new HtmlString(Blade::render($blade));
+    }
 
-        return $method($contents ?? $default);
+    protected static function renderMarkdown(string $markdown): HtmlString
+    {
+        return new HtmlString(trim(Markdown::render($markdown, MarkdownDocument::class)));
     }
 }

From 64eb92ab97562325e1ed0ad868e4d5c9db720fe7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:37:12 +0200
Subject: [PATCH 2081/2811] Make extension optional

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f8ab257ddfc..92ff6f2c545 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -105,7 +105,7 @@ protected static function getInclude(callable $method, string $extension, ?strin
         return $method($contents ?? $default);
     }
 
-    protected static function normalizePath(string $filename, string $extension): string
+    protected static function normalizePath(string $filename, string $extension = ''): string
     {
         return static::path(basename($filename, $extension).$extension);
     }

From ea9326172dcbc1fa7f16f58a6e2f28641f929627 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:38:23 +0200
Subject: [PATCH 2082/2811] Shift absolute path qualification to retrieval

Will prevent recursion issue in upcoming change
---
 packages/framework/src/Support/Includes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 92ff6f2c545..f4c34e70664 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -107,16 +107,16 @@ protected static function getInclude(callable $method, string $extension, ?strin
 
     protected static function normalizePath(string $filename, string $extension = ''): string
     {
-        return static::path(basename($filename, $extension).$extension);
+        return basename($filename, $extension).$extension;
     }
 
     protected static function getFileContents(string $path): ?string
     {
-        if (! Filesystem::exists($path)) {
+        if (! Filesystem::exists(static::path($path))) {
             return null;
         }
 
-        return Filesystem::get($path);
+        return Filesystem::get(static::path($path));
     }
 
     protected static function renderHtml(string $html): HtmlString

From 83b24801c68534d8fdbe56360ef314b07797c4a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:38:50 +0200
Subject: [PATCH 2083/2811] Introduce local variable

---
 packages/framework/src/Support/Includes.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f4c34e70664..1dd40e6511e 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -112,11 +112,13 @@ protected static function normalizePath(string $filename, string $extension = ''
 
     protected static function getFileContents(string $path): ?string
     {
-        if (! Filesystem::exists(static::path($path))) {
+        $path = static::path($path);
+
+        if (! Filesystem::exists($path)) {
             return null;
         }
 
-        return Filesystem::get(static::path($path));
+        return Filesystem::get($path);
     }
 
     protected static function renderHtml(string $html): HtmlString

From 76b35dc6c27323ec45adc7516eb6e025c1696108 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:39:04 +0200
Subject: [PATCH 2084/2811] Revert "Introduce local variable"

This reverts commit 83b24801c68534d8fdbe56360ef314b07797c4a2.
---
 packages/framework/src/Support/Includes.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 1dd40e6511e..f4c34e70664 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -112,13 +112,11 @@ protected static function normalizePath(string $filename, string $extension = ''
 
     protected static function getFileContents(string $path): ?string
     {
-        $path = static::path($path);
-
-        if (! Filesystem::exists($path)) {
+        if (! Filesystem::exists(static::path($path))) {
             return null;
         }
 
-        return Filesystem::get($path);
+        return Filesystem::get(static::path($path));
     }
 
     protected static function renderHtml(string $html): HtmlString

From c77d1fcfa3a5823194a97348cf6e95800c96e1fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:40:26 +0200
Subject: [PATCH 2085/2811] Shift absolute path qualification to calling method

Also reduces unnecessary double qualification attempt in the get method
---
 packages/framework/src/Support/Includes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index f4c34e70664..e3b4fda566f 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -96,7 +96,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
     protected static function getInclude(callable $method, string $extension, ?string $default, string $filename): ?HtmlString
     {
         $path = static::normalizePath($filename, $extension);
-        $contents = static::getFileContents($path);
+        $contents = static::getFileContents(static::path($path));
 
         if ($contents === null && $default === null) {
             return null;
@@ -112,11 +112,11 @@ protected static function normalizePath(string $filename, string $extension = ''
 
     protected static function getFileContents(string $path): ?string
     {
-        if (! Filesystem::exists(static::path($path))) {
+        if (! Filesystem::exists($path)) {
             return null;
         }
 
-        return Filesystem::get(static::path($path));
+        return Filesystem::get($path);
     }
 
     protected static function renderHtml(string $html): HtmlString

From 11a6015f3121714a4602a4caebffc603d3740dbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:44:05 +0200
Subject: [PATCH 2086/2811] Normalize includes paths using same rules as other
 helpers

This means that nested directories are no longer supported, as you should use a data collection for that. See https://github.com/hydephp/develop/pull/1738/files#r1655369910
---
 RELEASE_NOTES.md                              |  1 +
 packages/framework/src/Support/Includes.php   |  4 ++--
 .../tests/Unit/IncludesFacadeUnitTest.php     | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c37997d25b4..85cd42010ba 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -25,6 +25,7 @@ This serves two purposes:
 - Minor: Changed the default build task message to make it more concise in https://github.com/hydephp/develop/pull/1659
 - Minor: Data collection files are now validated for syntax errors during discovery in https://github.com/hydephp/develop/pull/1732
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
+- Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.
diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index e3b4fda566f..33460ba6d8d 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -36,7 +36,7 @@ public static function path(?string $filename = null): string
     {
         return $filename === null
             ? Hyde::path(static::$includesDirectory)
-            : Hyde::path(static::$includesDirectory.'/'.$filename);
+            : Hyde::path(static::$includesDirectory.'/'.static::normalizePath($filename));
     }
 
     /**
@@ -48,7 +48,7 @@ public static function path(?string $filename = null): string
      */
     public static function get(string $filename, ?string $default = null): ?string
     {
-        $path = static::path($filename);
+        $path = static::path(static::normalizePath($filename));
 
         if (! Filesystem::exists($path)) {
             return $default;
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index dfd6c1b8a12..1da30c9d435 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -47,6 +47,11 @@ public function testPathReturnsAPartialWithinTheIncludesDirectory()
         $this->assertSame(Hyde::path('resources/includes/partial.html'), Includes::path('partial.html'));
     }
 
+    public function testPathNormalizesNestedIdentifiers()
+    {
+        $this->assertSame(Hyde::path('resources/includes/partial.html'), Includes::path('foo/partial.html'));
+    }
+
     public function testGetReturnsPartial()
     {
         $filename = 'foo.txt';
@@ -73,6 +78,20 @@ public function testGetReturnsDefaultValueWhenNotFound()
         $this->assertSame($default, Includes::get($filename, $default));
     }
 
+    public function testGetNormalizesNestedIdentifiers()
+    {
+        $filename = 'foo/bar.txt';
+        $normalized = 'bar.txt';
+        $expected = 'foo bar';
+
+        $this->mockFilesystem(function ($filesystem) use ($expected, $normalized) {
+            $filesystem->shouldReceive('exists')->with($this->includesPath($normalized))->andReturn(true);
+            $filesystem->shouldReceive('get')->with($this->includesPath($normalized))->andReturn($expected);
+        });
+
+        $this->assertSame($expected, Includes::get($filename));
+    }
+
     public function testHtmlReturnsRenderedPartial()
     {
         $filename = 'foo.html';

From 9a07581d18ce0093817e824dae22a0fab7081f09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:47:12 +0200
Subject: [PATCH 2087/2811] Normalize control flow

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 33460ba6d8d..34179ebf394 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -49,12 +49,13 @@ public static function path(?string $filename = null): string
     public static function get(string $filename, ?string $default = null): ?string
     {
         $path = static::path(static::normalizePath($filename));
+        $contents = static::getFileContents($path);
 
-        if (! Filesystem::exists($path)) {
-            return $default;
+        if ($contents === null && $default === null) {
+            return null;
         }
 
-        return static::getFileContents($path);
+        return $contents ?? $default;
     }
 
     /**

From 15472ec37bdb779bf25b08fdbff84def070c60de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:48:57 +0200
Subject: [PATCH 2088/2811] Move extension to last in signature

---
 packages/framework/src/Support/Includes.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 34179ebf394..125ea80b484 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -67,7 +67,7 @@ public static function get(string $filename, ?string $default = null): ?string
      */
     public static function html(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude([static::class, 'renderHtml'], '.html', $default, $filename);
+        return static::getInclude([static::class, 'renderHtml'], $filename, $default, '.html');
     }
 
     /**
@@ -79,7 +79,7 @@ public static function html(string $filename, ?string $default = null): ?HtmlStr
      */
     public static function blade(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude([static::class, 'renderBlade'], '.blade.php', $default, $filename);
+        return static::getInclude([static::class, 'renderBlade'], $filename, $default, '.blade.php');
     }
 
     /**
@@ -91,10 +91,10 @@ public static function blade(string $filename, ?string $default = null): ?HtmlSt
      */
     public static function markdown(string $filename, ?string $default = null): ?HtmlString
     {
-        return static::getInclude([static::class, 'renderMarkdown'], '.md', $default, $filename);
+        return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    protected static function getInclude(callable $method, string $extension, ?string $default, string $filename): ?HtmlString
+    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension): ?HtmlString
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents(static::path($path));

From 92fe45d328f1a7772af7d52bcb178c94e59b3d01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:49:08 +0200
Subject: [PATCH 2089/2811] Make extension optional

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 125ea80b484..e523807d751 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -94,7 +94,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension): ?HtmlString
+    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): ?HtmlString
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents(static::path($path));

From 1c010cdca2b9275653da2f095f023db39864a9b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:49:46 +0200
Subject: [PATCH 2090/2811] Union type null instead of nullable short syntax

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index e523807d751..0cda2bb2d2f 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -94,7 +94,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): ?HtmlString
+    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|null
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents(static::path($path));

From 22c16d2fe1295b5ce848580711d01de054dae2e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:50:42 +0200
Subject: [PATCH 2091/2811] Add no-op helper method

---
 packages/framework/src/Support/Includes.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 0cda2bb2d2f..dc672b6ab99 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -120,6 +120,11 @@ protected static function getFileContents(string $path): ?string
         return Filesystem::get($path);
     }
 
+    protected static function getRaw(string $contents): string
+    {
+        return $contents;
+    }
+
     protected static function renderHtml(string $html): HtmlString
     {
         return new HtmlString($html);

From daedfdf269ecac21714eedbb5176385024ccce5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:52:20 +0200
Subject: [PATCH 2092/2811] Union type string return

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index dc672b6ab99..78d8999ac78 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -94,7 +94,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|null
+    protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|string|null
     {
         $path = static::normalizePath($filename, $extension);
         $contents = static::getFileContents(static::path($path));

From 7a7d9db04d3796a92a18823f335240d5f47f53bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:52:26 +0200
Subject: [PATCH 2093/2811] Use the helper method

---
 packages/framework/src/Support/Includes.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 78d8999ac78..4f2624a4023 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -48,14 +48,7 @@ public static function path(?string $filename = null): string
      */
     public static function get(string $filename, ?string $default = null): ?string
     {
-        $path = static::path(static::normalizePath($filename));
-        $contents = static::getFileContents($path);
-
-        if ($contents === null && $default === null) {
-            return null;
-        }
-
-        return $contents ?? $default;
+        return static::getInclude([static::class, 'getRaw'], $filename, $default);
     }
 
     /**

From 289ae7f49b98b9bcf41c0be1146258d8ac3f62df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:53:54 +0200
Subject: [PATCH 2094/2811] Annotate callable generics

---
 packages/framework/src/Support/Includes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 4f2624a4023..084900a46fd 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,6 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
+    /** @param callable(string): \Illuminate\Support\HtmlString|string|null $method */
     protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|string|null
     {
         $path = static::normalizePath($filename, $extension);

From 12d845e447f5391ab416c93a5a54e1bfe4b06f9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:56:23 +0200
Subject: [PATCH 2095/2811] Fix parameter annotation formatting

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 084900a46fd..7de90ddc07f 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -87,7 +87,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    /** @param callable(string): \Illuminate\Support\HtmlString|string|null $method */
+    /** @param callable(string): (\Illuminate\Support\HtmlString|string|null) $method */
     protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|string|null
     {
         $path = static::normalizePath($filename, $extension);

From 36e8b5eb981de72e637186c4c0a3ba1fbf0f0383 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:57:29 +0200
Subject: [PATCH 2096/2811] Inline no-op helper method into arrow function

---
 packages/framework/src/Support/Includes.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index 7de90ddc07f..bb237c66a1c 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -48,7 +48,7 @@ public static function path(?string $filename = null): string
      */
     public static function get(string $filename, ?string $default = null): ?string
     {
-        return static::getInclude([static::class, 'getRaw'], $filename, $default);
+        return static::getInclude(fn (string $contents): string => $contents, $filename, $default);
     }
 
     /**
@@ -114,11 +114,6 @@ protected static function getFileContents(string $path): ?string
         return Filesystem::get($path);
     }
 
-    protected static function getRaw(string $contents): string
-    {
-        return $contents;
-    }
-
     protected static function renderHtml(string $html): HtmlString
     {
         return new HtmlString($html);

From cdcf30e866447b356787bcbe7b14e9903a553e1e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:58:11 +0200
Subject: [PATCH 2097/2811] Replace ternary expression with if/else block

---
 packages/framework/src/Support/Includes.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index bb237c66a1c..bb9b89104be 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -34,9 +34,11 @@ class Includes
      */
     public static function path(?string $filename = null): string
     {
-        return $filename === null
-            ? Hyde::path(static::$includesDirectory)
-            : Hyde::path(static::$includesDirectory.'/'.static::normalizePath($filename));
+        if ($filename === null) {
+            return Hyde::path(static::$includesDirectory);
+        } else {
+            return Hyde::path(static::$includesDirectory.'/'.static::normalizePath($filename));
+        }
     }
 
     /**

From f30d834d3660daf7f1684fbe972a0c26b34ca8de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:58:21 +0200
Subject: [PATCH 2098/2811] Unwrap else block

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index bb9b89104be..c98bcc6d3f0 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -36,9 +36,9 @@ public static function path(?string $filename = null): string
     {
         if ($filename === null) {
             return Hyde::path(static::$includesDirectory);
-        } else {
-            return Hyde::path(static::$includesDirectory.'/'.static::normalizePath($filename));
         }
+
+        return Hyde::path(static::$includesDirectory.'/'.static::normalizePath($filename));
     }
 
     /**

From befd302d5ff42a6aed7df67813ffb7a730389192 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Jun 2024 21:59:44 +0200
Subject: [PATCH 2099/2811] Remove null union from callable that should not
 return it

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

diff --git a/packages/framework/src/Support/Includes.php b/packages/framework/src/Support/Includes.php
index c98bcc6d3f0..88b99ba280b 100644
--- a/packages/framework/src/Support/Includes.php
+++ b/packages/framework/src/Support/Includes.php
@@ -89,7 +89,7 @@ public static function markdown(string $filename, ?string $default = null): ?Htm
         return static::getInclude([static::class, 'renderMarkdown'], $filename, $default, '.md');
     }
 
-    /** @param callable(string): (\Illuminate\Support\HtmlString|string|null) $method */
+    /** @param callable(string): (\Illuminate\Support\HtmlString|string) $method */
     protected static function getInclude(callable $method, string $filename, ?string $default, string $extension = ''): HtmlString|string|null
     {
         $path = static::normalizePath($filename, $extension);

From 2e4b95946e5581b91eec325789feea702e1989c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 09:43:15 +0200
Subject: [PATCH 2100/2811] Update the `route` function to throw if the route
 does not exist

Fixes https://github.com/hydephp/develop/issues/1731
---
 packages/framework/src/helpers.php               | 2 +-
 packages/framework/tests/Feature/HelpersTest.php | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index eccc720e66f..f7ae7ccb540 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -44,7 +44,7 @@ function asset(string $name, bool $preferQualifiedUrl = false): string
              */
             function route(string $key): ?Hyde\Support\Models\Route
             {
-                return hyde()->route($key);
+                return hyde()->routes()->getRoute($key);
             }
         }
 
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 733a832e7ec..fb55a9acaf0 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -142,13 +142,9 @@ public function testRouteFunction()
     /** @covers ::route */
     public function testRouteFunctionWithInvalidRoute()
     {
-        $this->assertNull(route('foo'));
-    }
+        $this->expectException(\Hyde\Framework\Exceptions\RouteNotFoundException::class);
 
-    /** @covers ::route */
-    public function testRouteFunctionReturnsNullForNonExistentRoute()
-    {
-        $this->assertNull(route('nonexistent'));
+        route('invalid');
     }
 
     /** @covers ::url */

From 583a0be3b9c313526c70f880e33fbf27d754984c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 09:44:28 +0200
Subject: [PATCH 2101/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 85cd42010ba..88c857db8e2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,7 @@ This serves two purposes:
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
 - **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
 - **Breaking:** Renamed class `DataCollections` to `DataCollection`. For more information, see below.
+- Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
 - Minor: The documentation article component now supports disabling the semantic rendering using a falsy value in https://github.com/hydephp/develop/pull/1566

From d6d94816b3e9628e4d9909ca47462534591d1dc5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:07:04 +0200
Subject: [PATCH 2102/2811] Extract helper to get change frequency

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 38e53a3aa3b..19e4c337fcf 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -61,7 +61,7 @@ protected function addRoute(Route $route): void
 
         $this->addChild($urlItem, 'loc', $this->resolveRouteLink($route));
         $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
-        $this->addChild($urlItem, 'changefreq', 'daily');
+        $this->addChild($urlItem, 'changefreq', $this->getChangeFrequency());
 
         if (Config::getBool('hyde.sitemap.dynamic_priority', true)) {
             $this->addChild($urlItem, 'priority', $this->getPriority(
@@ -100,6 +100,11 @@ protected function getPriority(string $pageClass, string $slug): string
         return (string) $priority;
     }
 
+    protected function getChangeFrequency(): string
+    {
+        return 'daily';
+    }
+
     /** @return numeric-string */
     protected function getFormattedProcessingTime(): string
     {

From d768a3d912db9ddeff9c6b534e608396ce60b3ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:09:56 +0200
Subject: [PATCH 2103/2811] Add core data parameter

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 19e4c337fcf..eb14c5263e3 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -61,7 +61,7 @@ protected function addRoute(Route $route): void
 
         $this->addChild($urlItem, 'loc', $this->resolveRouteLink($route));
         $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
-        $this->addChild($urlItem, 'changefreq', $this->getChangeFrequency());
+        $this->addChild($urlItem, 'changefreq', $this->getChangeFrequency($route->getPageClass(), $route->getPage()->getIdentifier()));
 
         if (Config::getBool('hyde.sitemap.dynamic_priority', true)) {
             $this->addChild($urlItem, 'priority', $this->getPriority(
@@ -100,7 +100,7 @@ protected function getPriority(string $pageClass, string $slug): string
         return (string) $priority;
     }
 
-    protected function getChangeFrequency(): string
+    protected function getChangeFrequency(string $pageClass, string $slug): string
     {
         return 'daily';
     }

From 8e44b8108146b1e8d0bd742e5e381bef4b4c2e4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:10:36 +0200
Subject: [PATCH 2104/2811] Normalize protected legacy parameter name to use
 identifiers

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index eb14c5263e3..9c0d9fc3496 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -75,16 +75,16 @@ protected function getLastModDate(string $file): string
         return date('c', @filemtime($file) ?: time());
     }
 
-    protected function getPriority(string $pageClass, string $slug): string
+    protected function getPriority(string $pageClass, string $identifier): string
     {
         $priority = 0.5;
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class])) {
             $priority = 0.9;
-            if ($slug === 'index') {
+            if ($identifier === 'index') {
                 $priority = 1;
             }
-            if ($slug === '404') {
+            if ($identifier === '404') {
                 $priority = 0.5;
             }
         }
@@ -100,7 +100,7 @@ protected function getPriority(string $pageClass, string $slug): string
         return (string) $priority;
     }
 
-    protected function getChangeFrequency(string $pageClass, string $slug): string
+    protected function getChangeFrequency(string $pageClass, string $identifier): string
     {
         return 'daily';
     }

From e470ac3164782b3ff10f6258a5206643e0e44b5f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:11:02 +0200
Subject: [PATCH 2105/2811] Document variable

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 9c0d9fc3496..013d0637aad 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -77,6 +77,7 @@ protected function getLastModDate(string $file): string
 
     protected function getPriority(string $pageClass, string $identifier): string
     {
+        // The default priority, unless we find a better match.
         $priority = 0.5;
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class])) {

From 8a6b35fb67caeadfc9a7974f41708a106bee662d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:11:14 +0200
Subject: [PATCH 2106/2811] Add source code spacing

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 013d0637aad..d3de3357b25 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -82,9 +82,11 @@ protected function getPriority(string $pageClass, string $identifier): string
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class])) {
             $priority = 0.9;
+
             if ($identifier === 'index') {
                 $priority = 1;
             }
+
             if ($identifier === '404') {
                 $priority = 0.5;
             }

From 7e2e4981706c5c5079dc1b77cd5e52efa09daa62 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:11:46 +0200
Subject: [PATCH 2107/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 88c857db8e2..7ed45f5fa5c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -27,6 +27,7 @@ This serves two purposes:
 - Minor: Data collection files are now validated for syntax errors during discovery in https://github.com/hydephp/develop/pull/1732
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
+- Improved the sitemap data generation to be even smarter in https://github.com/hydephp/develop/pull/1744
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.

From 1a6c69a5de9340acf5a1f1df70a8d1c76599c45a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:13:20 +0200
Subject: [PATCH 2108/2811] Move down helper method

---
 .../Features/XmlGenerators/SitemapGenerator.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index d3de3357b25..bf077d469cc 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -108,12 +108,6 @@ protected function getChangeFrequency(string $pageClass, string $identifier): st
         return 'daily';
     }
 
-    /** @return numeric-string */
-    protected function getFormattedProcessingTime(): string
-    {
-        return (string) $this->getExecutionTimeInMs();
-    }
-
     protected function resolveRouteLink(Route $route): string
     {
         $baseUrl = Config::getNullableString('hyde.url');
@@ -127,4 +121,10 @@ protected function resolveRouteLink(Route $route): string
             return Hyde::url($route->getOutputPath());
         }
     }
+
+    /** @return numeric-string */
+    protected function getFormattedProcessingTime(): string
+    {
+        return (string) $this->getExecutionTimeInMs();
+    }
 }

From a69867bf8552bc2d0a23d0a72b03c99ba1a9adab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:14:06 +0200
Subject: [PATCH 2109/2811] Create SitemapFeatureTest.php

---
 .../framework/tests/Feature/SitemapFeatureTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/framework/tests/Feature/SitemapFeatureTest.php

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
new file mode 100644
index 00000000000..31c6ab54f85
--- /dev/null
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+class SitemapFeatureTest extends TestCase
+{
+    //
+}

From 9492fe5a4ed3c75938af8808a16c41d62ca49b53 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:14:33 +0200
Subject: [PATCH 2110/2811] Document test abstract

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 31c6ab54f85..eb87f8840ad 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -6,6 +6,9 @@
 
 use Hyde\Testing\TestCase;
 
+/**
+ * High level test of the sitemap generation feature.
+ */
 class SitemapFeatureTest extends TestCase
 {
     //

From cea246c1974d2781fbd154f0c5048dd83c9ab7a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:14:55 +0200
Subject: [PATCH 2111/2811] Annotate test crosslinks

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index eb87f8840ad..dd5b1fb0577 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -8,6 +8,9 @@
 
 /**
  * High level test of the sitemap generation feature.
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\SitemapServiceTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildSitemapCommandTest
  */
 class SitemapFeatureTest extends TestCase
 {

From 3072b81adfc9dc468746711a5976aa2b1337868d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:15:33 +0200
Subject: [PATCH 2112/2811] Annotate test coverage

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index dd5b1fb0577..88ce410b1f9 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -11,6 +11,10 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Services\SitemapServiceTest
  * @see \Hyde\Framework\Testing\Feature\Commands\BuildSitemapCommandTest
+ *
+ * @covers \Hyde\Framework\Features\XmlGenerators\SitemapGenerator
+ * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
+ * @covers \Hyde\Console\Commands\BuildSitemapCommand
  */
 class SitemapFeatureTest extends TestCase
 {

From f17fb0760055d200833562ffa4e1564cff08d536 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:16:26 +0200
Subject: [PATCH 2113/2811] Draft test method

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 88ce410b1f9..3a66fb51b87 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -18,5 +18,8 @@
  */
 class SitemapFeatureTest extends TestCase
 {
-    //
+    public function testTheSitemapFeature()
+    {
+        //
+    }
 }

From d6b19d764f7de1afdab1bd2c6bc193d16126b423 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:19:01 +0200
Subject: [PATCH 2114/2811] Set up broad site structure

---
 .../framework/tests/Feature/SitemapFeatureTest.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 3a66fb51b87..e873318a90b 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -20,6 +20,18 @@ class SitemapFeatureTest extends TestCase
 {
     public function testTheSitemapFeature()
     {
-        //
+        $this->setUpBroadSiteStructure();
+    }
+
+    protected function setUpBroadSiteStructure(): void
+    {
+        $this->file('_pages/about.md', "# About\n\nThis is the about page.");
+        $this->file('_pages/contact.html', '<h1>Contact</h1><p>This is the contact page.</p>');
+        $this->file('_posts/hello-world.md', "# Hello, World!\n\nThis is the first post.");
+        $this->file('_posts/second-post.md', "# Second Post\n\nThis is the second post.");
+        $this->file('_docs/index.md', "# Documentation\n\nThis is the documentation index.");
+        $this->file('_docs/installation.md', "# Installation\n\nThis is the installation guide.");
+        $this->file('_docs/usage.md', "# Usage\n\nThis is the usage guide.");
+        $this->file('_docs/404.md', "# 404\n\nThis is the 404 page.");
     }
 }

From b6827390f0113214aeb9a28552998cbd39512408 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:21:58 +0200
Subject: [PATCH 2115/2811] Comment line with no effect

---
 .../tests/Feature/Commands/BuildSitemapCommandTest.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index af77486f2cc..19fc41415b7 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -17,7 +17,7 @@ class BuildSitemapCommandTest extends TestCase
     public function testSitemapIsGeneratedWhenConditionsAreMet()
     {
         config(['hyde.url' => 'https://example.com']);
-        config(['hyde.generate_sitemap' => true]);
+        // config(['hyde.generate_sitemap' => true]); This is only applied when calling the main build command. If the user calls this command directly, it will always generate the sitemap as long as the URL is set.
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 

From 2d29ed8b839edac8009a8451171b89c31b18f1ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:22:06 +0200
Subject: [PATCH 2116/2811] Test sitemap is not generated when conditions are
 not met

---
 .../tests/Feature/Commands/BuildSitemapCommandTest.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index 19fc41415b7..792555560f0 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -26,4 +26,14 @@ public function testSitemapIsGeneratedWhenConditionsAreMet()
 
         Filesystem::unlink('_site/sitemap.xml');
     }
+
+    public function testSitemapIsNotGeneratedWhenConditionsAreNotMet()
+    {
+        config(['hyde.url' => '']);
+
+        $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
+
+        $this->artisan('build:sitemap')->assertExitCode(0);
+        $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
+    }
 }

From 1deff38cde60222a8c8b3b1f57eed9e0f7ed271a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:33:58 +0200
Subject: [PATCH 2117/2811] Add output assertions

---
 .../Feature/Commands/BuildSitemapCommandTest.php   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index 792555560f0..f4235787c5f 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -21,7 +21,12 @@ public function testSitemapIsGeneratedWhenConditionsAreMet()
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 
-        $this->artisan('build:sitemap')->assertExitCode(0);
+        $this->artisan('build:sitemap')
+            ->expectsOutputToContain('Generating sitemap...')
+            ->doesntExpectOutputToContain('Skipped')
+            ->expectsOutputToContain(' > Created _site/sitemap.xml')
+            ->assertExitCode(0);
+
         $this->assertFileExists(Hyde::path('_site/sitemap.xml'));
 
         Filesystem::unlink('_site/sitemap.xml');
@@ -33,7 +38,12 @@ public function testSitemapIsNotGeneratedWhenConditionsAreNotMet()
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 
-        $this->artisan('build:sitemap')->assertExitCode(0);
+        $this->artisan('build:sitemap')
+            ->expectsOutputToContain('Generating sitemap...')
+            ->expectsOutputToContain('Skipped')
+            ->expectsOutput(' > Cannot generate sitemap without a valid base URL')
+            ->assertExitCode(0);
+
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
     }
 }

From d8aaa38570f9b763f1d46333fa8d10786eb33878 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:35:30 +0200
Subject: [PATCH 2118/2811] Remove commented code covered in main site build
 test

---
 .../framework/tests/Feature/Commands/BuildSitemapCommandTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index f4235787c5f..0600ffed7df 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -17,7 +17,6 @@ class BuildSitemapCommandTest extends TestCase
     public function testSitemapIsGeneratedWhenConditionsAreMet()
     {
         config(['hyde.url' => 'https://example.com']);
-        // config(['hyde.generate_sitemap' => true]); This is only applied when calling the main build command. If the user calls this command directly, it will always generate the sitemap as long as the URL is set.
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 

From 5801af292779988e7b31fea40c850cabf9a331f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 10:36:33 +0200
Subject: [PATCH 2119/2811] Clean up sitemap file when done

This is more fault tolerant
---
 .../tests/Feature/Commands/BuildSitemapCommandTest.php       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index 0600ffed7df..ee13bc9bf03 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Facades\Filesystem;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
@@ -18,6 +17,8 @@ public function testSitemapIsGeneratedWhenConditionsAreMet()
     {
         config(['hyde.url' => 'https://example.com']);
 
+        $this->cleanUpWhenDone('_site/sitemap.xml');
+
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 
         $this->artisan('build:sitemap')
@@ -27,8 +28,6 @@ public function testSitemapIsGeneratedWhenConditionsAreMet()
             ->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/sitemap.xml'));
-
-        Filesystem::unlink('_site/sitemap.xml');
     }
 
     public function testSitemapIsNotGeneratedWhenConditionsAreNotMet()

From cd0411bbd10d7f99fa48e4d01510f2224d339242 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:47:34 +0200
Subject: [PATCH 2120/2811] Run test with site URL

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index e873318a90b..b986a45d115 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -21,6 +21,7 @@ class SitemapFeatureTest extends TestCase
     public function testTheSitemapFeature()
     {
         $this->setUpBroadSiteStructure();
+        $this->withSiteUrl();
     }
 
     protected function setUpBroadSiteStructure(): void

From ad6905877d67344b11456c6c77ff5f856c81fcae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:47:58 +0200
Subject: [PATCH 2121/2811] Build the sitemap

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index b986a45d115..ba369a270a4 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -22,6 +22,10 @@ public function testTheSitemapFeature()
     {
         $this->setUpBroadSiteStructure();
         $this->withSiteUrl();
+
+        $this->artisan('build:sitemap')
+            ->expectsOutputToContain('Created _site/sitemap.xml')
+            ->assertExitCode(0);
     }
 
     protected function setUpBroadSiteStructure(): void

From 66ef0b4a3497e883708b0183ccfaa2176c33efca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:48:15 +0200
Subject: [PATCH 2122/2811] Assert file exists

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index ba369a270a4..ceed7d946a6 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -26,6 +26,8 @@ public function testTheSitemapFeature()
         $this->artisan('build:sitemap')
             ->expectsOutputToContain('Created _site/sitemap.xml')
             ->assertExitCode(0);
+
+        $this->assertFileExists('_site/sitemap.xml');
     }
 
     protected function setUpBroadSiteStructure(): void

From 1c0d67f70fb6b551a2a9ca9c7b4ffd84dbb6ef69 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:49:46 +0200
Subject: [PATCH 2123/2811] Assert file equals string

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index ceed7d946a6..f9a18216ed7 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -28,6 +28,15 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
+        $this->assertFileEqualsString($this->expected(), '_site/sitemap.xml');
+    }
+
+    protected function expected(): string
+    {
+        return <<<XML
+        <?xml version="1.0" encoding="UTF-8"?>
+        TODO
+        XML;
     }
 
     protected function setUpBroadSiteStructure(): void

From 9ac5acc1200dc50b6e11b525db7a0d471f9af898 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:53:22 +0200
Subject: [PATCH 2124/2811] Document test proof intention

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index f9a18216ed7..04425d0e2e0 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -9,6 +9,8 @@
 /**
  * High level test of the sitemap generation feature.
  *
+ * It contains a setup that covers all code paths, proving 100% coverage in actual usage.
+ *
  * @see \Hyde\Framework\Testing\Feature\Services\SitemapServiceTest
  * @see \Hyde\Framework\Testing\Feature\Commands\BuildSitemapCommandTest
  *

From 5e357850ee92f9f17364880014a598fe61737ba3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:56:54 +0200
Subject: [PATCH 2125/2811] Format expected XML in test source

---
 .../tests/Feature/SitemapFeatureTest.php      | 84 ++++++++++++++++++-
 1 file changed, 81 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 04425d0e2e0..f4c6d912fb8 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -30,14 +30,87 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
-        $this->assertFileEqualsString($this->expected(), '_site/sitemap.xml');
+        $this->assertFileEqualsString(
+            '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected()), '_site/sitemap.xml');
     }
 
     protected function expected(): string
     {
         return <<<XML
-        <?xml version="1.0" encoding="UTF-8"?>
-        TODO
+        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP 1.6.0" processing_time_ms="31.628131866455">
+            <url>
+                <loc>https://example.com/contact.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.5</priority>
+            </url>
+            <url>
+                <loc>https://example.com/404.html</loc>
+                <lastmod>2024-06-28T08:12:42+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.5</priority>
+            </url>
+            <url>
+                <loc>https://example.com/index.html</loc>
+                <lastmod>2024-06-28T08:12:42+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>1</priority>
+            </url>
+            <url>
+                <loc>https://example.com/about.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.9</priority>
+            </url>
+            <url>
+                <loc>https://example.com/posts/hello-world.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.75</priority>
+            </url>
+            <url>
+                <loc>https://example.com/posts/second-post.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.75</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/404.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.9</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/index.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.9</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/installation.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.9</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/usage.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.9</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/search.json</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.5</priority>
+            </url>
+            <url>
+                <loc>https://example.com/docs/search.html</loc>
+                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <changefreq>daily</changefreq>
+                <priority>0.5</priority>
+            </url>
+        </urlset>
         XML;
     }
 
@@ -52,4 +125,9 @@ protected function setUpBroadSiteStructure(): void
         $this->file('_docs/usage.md', "# Usage\n\nThis is the usage guide.");
         $this->file('_docs/404.md', "# 404\n\nThis is the 404 page.");
     }
+
+    protected function stripFormatting(string $xml): string
+    {
+        return str_replace("\n", '', $xml);
+    }
 }

From e5fcfee044ba5dc863d4264788a87eed8b6b7efe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:57:50 +0200
Subject: [PATCH 2126/2811] Formatting

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index f4c6d912fb8..e709a9913ac 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -30,8 +30,7 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
-        $this->assertFileEqualsString(
-            '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected()), '_site/sitemap.xml');
+        $this->assertFileEqualsString('<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected()), '_site/sitemap.xml');
     }
 
     protected function expected(): string

From 585af3e95910c2ff790037b086381db4dafb12a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 11:57:58 +0200
Subject: [PATCH 2127/2811] Add todo

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index e709a9913ac..db4fb3b6b1e 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -30,6 +30,7 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
+        // TODO: Fix dynamic data in comparison 
         $this->assertFileEqualsString('<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected()), '_site/sitemap.xml');
     }
 

From d8d731ddf5be011843ec8593fb4c76a0e4e1f682 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:00:03 +0200
Subject: [PATCH 2128/2811] Introduce local variable

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index db4fb3b6b1e..07f19c5e7c6 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -30,8 +30,9 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
-        // TODO: Fix dynamic data in comparison 
-        $this->assertFileEqualsString('<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected()), '_site/sitemap.xml');
+        // TODO: Fix dynamic data in comparison
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
+        $this->assertFileEqualsString($expected, '_site/sitemap.xml');
     }
 
     protected function expected(): string

From 0278fd5b37af7cdb1567dcca9d5c2454c60325f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:00:27 +0200
Subject: [PATCH 2129/2811] Inline relevant helper method call

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 07f19c5e7c6..7e38594e42f 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -32,7 +32,7 @@ public function testTheSitemapFeature()
         $this->assertFileExists('_site/sitemap.xml');
         // TODO: Fix dynamic data in comparison
         $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
-        $this->assertFileEqualsString($expected, '_site/sitemap.xml');
+        $this->assertSame($expected, file_get_contents('_site/sitemap.xml'));
     }
 
     protected function expected(): string

From e592f2d5e542e2dce45ef59831c3c04ca9bd445b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:00:35 +0200
Subject: [PATCH 2130/2811] Introduce local variable

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 7e38594e42f..0ddd7ccc913 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -32,7 +32,8 @@ public function testTheSitemapFeature()
         $this->assertFileExists('_site/sitemap.xml');
         // TODO: Fix dynamic data in comparison
         $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
-        $this->assertSame($expected, file_get_contents('_site/sitemap.xml'));
+        $actual = file_get_contents('_site/sitemap.xml');
+        $this->assertSame($expected, $actual);
     }
 
     protected function expected(): string

From 88dc5d72ec9e47ef473a8136954a9b2440c68e00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:01:35 +0200
Subject: [PATCH 2131/2811] Draft helper to strip dynamic data

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 0ddd7ccc913..bad50f077e5 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -33,7 +33,7 @@ public function testTheSitemapFeature()
         // TODO: Fix dynamic data in comparison
         $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
         $actual = file_get_contents('_site/sitemap.xml');
-        $this->assertSame($expected, $actual);
+        $this->assertSame($this->stripDynamicData($expected), $this->stripDynamicData($actual));
     }
 
     protected function expected(): string
@@ -132,4 +132,9 @@ protected function stripFormatting(string $xml): string
     {
         return str_replace("\n", '', $xml);
     }
+
+    protected function stripDynamicData(string $string): string
+    {
+        return $string;
+    }
 }

From 29eba252bed0c65684ee2d8f45e1304be2cc94e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:02:20 +0200
Subject: [PATCH 2132/2811] Clean up when done

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index bad50f077e5..22dc1b05323 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -22,6 +22,7 @@ class SitemapFeatureTest extends TestCase
 {
     public function testTheSitemapFeature()
     {
+        $this->cleanUpWhenDone('_site/sitemap.xml');
         $this->setUpBroadSiteStructure();
         $this->withSiteUrl();
 

From 8c52c0e825fedd871115087eaa4c1984f64773f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:05:21 +0200
Subject: [PATCH 2133/2811] Fix dynamic data in comparison

---
 .../tests/Feature/SitemapFeatureTest.php      | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 22dc1b05323..e4776488ffa 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -31,7 +31,7 @@ public function testTheSitemapFeature()
             ->assertExitCode(0);
 
         $this->assertFileExists('_site/sitemap.xml');
-        // TODO: Fix dynamic data in comparison
+
         $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
         $actual = file_get_contents('_site/sitemap.xml');
         $this->assertSame($this->stripDynamicData($expected), $this->stripDynamicData($actual));
@@ -40,10 +40,10 @@ public function testTheSitemapFeature()
     protected function expected(): string
     {
         return <<<XML
-        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP 1.6.0" processing_time_ms="31.628131866455">
+        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP {{ dynamic }}" processing_time_ms="{{ dynamic }}">
             <url>
                 <loc>https://example.com/contact.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
@@ -61,55 +61,55 @@ protected function expected(): string
             </url>
             <url>
                 <loc>https://example.com/about.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/posts/hello-world.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/posts/second-post.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/404.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/index.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/installation.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/usage.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/search.json</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/search.html</loc>
-                <lastmod>2024-06-28T09:48:58+00:00</lastmod>
+                <lastmod>{{ dynamic }}</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
@@ -136,6 +136,10 @@ protected function stripFormatting(string $xml): string
 
     protected function stripDynamicData(string $string): string
     {
+        $string = preg_replace('/HydePHP \d+\.\d+\.\d+/', 'HydePHP {{ dynamic }}', $string);
+        $string = preg_replace('/processing_time_ms="\d+"/', 'processing_time_ms="{{ dynamic }}"', $string);
+        $string = preg_replace('/<lastmod>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}<\/lastmod>/', '<lastmod>{{ dynamic }}</lastmod>', $string);
+
         return $string;
     }
 }

From 99bc070c83503936b56fa76bc7fd4ff47b43abf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:06:29 +0200
Subject: [PATCH 2134/2811] Set Carbon time

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index e4776488ffa..6c862a98aec 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Carbon;
 
 /**
  * High level test of the sitemap generation feature.
@@ -22,6 +23,8 @@ class SitemapFeatureTest extends TestCase
 {
     public function testTheSitemapFeature()
     {
+        Carbon::setTestNow('2024-01-01 12:00:00');
+
         $this->cleanUpWhenDone('_site/sitemap.xml');
         $this->setUpBroadSiteStructure();
         $this->withSiteUrl();

From 0d4ce007073eb6467f6d6f45311d695084ffd71a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:06:58 +0200
Subject: [PATCH 2135/2811] Skip test until ready

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 6c862a98aec..db2f28f08c7 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -23,6 +23,8 @@ class SitemapFeatureTest extends TestCase
 {
     public function testTheSitemapFeature()
     {
+        $this->markTestSkipped('This test is not yet complete.');
+
         Carbon::setTestNow('2024-01-01 12:00:00');
 
         $this->cleanUpWhenDone('_site/sitemap.xml');

From 79a7862ead4af831555bb03bbb59023f6365af84 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Jun 2024 10:07:08 +0000
Subject: [PATCH 2136/2811] Apply fixes from StyleCI

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index db2f28f08c7..a027188b501 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -44,7 +44,7 @@ public function testTheSitemapFeature()
 
     protected function expected(): string
     {
-        return <<<XML
+        return <<<'XML'
         <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP {{ dynamic }}" processing_time_ms="{{ dynamic }}">
             <url>
                 <loc>https://example.com/contact.html</loc>

From f2ee36f250265b5c32149bde01a672e24074fb3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:11:30 +0200
Subject: [PATCH 2137/2811] Remove the sitemap `processing_time_ms` attribute
 as it adds no value

This is not a standard attribute, it's just a "cool thing" that adds no real value, as this file is not even intended for humans to read.
---
 RELEASE_NOTES.md                                          | 1 +
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 --------
 packages/framework/tests/Feature/SitemapFeatureTest.php   | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7ed45f5fa5c..0d98f09ad6c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -27,6 +27,7 @@ This serves two purposes:
 - Minor: Data collection files are now validated for syntax errors during discovery in https://github.com/hydephp/develop/pull/1732
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
+- Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Improved the sitemap data generation to be even smarter in https://github.com/hydephp/develop/pull/1744
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index bf077d469cc..184f1c34d78 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -42,8 +42,6 @@ public function generate(): static
 
     public function getXml(): string
     {
-        $this->xmlElement->addAttribute('processing_time_ms', $this->getFormattedProcessingTime());
-
         return parent::getXml();
     }
 
@@ -121,10 +119,4 @@ protected function resolveRouteLink(Route $route): string
             return Hyde::url($route->getOutputPath());
         }
     }
-
-    /** @return numeric-string */
-    protected function getFormattedProcessingTime(): string
-    {
-        return (string) $this->getExecutionTimeInMs();
-    }
 }
diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index a027188b501..2ca9c26cc01 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -45,7 +45,7 @@ public function testTheSitemapFeature()
     protected function expected(): string
     {
         return <<<'XML'
-        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP {{ dynamic }}" processing_time_ms="{{ dynamic }}">
+        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP {{ dynamic }}">
             <url>
                 <loc>https://example.com/contact.html</loc>
                 <lastmod>{{ dynamic }}</lastmod>

From acdc6816bf81e47028c5274162a59a42267b7443 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:12:53 +0200
Subject: [PATCH 2138/2811] Sitemap generator no longer needs to track
 execution time

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 184f1c34d78..217ec39cc01 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -15,7 +15,6 @@
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Concerns\TracksExecutionTime;
 
 use function blank;
 use function filemtime;
@@ -29,8 +28,6 @@
  */
 class SitemapGenerator extends BaseXmlGenerator
 {
-    use TracksExecutionTime;
-
     public function generate(): static
     {
         Routes::all()->each(function (Route $route): void {
@@ -47,8 +44,6 @@ public function getXml(): string
 
     protected function constructBaseElement(): void
     {
-        $this->startClock();
-
         $this->xmlElement = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"></urlset>');
         $this->xmlElement->addAttribute('generator', 'HydePHP '.Hyde::version());
     }

From 39d91deba924c926d4c74224b9ab2fe0adc02742 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:13:19 +0200
Subject: [PATCH 2139/2811] Remove redundant method override

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 217ec39cc01..ed65013d9c1 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -37,11 +37,6 @@ public function generate(): static
         return $this;
     }
 
-    public function getXml(): string
-    {
-        return parent::getXml();
-    }
-
     protected function constructBaseElement(): void
     {
         $this->xmlElement = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"></urlset>');

From 0604d17609c482ab2aec8d3ce814a73aa788208f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:20:00 +0200
Subject: [PATCH 2140/2811] Replace ternary expression with if/else block

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index ed65013d9c1..63bc52f7919 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -60,7 +60,11 @@ protected function addRoute(Route $route): void
 
     protected function getLastModDate(string $file): string
     {
-        return date('c', @filemtime($file) ?: time());
+        if (@filemtime($file)) {
+            return date('c', @filemtime($file));
+        } else {
+            return date('c', time());
+        }
     }
 
     protected function getPriority(string $pageClass, string $identifier): string

From 013657ee509eda3726fc5457798eb62be093c4b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:21:05 +0200
Subject: [PATCH 2141/2811] Refactor to extract common parts of if/else block

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 63bc52f7919..8f322fa081b 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -60,11 +60,11 @@ protected function addRoute(Route $route): void
 
     protected function getLastModDate(string $file): string
     {
-        if (@filemtime($file)) {
-            return date('c', @filemtime($file));
-        } else {
-            return date('c', time());
+        $timestamp = @filemtime($file);
+        if (! $timestamp) {
+            $timestamp = time();
         }
+        return date('c', $timestamp);
     }
 
     protected function getPriority(string $pageClass, string $identifier): string

From 4a0e418ae005e5993d3c0d24ea58ee6612d1d6c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:22:20 +0200
Subject: [PATCH 2142/2811] Get modified time from mockable Filesystem

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 8f322fa081b..32f6d364ba2 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -12,12 +12,12 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Facades\Filesystem;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 
 use function blank;
-use function filemtime;
 use function in_array;
 use function date;
 use function time;
@@ -60,7 +60,7 @@ protected function addRoute(Route $route): void
 
     protected function getLastModDate(string $file): string
     {
-        $timestamp = @filemtime($file);
+        $timestamp = @Filesystem::lastModified($file);
         if (! $timestamp) {
             $timestamp = time();
         }

From dd863a93c1b3b7f5b9647b774e86bae10cdf3bf7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:22:58 +0200
Subject: [PATCH 2143/2811] Fix formatting

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 32f6d364ba2..2a346f1e3a8 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -61,9 +61,11 @@ protected function addRoute(Route $route): void
     protected function getLastModDate(string $file): string
     {
         $timestamp = @Filesystem::lastModified($file);
+
         if (! $timestamp) {
             $timestamp = time();
         }
+
         return date('c', $timestamp);
     }
 

From cfe58aef75651df75796282484304ddbc16efc13 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:23:31 +0200
Subject: [PATCH 2144/2811] Get current time from mockable Carbon

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 2a346f1e3a8..8da9dbf1b03 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -14,13 +14,13 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Facades\Filesystem;
 use Hyde\Support\Models\Route;
+use Illuminate\Support\Carbon;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 
 use function blank;
 use function in_array;
 use function date;
-use function time;
 use function str_starts_with;
 
 /**
@@ -63,7 +63,7 @@ protected function getLastModDate(string $file): string
         $timestamp = @Filesystem::lastModified($file);
 
         if (! $timestamp) {
-            $timestamp = time();
+            $timestamp = Carbon::now()->timestamp;
         }
 
         return date('c', $timestamp);

From 2cceb37374fa27bf58640b1a92c83b3dc40fc4f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:24:48 +0200
Subject: [PATCH 2145/2811] Revert "Replace ternary expression with if/else
 block"

This reverts commit 0604d17609c482ab2aec8d3ce814a73aa788208f.
---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 8da9dbf1b03..af6e4e31654 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -60,13 +60,7 @@ protected function addRoute(Route $route): void
 
     protected function getLastModDate(string $file): string
     {
-        $timestamp = @Filesystem::lastModified($file);
-
-        if (! $timestamp) {
-            $timestamp = Carbon::now()->timestamp;
-        }
-
-        return date('c', $timestamp);
+        return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
     }
 
     protected function getPriority(string $pageClass, string $identifier): string

From 07e7650ed0227ff6621d6766e67f94e96a762d2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:41:06 +0200
Subject: [PATCH 2146/2811] Revert "Skip test until ready"

This reverts commit 0d4ce007073eb6467f6d6f45311d695084ffd71a.
---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 2ca9c26cc01..878e7b08180 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -23,8 +23,6 @@ class SitemapFeatureTest extends TestCase
 {
     public function testTheSitemapFeature()
     {
-        $this->markTestSkipped('This test is not yet complete.');
-
         Carbon::setTestNow('2024-01-01 12:00:00');
 
         $this->cleanUpWhenDone('_site/sitemap.xml');

From 7c2088f6461d5708fbc25c5506b91a55a2d19745 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:49:39 +0200
Subject: [PATCH 2147/2811] Refactor test to replace dynamic data with static
 mocks

---
 .../tests/Feature/SitemapFeatureTest.php      | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 878e7b08180..d778e58a4fb 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Mockery;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\File;
 
 /**
  * High level test of the sitemap generation feature.
@@ -25,6 +28,10 @@ public function testTheSitemapFeature()
     {
         Carbon::setTestNow('2024-01-01 12:00:00');
 
+        $filesystem = Mockery::mock(\Illuminate\Filesystem\Filesystem::class)->makePartial();
+        $filesystem->shouldReceive('lastModified')->andReturn(Carbon::now()->timestamp);
+        File::swap($filesystem);
+
         $this->cleanUpWhenDone('_site/sitemap.xml');
         $this->setUpBroadSiteStructure();
         $this->withSiteUrl();
@@ -35,84 +42,86 @@ public function testTheSitemapFeature()
 
         $this->assertFileExists('_site/sitemap.xml');
 
-        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected());
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected())."\n";
         $actual = file_get_contents('_site/sitemap.xml');
-        $this->assertSame($this->stripDynamicData($expected), $this->stripDynamicData($actual));
+        $this->assertSame($expected, $actual);
     }
 
     protected function expected(): string
     {
-        return <<<'XML'
-        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP {{ dynamic }}">
+        $version = Hyde::version();
+
+        return <<<XML
+        <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP $version">
             <url>
                 <loc>https://example.com/contact.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/404.html</loc>
-                <lastmod>2024-06-28T08:12:42+00:00</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/index.html</loc>
-                <lastmod>2024-06-28T08:12:42+00:00</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>1</priority>
             </url>
             <url>
                 <loc>https://example.com/about.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/posts/hello-world.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/posts/second-post.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/404.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/index.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/installation.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/usage.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.9</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/search.json</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/search.html</loc>
-                <lastmod>{{ dynamic }}</lastmod>
+                <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
                 <priority>0.5</priority>
             </url>
@@ -134,15 +143,6 @@ protected function setUpBroadSiteStructure(): void
 
     protected function stripFormatting(string $xml): string
     {
-        return str_replace("\n", '', $xml);
-    }
-
-    protected function stripDynamicData(string $string): string
-    {
-        $string = preg_replace('/HydePHP \d+\.\d+\.\d+/', 'HydePHP {{ dynamic }}', $string);
-        $string = preg_replace('/processing_time_ms="\d+"/', 'processing_time_ms="{{ dynamic }}"', $string);
-        $string = preg_replace('/<lastmod>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}<\/lastmod>/', '<lastmod>{{ dynamic }}</lastmod>', $string);
-
-        return $string;
+        return implode('', array_map('trim', explode("\n", $xml)));
     }
 }

From 93051299dfecdac3478bb5bd11bfe71b656c2105 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:50:17 +0200
Subject: [PATCH 2148/2811] Replace qualifier with an import

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index d778e58a4fb..1ade6c54f9e 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -9,6 +9,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\File;
+use Illuminate\Filesystem\Filesystem;
 
 /**
  * High level test of the sitemap generation feature.
@@ -28,7 +29,7 @@ public function testTheSitemapFeature()
     {
         Carbon::setTestNow('2024-01-01 12:00:00');
 
-        $filesystem = Mockery::mock(\Illuminate\Filesystem\Filesystem::class)->makePartial();
+        $filesystem = Mockery::mock(Filesystem::class)->makePartial();
         $filesystem->shouldReceive('lastModified')->andReturn(Carbon::now()->timestamp);
         File::swap($filesystem);
 

From 2a77dc6ca7bfe7a7e61300aa7ca01b345ea48711 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:51:30 +0200
Subject: [PATCH 2149/2811] Clean up data passing

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 1ade6c54f9e..b23209611f7 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -43,15 +43,13 @@ public function testTheSitemapFeature()
 
         $this->assertFileExists('_site/sitemap.xml');
 
-        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected())."\n";
+        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected(Hyde::version()))."\n";
         $actual = file_get_contents('_site/sitemap.xml');
         $this->assertSame($expected, $actual);
     }
 
-    protected function expected(): string
+    protected function expected(string $version): string
     {
-        $version = Hyde::version();
-
         return <<<XML
         <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9" generator="HydePHP $version">
             <url>

From 0dcaa429aaf99676474c3a1232d11200b1655bb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:52:38 +0200
Subject: [PATCH 2150/2811] Convert concatenation to string interpolation

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index b23209611f7..a1a549db795 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -43,7 +43,7 @@ public function testTheSitemapFeature()
 
         $this->assertFileExists('_site/sitemap.xml');
 
-        $expected = '<?xml version="1.0" encoding="UTF-8"?>'."\n".$this->stripFormatting($this->expected(Hyde::version()))."\n";
+        $expected =  '<?xml version="1.0" encoding="UTF-8"?>'."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n";
         $actual = file_get_contents('_site/sitemap.xml');
         $this->assertSame($expected, $actual);
     }

From 19935d8ec4717caf7716ea1fe223b6b3e5ea864d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:52:50 +0200
Subject: [PATCH 2151/2811] Inline local variable

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index a1a549db795..a8959c0710c 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -44,8 +44,7 @@ public function testTheSitemapFeature()
         $this->assertFileExists('_site/sitemap.xml');
 
         $expected =  '<?xml version="1.0" encoding="UTF-8"?>'."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n";
-        $actual = file_get_contents('_site/sitemap.xml');
-        $this->assertSame($expected, $actual);
+        $this->assertSame($expected, file_get_contents('_site/sitemap.xml'));
     }
 
     protected function expected(string $version): string

From 1434d431bdf2a3823f0439a7381407097cd1ed1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:53:19 +0200
Subject: [PATCH 2152/2811] Clean up formatting

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index a8959c0710c..5d75ca50e20 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -28,7 +28,6 @@ class SitemapFeatureTest extends TestCase
     public function testTheSitemapFeature()
     {
         Carbon::setTestNow('2024-01-01 12:00:00');
-
         $filesystem = Mockery::mock(Filesystem::class)->makePartial();
         $filesystem->shouldReceive('lastModified')->andReturn(Carbon::now()->timestamp);
         File::swap($filesystem);
@@ -43,8 +42,10 @@ public function testTheSitemapFeature()
 
         $this->assertFileExists('_site/sitemap.xml');
 
-        $expected =  '<?xml version="1.0" encoding="UTF-8"?>'."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n";
-        $this->assertSame($expected, file_get_contents('_site/sitemap.xml'));
+        $this->assertSame(
+            '<?xml version="1.0" encoding="UTF-8"?>'."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n",
+            file_get_contents('_site/sitemap.xml')
+        );
     }
 
     protected function expected(string $version): string

From 301ba734419978c46b0183fa5bf73454ede6c1de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:55:39 +0200
Subject: [PATCH 2153/2811] Move up method in source

---
 .../tests/Feature/SitemapFeatureTest.php      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 5d75ca50e20..0477f24093a 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -48,6 +48,18 @@ public function testTheSitemapFeature()
         );
     }
 
+    protected function setUpBroadSiteStructure(): void
+    {
+        $this->file('_pages/about.md', "# About\n\nThis is the about page.");
+        $this->file('_pages/contact.html', '<h1>Contact</h1><p>This is the contact page.</p>');
+        $this->file('_posts/hello-world.md', "# Hello, World!\n\nThis is the first post.");
+        $this->file('_posts/second-post.md', "# Second Post\n\nThis is the second post.");
+        $this->file('_docs/index.md', "# Documentation\n\nThis is the documentation index.");
+        $this->file('_docs/installation.md', "# Installation\n\nThis is the installation guide.");
+        $this->file('_docs/usage.md', "# Usage\n\nThis is the usage guide.");
+        $this->file('_docs/404.md', "# 404\n\nThis is the 404 page.");
+    }
+
     protected function expected(string $version): string
     {
         return <<<XML
@@ -128,18 +140,6 @@ protected function expected(string $version): string
         XML;
     }
 
-    protected function setUpBroadSiteStructure(): void
-    {
-        $this->file('_pages/about.md', "# About\n\nThis is the about page.");
-        $this->file('_pages/contact.html', '<h1>Contact</h1><p>This is the contact page.</p>');
-        $this->file('_posts/hello-world.md', "# Hello, World!\n\nThis is the first post.");
-        $this->file('_posts/second-post.md', "# Second Post\n\nThis is the second post.");
-        $this->file('_docs/index.md', "# Documentation\n\nThis is the documentation index.");
-        $this->file('_docs/installation.md', "# Installation\n\nThis is the installation guide.");
-        $this->file('_docs/usage.md', "# Usage\n\nThis is the usage guide.");
-        $this->file('_docs/404.md', "# 404\n\nThis is the 404 page.");
-    }
-
     protected function stripFormatting(string $xml): string
     {
         return implode('', array_map('trim', explode("\n", $xml)));

From 1f8a3afaac0ec4ffc738ac85ff0302d85ee42c9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 12:57:01 +0200
Subject: [PATCH 2154/2811] Add todo to remove unreachable code

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index af6e4e31654..8c217de70bc 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -101,6 +101,8 @@ protected function resolveRouteLink(Route $route): string
         $baseUrl = Config::getNullableString('hyde.url');
 
         if (blank($baseUrl) || str_starts_with($baseUrl, 'http://localhost')) {
+            // TODO: This does not seem to be reachable from the actual commands, and should be removed.
+
             // While the sitemap spec requires a full URL, we rather fall back
             // to using relative links instead of using localhost links.
 

From 8e7969e7e7112cf0c8cd0cf57fc4e6eed1626e33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:37:28 +0200
Subject: [PATCH 2155/2811] Unwrap 'else'

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 8c217de70bc..2c2d992c9a6 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -107,8 +107,8 @@ protected function resolveRouteLink(Route $route): string
             // to using relative links instead of using localhost links.
 
             return $route->getLink();
-        } else {
-            return Hyde::url($route->getOutputPath());
         }
+
+        return Hyde::url($route->getOutputPath());
     }
 }

From 31ffc5eadc239999d361e30ca2b4733143562845 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:39:08 +0200
Subject: [PATCH 2156/2811] Remove unreachable legacy relative sitemap link
 resolving

This does not seem to be reachable from the actual commands, only by unit tests and direct code access. Since it's a protected method it is not covered by BC.
---
 .../Features/XmlGenerators/SitemapGenerator.php     | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 2c2d992c9a6..e2e1faa5257 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -18,10 +18,8 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 
-use function blank;
 use function in_array;
 use function date;
-use function str_starts_with;
 
 /**
  * @see https://www.sitemaps.org/protocol.html
@@ -98,17 +96,6 @@ protected function getChangeFrequency(string $pageClass, string $identifier): st
 
     protected function resolveRouteLink(Route $route): string
     {
-        $baseUrl = Config::getNullableString('hyde.url');
-
-        if (blank($baseUrl) || str_starts_with($baseUrl, 'http://localhost')) {
-            // TODO: This does not seem to be reachable from the actual commands, and should be removed.
-
-            // While the sitemap spec requires a full URL, we rather fall back
-            // to using relative links instead of using localhost links.
-
-            return $route->getLink();
-        }
-
         return Hyde::url($route->getOutputPath());
     }
 }

From 7f002118de3284690bd93e36744495afa69f4381 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:41:44 +0200
Subject: [PATCH 2157/2811] Adjust 404 priority logic to be independent of page
 type

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index e2e1faa5257..219f7151010 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -72,10 +72,10 @@ protected function getPriority(string $pageClass, string $identifier): string
             if ($identifier === 'index') {
                 $priority = 1;
             }
+        }
 
-            if ($identifier === '404') {
-                $priority = 0.5;
-            }
+        if ($identifier === '404') {
+            $priority = 0.5;
         }
 
         if ($pageClass === DocumentationPage::class) {

From cfd554591b2fd02fd21ea267ba66bd66cf9bbc53 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:42:57 +0200
Subject: [PATCH 2158/2811] Move down 404 priority to last in chain to prevent
 it being overwritten

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 219f7151010..5ddc3daaf40 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -74,10 +74,6 @@ protected function getPriority(string $pageClass, string $identifier): string
             }
         }
 
-        if ($identifier === '404') {
-            $priority = 0.5;
-        }
-
         if ($pageClass === DocumentationPage::class) {
             $priority = 0.9;
         }
@@ -86,6 +82,10 @@ protected function getPriority(string $pageClass, string $identifier): string
             $priority = 0.75;
         }
 
+        if ($identifier === '404') {
+            $priority = 0.5;
+        }
+
         return (string) $priority;
     }
 

From c5f6f3e0c7d2fe0dd47a783b737694f1f33af4a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:43:20 +0200
Subject: [PATCH 2159/2811] Expect lower 404 priority

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 0477f24093a..cbd43e00415 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -104,7 +104,7 @@ protected function expected(string $version): string
                 <loc>https://example.com/docs/404.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
-                <priority>0.9</priority>
+                <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/index.html</loc>

From 8ae31f9abe3b18165d67e9a792a9cf34450497d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:46:25 +0200
Subject: [PATCH 2160/2811] Document the priority algorithm intentions

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 5ddc3daaf40..a36a455336e 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -61,28 +61,34 @@ protected function getLastModDate(string $file): string
         return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
     }
 
+    /** Intelligently find a good priority for the given page based on assumptions about the site structure. */
     protected function getPriority(string $pageClass, string $identifier): string
     {
         // The default priority, unless we find a better match.
         $priority = 0.5;
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class])) {
+            // These pages are usually high up in the site hierarchy, so they get a higher priority.
             $priority = 0.9;
 
             if ($identifier === 'index') {
+                // The homepage is the most important page, so it gets the highest priority.
                 $priority = 1;
             }
         }
 
         if ($pageClass === DocumentationPage::class) {
+            // If a site has documentation pages, they are usually important as well.
             $priority = 0.9;
         }
 
         if ($pageClass === MarkdownPost::class) {
+            // Posts are usually less important than pages as there may be many of them.
             $priority = 0.75;
         }
 
         if ($identifier === '404') {
+            // 404 pages are rarely important to index, so they get a lower priority.
             $priority = 0.5;
         }
 

From 619a28a326c1a637cbfe84401e08b27d42d8d40d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:47:59 +0200
Subject: [PATCH 2161/2811] Merge up documentation page rules with matching
 semantics

Also gives documentation indexes top priority
---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php  | 7 +------
 packages/framework/tests/Feature/SitemapFeatureTest.php    | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index a36a455336e..5ead80ab8da 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -67,7 +67,7 @@ protected function getPriority(string $pageClass, string $identifier): string
         // The default priority, unless we find a better match.
         $priority = 0.5;
 
-        if (in_array($pageClass, [BladePage::class, MarkdownPage::class])) {
+        if (in_array($pageClass, [BladePage::class, MarkdownPage::class, DocumentationPage::class])) {
             // These pages are usually high up in the site hierarchy, so they get a higher priority.
             $priority = 0.9;
 
@@ -77,11 +77,6 @@ protected function getPriority(string $pageClass, string $identifier): string
             }
         }
 
-        if ($pageClass === DocumentationPage::class) {
-            // If a site has documentation pages, they are usually important as well.
-            $priority = 0.9;
-        }
-
         if ($pageClass === MarkdownPost::class) {
             // Posts are usually less important than pages as there may be many of them.
             $priority = 0.75;
diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index cbd43e00415..c91a7e17188 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -110,7 +110,7 @@ protected function expected(string $version): string
                 <loc>https://example.com/docs/index.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
-                <priority>0.9</priority>
+                <priority>1</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/installation.html</loc>

From ffa91616db47a30bceb0fb0571f91a852d8a7fd4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:50:40 +0200
Subject: [PATCH 2162/2811] Lower 404 page priority

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 2 +-
 packages/framework/tests/Feature/SitemapFeatureTest.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 5ead80ab8da..41a1f15d5e7 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -84,7 +84,7 @@ protected function getPriority(string $pageClass, string $identifier): string
 
         if ($identifier === '404') {
             // 404 pages are rarely important to index, so they get a lower priority.
-            $priority = 0.5;
+            $priority = 0.25;
         }
 
         return (string) $priority;
diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index c91a7e17188..8f508352b09 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -74,7 +74,7 @@ protected function expected(string $version): string
                 <loc>https://example.com/404.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
-                <priority>0.5</priority>
+                <priority>0.25</priority>
             </url>
             <url>
                 <loc>https://example.com/index.html</loc>
@@ -104,7 +104,7 @@ protected function expected(string $version): string
                 <loc>https://example.com/docs/404.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
-                <priority>0.5</priority>
+                <priority>0.25</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/index.html</loc>

From aabe8b82f262ba123eac74779d5b3243ed589307 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:52:55 +0200
Subject: [PATCH 2163/2811] Create priority group for more page types

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php  | 7 +++++--
 packages/framework/tests/Feature/SitemapFeatureTest.php    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 41a1f15d5e7..96fe5545e87 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -9,10 +9,12 @@
 use Hyde\Hyde;
 use SimpleXMLElement;
 use Hyde\Facades\Config;
+use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Facades\Filesystem;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Carbon;
 use Hyde\Pages\DocumentationPage;
@@ -77,8 +79,9 @@ protected function getPriority(string $pageClass, string $identifier): string
             }
         }
 
-        if ($pageClass === MarkdownPost::class) {
-            // Posts are usually less important than pages as there may be many of them.
+        if (in_array($pageClass, [MarkdownPost::class, InMemoryPage::class, HtmlPage::class])) {
+            // Posts are usually less important than normal pages as there may be many of them.
+            // We group in InMemoryPages and HtmlPages here since we don't have much context for them.
             $priority = 0.75;
         }
 
diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 8f508352b09..0f58538ee5d 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -68,7 +68,7 @@ protected function expected(string $version): string
                 <loc>https://example.com/contact.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
                 <changefreq>daily</changefreq>
-                <priority>0.5</priority>
+                <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/404.html</loc>

From 00b94078b39d713c7053e5e4d5b3fd62b9d0201b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 13:59:16 +0200
Subject: [PATCH 2164/2811] Extract new testing helper

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 0f58538ee5d..42ff23f5ffc 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -42,7 +42,7 @@ public function testTheSitemapFeature()
 
         $this->assertFileExists('_site/sitemap.xml');
 
-        $this->assertSame(
+        $this->assertSameXml(
             '<?xml version="1.0" encoding="UTF-8"?>'."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n",
             file_get_contents('_site/sitemap.xml')
         );
@@ -144,4 +144,9 @@ protected function stripFormatting(string $xml): string
     {
         return implode('', array_map('trim', explode("\n", $xml)));
     }
+
+    protected function assertSameXml(string $expected, string $actual): void
+    {
+        $this->assertSame($expected, $actual);
+    }
 }

From 91dcfea8bdcd67b55dfafa646f597dba92c39195 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:00:40 +0200
Subject: [PATCH 2165/2811] Expand the XML to make it easier to read in the
 test output

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 42ff23f5ffc..54da7f4c1af 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -145,8 +145,14 @@ protected function stripFormatting(string $xml): string
         return implode('', array_map('trim', explode("\n", $xml)));
     }
 
+    protected function expandLines(string $xml): string
+    {
+        // Expand the XML to make it easier to read in the test output.
+        return str_replace('><', ">\n<", $xml);
+    }
+
     protected function assertSameXml(string $expected, string $actual): void
     {
-        $this->assertSame($expected, $actual);
+        $this->assertSame($this->expandLines($expected), $this->expandLines($actual));
     }
 }

From 48cef462816c97aa41a1e89b48efa3cd1f8230a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:01:20 +0200
Subject: [PATCH 2166/2811] Create dynamic change frequencies

---
 .../Features/XmlGenerators/SitemapGenerator.php    | 14 +++++++++++++-
 .../framework/tests/Feature/SitemapFeatureTest.php | 14 +++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 96fe5545e87..2c779c71bc8 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -95,7 +95,19 @@ protected function getPriority(string $pageClass, string $identifier): string
 
     protected function getChangeFrequency(string $pageClass, string $identifier): string
     {
-        return 'daily';
+        if ($identifier === '404') {
+            return 'monthly';
+        }
+
+        if (in_array($pageClass, [BladePage::class, MarkdownPage::class, DocumentationPage::class])) {
+            return 'daily';
+        }
+
+        if (in_array($pageClass, [MarkdownPost::class, InMemoryPage::class, HtmlPage::class])) {
+            return 'weekly';
+        }
+
+        return 'weekly';
     }
 
     protected function resolveRouteLink(Route $route): string
diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 54da7f4c1af..938b654266a 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -67,13 +67,13 @@ protected function expected(string $version): string
             <url>
                 <loc>https://example.com/contact.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>weekly</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/404.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>monthly</changefreq>
                 <priority>0.25</priority>
             </url>
             <url>
@@ -91,19 +91,19 @@ protected function expected(string $version): string
             <url>
                 <loc>https://example.com/posts/hello-world.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>weekly</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/posts/second-post.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>weekly</changefreq>
                 <priority>0.75</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/404.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>monthly</changefreq>
                 <priority>0.25</priority>
             </url>
             <url>
@@ -127,13 +127,13 @@ protected function expected(string $version): string
             <url>
                 <loc>https://example.com/docs/search.json</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>weekly</changefreq>
                 <priority>0.5</priority>
             </url>
             <url>
                 <loc>https://example.com/docs/search.html</loc>
                 <lastmod>2024-01-01T12:00:00+00:00</lastmod>
-                <changefreq>daily</changefreq>
+                <changefreq>weekly</changefreq>
                 <priority>0.5</priority>
             </url>
         </urlset>

From eb1baabb160cbb79e2293a2821bea92ae22e3d7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:02:25 +0200
Subject: [PATCH 2167/2811] Collapse 'if' statement with common parts

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 2c779c71bc8..67fb1edc77c 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -103,10 +103,6 @@ protected function getChangeFrequency(string $pageClass, string $identifier): st
             return 'daily';
         }
 
-        if (in_array($pageClass, [MarkdownPost::class, InMemoryPage::class, HtmlPage::class])) {
-            return 'weekly';
-        }
-
         return 'weekly';
     }
 

From c265521c1f39593f849280b396bae4a1c9729547 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:03:46 +0200
Subject: [PATCH 2168/2811] Clean up and refactor method

---
 .../Features/XmlGenerators/SitemapGenerator.php     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 67fb1edc77c..311c7e1b3ef 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -93,17 +93,20 @@ protected function getPriority(string $pageClass, string $identifier): string
         return (string) $priority;
     }
 
+    /** Intelligently find a good change frequency for the given page based on assumptions about the site structure. */
     protected function getChangeFrequency(string $pageClass, string $identifier): string
     {
-        if ($identifier === '404') {
-            return 'monthly';
-        }
+        $frequency = 'weekly';
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class, DocumentationPage::class])) {
-            return 'daily';
+            $frequency = 'daily';
+        }
+
+        if ($identifier === '404') {
+            $frequency = 'monthly';
         }
 
-        return 'weekly';
+        return $frequency;
     }
 
     protected function resolveRouteLink(Route $route): string

From 6c619285c53a0fdf9b7488ae8d87b5931cac7186 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:05:44 +0200
Subject: [PATCH 2169/2811] Remove undocumented `sitemap.dynamic_priority`
 config option

Either we add something like this for the changefreq logic, or we remove it, and I think it can be removed since it's not documented, and it's such an uncommon use case. And if one is unhappy with the generation, a better way is to customize the class to add custom logic.
---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 311c7e1b3ef..4e7279e75f9 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -8,7 +8,6 @@
 
 use Hyde\Hyde;
 use SimpleXMLElement;
-use Hyde\Facades\Config;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
@@ -50,12 +49,7 @@ protected function addRoute(Route $route): void
         $this->addChild($urlItem, 'loc', $this->resolveRouteLink($route));
         $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
         $this->addChild($urlItem, 'changefreq', $this->getChangeFrequency($route->getPageClass(), $route->getPage()->getIdentifier()));
-
-        if (Config::getBool('hyde.sitemap.dynamic_priority', true)) {
-            $this->addChild($urlItem, 'priority', $this->getPriority(
-                $route->getPageClass(), $route->getPage()->getIdentifier()
-            ));
-        }
+        $this->addChild($urlItem, 'priority', $this->getPriority($route->getPageClass(), $route->getPage()->getIdentifier()));
     }
 
     protected function getLastModDate(string $file): string

From 8ff7247c20f9d3849fcf7ac052116760573f3195 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:07:21 +0200
Subject: [PATCH 2170/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0d98f09ad6c..3ce93987389 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -28,6 +28,7 @@ This serves two purposes:
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
+- Improved sitemap generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Improved the sitemap data generation to be even smarter in https://github.com/hydephp/develop/pull/1744
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.

From 502d7efd038425770ee1598b34f46c1b30ccd122 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:07:43 +0200
Subject: [PATCH 2171/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3ce93987389..c152c7a480a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -28,8 +28,7 @@ This serves two purposes:
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
-- Improved sitemap generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
-- Improved the sitemap data generation to be even smarter in https://github.com/hydephp/develop/pull/1744
+- Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.

From 92d1296bacde6649d4c7f28ab0a6713c7dba6e6e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:08:16 +0200
Subject: [PATCH 2172/2811] Clean up test code

---
 packages/framework/tests/Feature/SitemapFeatureTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php
index 938b654266a..e0825f18013 100644
--- a/packages/framework/tests/Feature/SitemapFeatureTest.php
+++ b/packages/framework/tests/Feature/SitemapFeatureTest.php
@@ -147,7 +147,6 @@ protected function stripFormatting(string $xml): string
 
     protected function expandLines(string $xml): string
     {
-        // Expand the XML to make it easier to read in the test output.
         return str_replace('><', ">\n<", $xml);
     }
 

From a82680fa3d204fe5dc5df400c47d6dfa64a8e9e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:09:26 +0200
Subject: [PATCH 2173/2811] Clarify helper method names

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 4e7279e75f9..259cef6cdc5 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -48,8 +48,8 @@ protected function addRoute(Route $route): void
 
         $this->addChild($urlItem, 'loc', $this->resolveRouteLink($route));
         $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
-        $this->addChild($urlItem, 'changefreq', $this->getChangeFrequency($route->getPageClass(), $route->getPage()->getIdentifier()));
-        $this->addChild($urlItem, 'priority', $this->getPriority($route->getPageClass(), $route->getPage()->getIdentifier()));
+        $this->addChild($urlItem, 'changefreq', $this->generateChangeFrequency($route->getPageClass(), $route->getPage()->getIdentifier()));
+        $this->addChild($urlItem, 'priority', $this->generatePriority($route->getPageClass(), $route->getPage()->getIdentifier()));
     }
 
     protected function getLastModDate(string $file): string
@@ -58,7 +58,7 @@ protected function getLastModDate(string $file): string
     }
 
     /** Intelligently find a good priority for the given page based on assumptions about the site structure. */
-    protected function getPriority(string $pageClass, string $identifier): string
+    protected function generatePriority(string $pageClass, string $identifier): string
     {
         // The default priority, unless we find a better match.
         $priority = 0.5;
@@ -88,7 +88,7 @@ protected function getPriority(string $pageClass, string $identifier): string
     }
 
     /** Intelligently find a good change frequency for the given page based on assumptions about the site structure. */
-    protected function getChangeFrequency(string $pageClass, string $identifier): string
+    protected function generateChangeFrequency(string $pageClass, string $identifier): string
     {
         $frequency = 'weekly';
 

From c294778a5d43d0687e8f475fe5e7077c57a7fceb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:09:56 +0200
Subject: [PATCH 2174/2811] Revert "Document the priority algorithm intentions"

This reverts commit 8ae31f9abe3b18165d67e9a792a9cf34450497d2.
---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 259cef6cdc5..e3b464313bf 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -57,37 +57,29 @@ protected function getLastModDate(string $file): string
         return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
     }
 
-    /** Intelligently find a good priority for the given page based on assumptions about the site structure. */
     protected function generatePriority(string $pageClass, string $identifier): string
     {
-        // The default priority, unless we find a better match.
         $priority = 0.5;
 
         if (in_array($pageClass, [BladePage::class, MarkdownPage::class, DocumentationPage::class])) {
-            // These pages are usually high up in the site hierarchy, so they get a higher priority.
             $priority = 0.9;
 
             if ($identifier === 'index') {
-                // The homepage is the most important page, so it gets the highest priority.
                 $priority = 1;
             }
         }
 
         if (in_array($pageClass, [MarkdownPost::class, InMemoryPage::class, HtmlPage::class])) {
-            // Posts are usually less important than normal pages as there may be many of them.
-            // We group in InMemoryPages and HtmlPages here since we don't have much context for them.
             $priority = 0.75;
         }
 
         if ($identifier === '404') {
-            // 404 pages are rarely important to index, so they get a lower priority.
             $priority = 0.25;
         }
 
         return (string) $priority;
     }
 
-    /** Intelligently find a good change frequency for the given page based on assumptions about the site structure. */
     protected function generateChangeFrequency(string $pageClass, string $identifier): string
     {
         $frequency = 'weekly';

From 203c9d60e6640ac2197afa34acbe13e20bb3959e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:11:57 +0200
Subject: [PATCH 2175/2811] Extract helper method for repeated code

---
 .../Features/XmlGenerators/SitemapGenerator.php          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index e3b464313bf..b404195afb3 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -48,8 +48,8 @@ protected function addRoute(Route $route): void
 
         $this->addChild($urlItem, 'loc', $this->resolveRouteLink($route));
         $this->addChild($urlItem, 'lastmod', $this->getLastModDate($route->getSourcePath()));
-        $this->addChild($urlItem, 'changefreq', $this->generateChangeFrequency($route->getPageClass(), $route->getPage()->getIdentifier()));
-        $this->addChild($urlItem, 'priority', $this->generatePriority($route->getPageClass(), $route->getPage()->getIdentifier()));
+        $this->addChild($urlItem, 'changefreq', $this->generateChangeFrequency(...$this->getRouteInformation($route)));
+        $this->addChild($urlItem, 'priority', $this->generatePriority(...$this->getRouteInformation($route)));
     }
 
     protected function getLastModDate(string $file): string
@@ -99,4 +99,9 @@ protected function resolveRouteLink(Route $route): string
     {
         return Hyde::url($route->getOutputPath());
     }
+
+    protected function getRouteInformation(Route $route): array
+    {
+        return [$route->getPageClass(), $route->getPage()->getIdentifier()];
+    }
 }

From 8b45cd9eca03c6bd291aa06d73f5b1789fae7268 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:13:24 +0200
Subject: [PATCH 2176/2811] Add generic type annotations

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index b404195afb3..0145c515f54 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -57,6 +57,7 @@ protected function getLastModDate(string $file): string
         return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
     }
 
+    /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
     protected function generatePriority(string $pageClass, string $identifier): string
     {
         $priority = 0.5;
@@ -80,6 +81,7 @@ protected function generatePriority(string $pageClass, string $identifier): stri
         return (string) $priority;
     }
 
+    /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
     protected function generateChangeFrequency(string $pageClass, string $identifier): string
     {
         $frequency = 'weekly';
@@ -100,6 +102,7 @@ protected function resolveRouteLink(Route $route): string
         return Hyde::url($route->getOutputPath());
     }
 
+    /** @return array{class-string<\Hyde\Pages\Concerns\HydePage>, string} */
     protected function getRouteInformation(Route $route): array
     {
         return [$route->getPageClass(), $route->getPage()->getIdentifier()];

From 04aebd18398f44942772f12441a93f5248bce3de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:14:09 +0200
Subject: [PATCH 2177/2811] Move up helper method declaration to match call
 order

---
 .../Features/XmlGenerators/SitemapGenerator.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 0145c515f54..43b83ff0a06 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -52,6 +52,11 @@ protected function addRoute(Route $route): void
         $this->addChild($urlItem, 'priority', $this->generatePriority(...$this->getRouteInformation($route)));
     }
 
+    protected function resolveRouteLink(Route $route): string
+    {
+        return Hyde::url($route->getOutputPath());
+    }
+
     protected function getLastModDate(string $file): string
     {
         return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
@@ -97,11 +102,6 @@ protected function generateChangeFrequency(string $pageClass, string $identifier
         return $frequency;
     }
 
-    protected function resolveRouteLink(Route $route): string
-    {
-        return Hyde::url($route->getOutputPath());
-    }
-
     /** @return array{class-string<\Hyde\Pages\Concerns\HydePage>, string} */
     protected function getRouteInformation(Route $route): array
     {

From 29661ffdf4fd8826b6eab7c4b469425f08e64d6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:15:12 +0200
Subject: [PATCH 2178/2811] Expand PHPDoc comments

---
 .../Framework/Features/XmlGenerators/SitemapGenerator.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 43b83ff0a06..999dd90b9aa 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -62,7 +62,9 @@ protected function getLastModDate(string $file): string
         return date('c', @Filesystem::lastModified($file) ?: Carbon::now()->timestamp);
     }
 
-    /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $pageClass
+     */
     protected function generatePriority(string $pageClass, string $identifier): string
     {
         $priority = 0.5;
@@ -86,7 +88,9 @@ protected function generatePriority(string $pageClass, string $identifier): stri
         return (string) $priority;
     }
 
-    /** @param class-string<\Hyde\Pages\Concerns\HydePage> $pageClass */
+    /**
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $pageClass
+     */
     protected function generateChangeFrequency(string $pageClass, string $identifier): string
     {
         $frequency = 'weekly';

From 7538520288f754310361459bce6f82a0de870920 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:18:04 +0200
Subject: [PATCH 2179/2811] Annotate numeric string return

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index 999dd90b9aa..be81abeecaf 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -64,6 +64,7 @@ protected function getLastModDate(string $file): string
 
     /**
      * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $pageClass
+     * @return numeric-string
      */
     protected function generatePriority(string $pageClass, string $identifier): string
     {

From b8d30ba947b581744b39b0f8126e92c51c215e71 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 14:18:58 +0200
Subject: [PATCH 2180/2811] Annotate enumerated string returns based on sitemap
 spec

---
 .../src/Framework/Features/XmlGenerators/SitemapGenerator.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
index be81abeecaf..01b3f2f10a8 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php
@@ -91,6 +91,7 @@ protected function generatePriority(string $pageClass, string $identifier): stri
 
     /**
      * @param  class-string<\Hyde\Pages\Concerns\HydePage>  $pageClass
+     * @return 'always'|'hourly'|'daily '|'weekly'|'monthly'|'yearly'|'never'
      */
     protected function generateChangeFrequency(string $pageClass, string $identifier): string
     {

From 334a83ab51ec5fc2f5a164d695ef6bd84602883c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 15:42:26 +0200
Subject: [PATCH 2181/2811] Set the `BuildTaskSkippedException` code to 2

Fixes https://github.com/hydephp/develop/issues/1745
---
 .../Framework/Features/BuildTasks/BuildTaskSkippedException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php b/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
index cc4cff9b406..55443d7c83a 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
@@ -8,7 +8,7 @@
 
 class BuildTaskSkippedException extends RuntimeException
 {
-    public function __construct(string $message = 'Task was skipped', int $code = 0)
+    public function __construct(string $message = 'Task was skipped', int $code = 2)
     {
         parent::__construct($message, $code);
     }

From 70291fbc822d5ff00415567dd53dc896e1356e5e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 15:42:59 +0200
Subject: [PATCH 2182/2811] Set the `BuildTaskSkippedException` code to 3

See https://github.com/hydephp/develop/issues/1745#issuecomment-2196424475
---
 .../Framework/Features/BuildTasks/BuildTaskSkippedException.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php b/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
index 55443d7c83a..e10e8d60f31 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/BuildTaskSkippedException.php
@@ -8,7 +8,7 @@
 
 class BuildTaskSkippedException extends RuntimeException
 {
-    public function __construct(string $message = 'Task was skipped', int $code = 2)
+    public function __construct(string $message = 'Task was skipped', int $code = 3)
     {
         parent::__construct($message, $code);
     }

From d90dcc7723ea81e5545f573fc2a8108ebae81f78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 15:45:01 +0200
Subject: [PATCH 2183/2811] Test skipped tasks have exit code 3

---
 .../tests/Feature/Commands/BuildSitemapCommandTest.php        | 2 +-
 .../framework/tests/Unit/BuildTaskSkippedExceptionTest.php    | 2 +-
 packages/framework/tests/Unit/BuildTaskUnitTest.php           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index ee13bc9bf03..ab66436b8a4 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -40,7 +40,7 @@ public function testSitemapIsNotGeneratedWhenConditionsAreNotMet()
             ->expectsOutputToContain('Generating sitemap...')
             ->expectsOutputToContain('Skipped')
             ->expectsOutput(' > Cannot generate sitemap without a valid base URL')
-            ->assertExitCode(0);
+            ->assertExitCode(3);
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
     }
diff --git a/packages/framework/tests/Unit/BuildTaskSkippedExceptionTest.php b/packages/framework/tests/Unit/BuildTaskSkippedExceptionTest.php
index 3d3e91aa581..8d48ab00f16 100644
--- a/packages/framework/tests/Unit/BuildTaskSkippedExceptionTest.php
+++ b/packages/framework/tests/Unit/BuildTaskSkippedExceptionTest.php
@@ -39,7 +39,7 @@ public function testDefaultExceptionCode()
     {
         $exception = new BuildTaskSkippedException();
 
-        $this->assertSame(0, $exception->getCode());
+        $this->assertSame(3, $exception->getCode());
     }
 
     public function testCustomExceptionCode()
diff --git a/packages/framework/tests/Unit/BuildTaskUnitTest.php b/packages/framework/tests/Unit/BuildTaskUnitTest.php
index fa5494f7407..48c49b8bbda 100644
--- a/packages/framework/tests/Unit/BuildTaskUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskUnitTest.php
@@ -192,7 +192,7 @@ public function testTaskSkipping()
             })->run();
         });
 
-        $this->assertSame(0, $task->property('exitCode'));
+        $this->assertSame(3, $task->property('exitCode'));
         $this->assertSame('<bg=yellow>Skipped</>', trim($task->buffer[1]));
         $this->assertSame('<fg=gray> > Task was skipped</>', $task->buffer[2]);
     }
@@ -205,7 +205,7 @@ public function testTaskSkippingWithCustomMessage()
             })->run();
         });
 
-        $this->assertSame(0, $task->property('exitCode'));
+        $this->assertSame(3, $task->property('exitCode'));
         $this->assertSame('<bg=yellow>Skipped</>', trim($task->buffer[1]));
         $this->assertSame('<fg=gray> > Custom reason</>', $task->buffer[2]);
     }

From 7a3ad7fffeaac0caa3b72a738de9e2722b2ab9fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 15:56:14 +0200
Subject: [PATCH 2184/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c152c7a480a..0b412158291 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -29,6 +29,7 @@ This serves two purposes:
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
+- Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
 - Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 - Media asset files are now copied using the new build task instead of the deprecated `BuildService::transferMediaAssets()` method.

From ce34eecb6dfe2c72412c4b5cb9857cf165f2e262 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 16:54:27 +0200
Subject: [PATCH 2185/2811] Remove the deprecated global `unslash` function

---
 packages/framework/src/helpers.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 73be251439e..34e8f9da12b 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -4,7 +4,6 @@
 
 namespace {
     use Hyde\Foundation\HydeKernel;
-    use JetBrains\PhpStorm\Deprecated;
 
     if (! function_exists('hyde')) {
         /**
@@ -16,21 +15,6 @@ function hyde(): HydeKernel
         }
     }
 
-    if (! function_exists('unslash')) {
-        /**
-         * Remove trailing slashes from the start and end of a string.
-         *
-         * @deprecated This function will be replaced by {@see \Hyde\unslash()} in v2.0
-         *
-         * @codeCoverageIgnore This function is deprecated and will be removed in a future release.
-         */
-        #[Deprecated(reason: 'Replaced by the \Hyde\unslash() function', replacement: '\Hyde\unslash(%parametersList%)', since: '1.7.0')]
-        function unslash(string $string): string
-        {
-            return \Hyde\unslash($string);
-        }
-    }
-
     if (defined('HYDE_COMPATIBILITY_MODE') && HYDE_COMPATIBILITY_MODE === true) {
         // Don't declare these functions when running in compatibility mode.
     } else {

From 8a1e57f7be88e2461361d58be3b4cd0afab2c719 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Jun 2024 16:55:46 +0200
Subject: [PATCH 2186/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0b412158291..48d8030036e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -44,6 +44,7 @@ This serves two purposes:
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
+- Internal: Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed

From ecbf74928f8714eec55cd9730f9a293629edb7aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Jun 2024 09:41:00 +0200
Subject: [PATCH 2187/2811] Remove unintended internal marker from release
 notes

Fixes an issue from https://github.com/hydephp/develop/pull/1754/commits/8a1e57f7be88e2461361d58be3b4cd0afab2c719
---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 48d8030036e..99255b09e89 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -44,7 +44,7 @@ This serves two purposes:
 ### Removed
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
-- Internal: Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
+- Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed

From e45185af6caa6c2b627f16fc2ae560ea7b00fcbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Jun 2024 10:49:30 +0200
Subject: [PATCH 2188/2811] Update URL helper to return null instead of
 throwing an exception

Updates the `Hyde::url()` helper to return null instead of throwing when no site URL is set
---
 RELEASE_NOTES.md                                         | 1 +
 .../src/Foundation/Concerns/ForwardsHyperlinks.php       | 2 +-
 packages/framework/src/Foundation/Kernel/Hyperlinks.php  | 9 +++------
 packages/framework/src/Hyde.php                          | 2 +-
 packages/framework/src/helpers.php                       | 2 +-
 packages/framework/tests/Feature/HelpersTest.php         | 2 --
 .../Unit/Foundation/HyperlinksUrlPathHelpersTest.php     | 8 ++------
 7 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 99255b09e89..476497696ce 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -28,6 +28,7 @@ This serves two purposes:
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
+- Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 9d194fd5f42..d5b87105f0e 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -33,7 +33,7 @@ public function asset(string $name, bool $preferQualifiedUrl = false): string
         return $this->hyperlinks->asset($name, $preferQualifiedUrl);
     }
 
-    public function url(string $path = ''): string
+    public function url(string $path = ''): ?string
     {
         return $this->hyperlinks->url($path);
     }
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 2a4a9aa9573..f94f79d3a24 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -7,7 +7,6 @@
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
-use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Illuminate\Support\Str;
 
@@ -140,10 +139,9 @@ public function hasSiteUrl(): bool
      * Return a qualified URL to the supplied path if a base URL is set.
      *
      * @param  string  $path  An optional relative path suffix. Omit to return the base URL.
-     *
-     * @throws BaseUrlNotSetException If no site URL is set and no path is provided.
+     * @return string|null The qualified URL, or null if the base URL is not set and no path is provided.
      */
-    public function url(string $path = ''): string
+    public function url(string $path = ''): ?string
     {
         $path = $this->formatLink(trim($path, '/'));
 
@@ -162,8 +160,7 @@ public function url(string $path = ''): string
         }
 
         // User is trying to get the base URL, but it's not set
-        // This exception is deprecated and will be removed in v2.0.0, and we will return null instead.
-        throw new BaseUrlNotSetException();
+        return null;
     }
 
     /**
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 07d82d968fd..20b8313e897 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -38,7 +38,7 @@
  * @method static string relativeLink(string $destination)
  * @method static string mediaLink(string $destination, bool $validate = false)
  * @method static string asset(string $name, bool $preferQualifiedUrl = false)
- * @method static string url(string $path = '')
+ * @method static string|null url(string $path = '')
  * @method static Route|null route(string $key)
  * @method static string makeTitle(string $value)
  * @method static string normalizeNewlines(string $string)
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 34e8f9da12b..4f47188b222 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -42,7 +42,7 @@ function route(string $key): ?Hyde\Support\Models\Route
             /**
              * Get a qualified URL to the supplied path if a base URL is set.
              */
-            function url(string $path = ''): string
+            function url(string $path = ''): ?string
             {
                 return hyde()->url($path);
             }
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 61e4b31e645..4ea9d3a0c29 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -178,7 +178,6 @@ public function testUrlFunctionWithoutBaseUrl()
     public function testUrlFunctionWithoutBaseUrlOrPath()
     {
         $this->app['config']->set(['hyde.url' => null]);
-        $this->expectException(\Hyde\Framework\Exceptions\BaseUrlNotSetException::class);
         $this->assertNull(url());
     }
 
@@ -186,7 +185,6 @@ public function testUrlFunctionWithoutBaseUrlOrPath()
     public function testUrlFunctionWithLocalhostBaseUrlButNoPath()
     {
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
-        $this->expectException(\Hyde\Framework\Exceptions\BaseUrlNotSetException::class);
         $this->assertNull(url());
     }
 
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index d228f3aee3d..cb541abb725 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -6,7 +6,6 @@
 
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Kernel\Hyperlinks;
-use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Testing\TestCase;
 
 /**
@@ -155,14 +154,11 @@ public function testQualifiedUrlHelperWithAlreadyQualifiedUrlStillFormatsPathWit
         $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar/'));
     }
 
-    public function testQualifiedUrlThrowsExceptionWhenNoSiteUrlIsSet()
+    public function testQualifiedUrlReturnsNullWhenNoSiteUrlIsSet()
     {
         $this->withSiteUrl(null);
 
-        $this->expectException(BaseUrlNotSetException::class);
-        $this->expectExceptionMessage('No site URL has been set in config (or .env).');
-
-        $this->class->url();
+        $this->assertNull($this->class->url());
     }
 
     public function testHelperFallsBackToRelativeLinksWhenNoSiteUrlIsSet()

From 5ad8bdfb1cd2c2df6cc38368c694972e438ef04b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Jun 2024 10:59:01 +0200
Subject: [PATCH 2189/2811] Remove the deprecated `BaseUrlNotSetException`
 class

---
 RELEASE_NOTES.md                              |  1 +
 .../Exceptions/BaseUrlNotSetException.php     | 19 -------------------
 .../tests/Unit/CustomExceptionsTest.php       | 12 ------------
 .../HyperlinksUrlPathHelpersTest.php          |  1 -
 4 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 476497696ce..1394f0ca38f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -46,6 +46,7 @@ This serves two purposes:
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
 - Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
+- Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now returning `null` if no base URL is set in https://github.com/hydephp/develop/pull/1760
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed
diff --git a/packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php b/packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php
deleted file mode 100644
index 41a5482e1bc..00000000000
--- a/packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Exceptions;
-
-use Exception;
-
-/**
- * @deprecated This exception will be removed in v2.0.0.
- */
-class BaseUrlNotSetException extends Exception
-{
-    /** @var string */
-    protected $message = 'No site URL has been set in config (or .env).';
-
-    /** @var int */
-    protected $code = 500;
-}
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index e3894eec0a0..38be357f085 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -9,7 +9,6 @@
 use Hyde\Framework\Exceptions\FileConflictException;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
 use Hyde\Framework\Exceptions\ParseException;
 use RuntimeException;
@@ -19,7 +18,6 @@
  * @covers \Hyde\Framework\Exceptions\FileConflictException
  * @covers \Hyde\Framework\Exceptions\FileNotFoundException
  * @covers \Hyde\Framework\Exceptions\RouteNotFoundException
- * @covers \Hyde\Framework\Exceptions\BaseUrlNotSetException
  * @covers \Hyde\Framework\Exceptions\UnsupportedPageTypeException
  * @covers \Hyde\Framework\Exceptions\ParseException
  */
@@ -82,11 +80,6 @@ public function testUnsupportedPageTypeExceptionWithPage()
         $this->assertSame('The page type [foo] is not supported.', (new UnsupportedPageTypeException('foo'))->getMessage());
     }
 
-    public function testBaseUrlNotSetException()
-    {
-        $this->assertSame('No site URL has been set in config (or .env).', (new BaseUrlNotSetException())->getMessage());
-    }
-
     public function testFileConflictExceptionCode()
     {
         $this->assertSame(409, (new FileConflictException())->getCode());
@@ -107,11 +100,6 @@ public function testUnsupportedPageTypeExceptionCode()
         $this->assertSame(400, (new UnsupportedPageTypeException())->getCode());
     }
 
-    public function testBaseUrlNotSetExceptionCode()
-    {
-        $this->assertSame(500, (new BaseUrlNotSetException())->getCode());
-    }
-
     public function testParseExceptionCode()
     {
         $this->assertSame(422, (new ParseException())->getCode());
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index cb541abb725..14b18821ce3 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -10,7 +10,6 @@
 
 /**
  * @covers \Hyde\Foundation\Kernel\Hyperlinks
- * @covers \Hyde\Framework\Exceptions\BaseUrlNotSetException
  */
 class HyperlinksUrlPathHelpersTest extends TestCase
 {

From 517015a06b8c874503c8e1f2c136dd0f6bc43842 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Jun 2024 22:13:57 +0200
Subject: [PATCH 2190/2811] Sync configuration files

Commit https://github.com/hydephp/develop/commit/b9f8e3dca0ce71e46394d8f8cb1b110a1527a889 missed to do this
---
 packages/framework/config/docs.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index 93bbc751dc2..4ac1dd70706 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -30,9 +30,8 @@
         // When using a grouped sidebar, should the groups be collapsible?
         'collapsible' => true,
 
-        // Should the sidebar footer be shown? You can also set this to a string
-        // of Markdown to show in the footer. Set to `false` to disable.
-        'footer' => true,
+        // A string of Markdown to show in the footer. Set to `false` to disable.
+        'footer' => '[Back to home page](../)',
 
         /*
         |--------------------------------------------------------------------------

From f369a3a85f1c4916b3b6ae160e0f7e40a2cc5c74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:34:17 +0200
Subject: [PATCH 2191/2811] Update class documentation

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index ac6b850bf94..37baa790fb9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -13,7 +13,7 @@
 use function is_string;
 
 /**
- * Object representation of a post author for the site.
+ * Object representation of a blog post author for the site.
  */
 class PostAuthor implements Stringable
 {

From 576f94f11f5f59362b76182f888fae64cb4ecb9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:38:33 +0200
Subject: [PATCH 2192/2811] Create HasKernelData.php

---
 .../src/Foundation/Concerns/HasKernelData.php     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/src/Foundation/Concerns/HasKernelData.php

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
new file mode 100644
index 00000000000..b5fb4572249
--- /dev/null
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Foundation\Concerns;
+
+/**
+ * @internal Single-use trait for the HydeKernel class.
+ *
+ * @see \Hyde\Foundation\HydeKernel
+ */
+trait HasKernelData
+{
+    //
+}

From eba7450288660ecb45955e290912ecca86e54e7e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:38:43 +0200
Subject: [PATCH 2193/2811] Use HasKernelData trait

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index d52af53fda1..a41dd3371df 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -45,6 +45,7 @@ class HydeKernel implements SerializableContract
     use Concerns\ManagesExtensions;
     use Concerns\ManagesViewData;
     use Concerns\BootsHydeKernel;
+    use Concerns\HasKernelData;
 
     use Serializable;
     use Macroable;

From 863ce8a28af2ba04197740602b4a9d8faac2c7c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:39:11 +0200
Subject: [PATCH 2194/2811] Update class description

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index b5fb4572249..0fcb0ca828d 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -5,6 +5,8 @@
 namespace Hyde\Foundation\Concerns;
 
 /**
+ * Contains accessors and containers for data stored in the kernel.
+ *
  * @internal Single-use trait for the HydeKernel class.
  *
  * @see \Hyde\Foundation\HydeKernel

From 90027fda406f5d7b317ce72857299ae6d9ffee2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:40:46 +0200
Subject: [PATCH 2195/2811] Add authors array to the kernel

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 0fcb0ca828d..032a39984cd 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -13,5 +13,5 @@
  */
 trait HasKernelData
 {
-    //
+    protected array $authors = [];
 }

From 88ef93006b46a9b630ced4feff138487966b2375 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:41:06 +0200
Subject: [PATCH 2196/2811] Change array to Collection

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 032a39984cd..00ebfdbb04a 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Illuminate\Support\Collection;
+
 /**
  * Contains accessors and containers for data stored in the kernel.
  *
@@ -13,5 +15,5 @@
  */
 trait HasKernelData
 {
-    protected array $authors = [];
+    protected Collection $authors = [];
 }

From 7de564011bc2d3e8b8135c75fa1a4da3044785d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:41:17 +0200
Subject: [PATCH 2197/2811] Remove disallowed initialiser

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 00ebfdbb04a..95c33ee5a1e 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -15,5 +15,5 @@
  */
 trait HasKernelData
 {
-    protected Collection $authors = [];
+    protected Collection $authors;
 }

From 25d03bd9f3c03d4542f61202507c7b9acdba6fa9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:41:40 +0200
Subject: [PATCH 2198/2811] Annotate the collection generics

---
 packages/framework/src/Foundation/Concerns/HasKernelData.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 95c33ee5a1e..b319459b75c 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -15,5 +15,8 @@
  */
 trait HasKernelData
 {
+    /**
+     * @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
+     */
     protected Collection $authors;
 }

From d40d8ed2207c4749bf922d92efa619032ddafd78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:41:47 +0200
Subject: [PATCH 2199/2811] Document the property

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index b319459b75c..59437fb2caa 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -16,6 +16,8 @@
 trait HasKernelData
 {
     /**
+     * The collection of authors defined in the config.
+     *
      * @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
      */
     protected Collection $authors;

From d23a697f83a5aede30665935fb373e0043946c11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:42:26 +0200
Subject: [PATCH 2200/2811] Add authors getter

---
 .../src/Foundation/Concerns/HasKernelData.php          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 59437fb2caa..ce989cefe79 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -21,4 +21,14 @@ trait HasKernelData
      * @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
      */
     protected Collection $authors;
+
+    /**
+     * Get the collection of authors defined in the config.
+     *
+     * @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
+     */
+    public function getAuthors(): Collection
+    {
+        return $this->authors;
+    }
 }

From 9a4524f302513ecdf1ca72745547f3b7073ffcdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:47:00 +0200
Subject: [PATCH 2201/2811] Class PostAuthor implements SerializableContract

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 37baa790fb9..e3a8eade213 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -8,6 +8,7 @@
 use Hyde\Facades\Author;
 use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
+use Hyde\Support\Contracts\SerializableContract;
 
 use function strtolower;
 use function is_string;
@@ -15,7 +16,7 @@
 /**
  * Object representation of a blog post author for the site.
  */
-class PostAuthor implements Stringable
+class PostAuthor implements Stringable, SerializableContract
 {
     /**
      * The username of the author.

From 3b5bf3a57094b1b8249ccb2ab1b9ed0954b6c36d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:47:39 +0200
Subject: [PATCH 2202/2811] Use the Serializable trait

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index e3a8eade213..56a3480937e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -8,6 +8,7 @@
 use Hyde\Facades\Author;
 use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
+use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 
 use function strtolower;
@@ -18,6 +19,8 @@
  */
 class PostAuthor implements Stringable, SerializableContract
 {
+    use Serializable;
+
     /**
      * The username of the author.
      * This is the key used to find authors in the config.

From 11a8f368d0a81a5a7acc887b4f7d0700bc2f7851 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:48:12 +0200
Subject: [PATCH 2203/2811] Implement the toArray method

---
 .../Framework/Features/Blogging/Models/PostAuthor.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 56a3480937e..fc22e534600 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -89,6 +89,15 @@ public function __toString(): string
         return $this->getName();
     }
 
+    public function toArray(): array
+    {
+        return [
+            'username' => $this->username,
+            'name' => $this->name,
+            'website' => $this->website,
+        ];
+    }
+
     public function getName(): string
     {
         return $this->name ?? $this->username;

From d21b4f3333285080ad3b20126fd047b96fcef0bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:49:52 +0200
Subject: [PATCH 2204/2811] Test author serialization

---
 .../framework/tests/Unit/PostAuthorTest.php   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index c6c98a9c5aa..9b3eeae5fba 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -140,4 +140,51 @@ public function testToStringHelperReturnsTheName()
 
         $this->assertEquals('John Doe', (string) $author);
     }
+
+    public function testToArrayMethodReturnsArrayRepresentationOfAuthor()
+    {
+        $author = new PostAuthor('username', 'John Doe', 'https://example.com');
+
+        $this->assertEquals([
+            'username' => 'username',
+            'name' => 'John Doe',
+            'website' => 'https://example.com',
+        ], $author->toArray());
+    }
+
+    public function testJsonSerializeMethodReturnsArrayRepresentationOfAuthor()
+    {
+        $author = new PostAuthor('username', 'John Doe', 'https://example.com');
+
+        $this->assertEquals([
+            'username' => 'username',
+            'name' => 'John Doe',
+            'website' => 'https://example.com',
+        ], $author->jsonSerialize());
+    }
+
+    public function testArraySerializeMethodReturnsArrayRepresentationOfAuthor()
+    {
+        $author = new PostAuthor('username', 'John Doe', 'https://example.com');
+
+        $this->assertEquals([
+            'username' => 'username',
+            'name' => 'John Doe',
+            'website' => 'https://example.com',
+        ], $author->arraySerialize());
+    }
+
+    public function testToJsonMethodReturnsJsonRepresentationOfAuthor()
+    {
+        $author = new PostAuthor('username', 'John Doe', 'https://example.com');
+
+        $this->assertEquals('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', $author->toJson());
+    }
+
+    public function testCanJsonEncodeAuthor()
+    {
+        $author = new PostAuthor('username', 'John Doe', 'https://example.com');
+
+        $this->assertEquals('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', json_encode($author));
+    }
 }

From 0b2b1e763feaee45b7f53b8fbb5d33a035f279f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:50:02 +0200
Subject: [PATCH 2205/2811] Normalize formatting

---
 packages/framework/tests/Unit/PostAuthorTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 9b3eeae5fba..0e7469342d1 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -56,6 +56,7 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
             'name' => 'bar',
             'website' => 'https://example.com',
         ]);
+
         $this->assertEquals($author, Author::create('foo', 'bar', 'https://example.com'));
     }
 

From 142bdb563b5d92ad69af9b401b4c2765fe95a0de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:59:42 +0200
Subject: [PATCH 2206/2811] Update kernel test to test the author access

---
 .../framework/tests/Feature/HydeKernelTest.php  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index a5ea908354c..e6de52158a8 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -23,6 +23,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\HtmlString;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 /**
  * This test class runs high-level tests on the HydeKernel class,
@@ -528,6 +529,22 @@ public function testFeaturesClassIsBoundAsSingleton()
 
         $this->assertSame($kernel->features(), $kernel->features());
     }
+
+    public function testGetAuthors()
+    {
+        $kernel = new HydeKernel();
+
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $kernel->getAuthors());
+        $this->assertContainsOnlyInstancesOf(PostAuthor::class, $kernel->getAuthors());
+
+        $this->assertSame([
+            'mr_hyde' => [
+                'username' => 'mr_hyde',
+                'name' => 'Mr. Hyde',
+                'website' => 'https://hydephp.com',
+            ],
+        ], $kernel->getAuthors()->toArray());
+    }
 }
 
 class CallableClass

From 6cd24fcb1ac74633f0a013d676c9d8b9c5eec5bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 18:59:57 +0200
Subject: [PATCH 2207/2811] Null coalesce assign the authors data

---
 packages/framework/src/Foundation/Concerns/HasKernelData.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index ce989cefe79..30d948feba1 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Illuminate\Support\Collection;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 /**
  * Contains accessors and containers for data stored in the kernel.
@@ -29,6 +30,6 @@ trait HasKernelData
      */
     public function getAuthors(): Collection
     {
-        return $this->authors;
+        return $this->authors ??= PostAuthor::all();
     }
 }

From 6c55b2d938cae0d5204174cd240f532a9c9defee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:00:50 +0200
Subject: [PATCH 2208/2811] Add additional kernel author tests

---
 .../framework/tests/Feature/HydeKernelTest.php  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index e6de52158a8..f7dd6223ef8 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -545,6 +545,23 @@ public function testGetAuthors()
             ],
         ], $kernel->getAuthors()->toArray());
     }
+
+    public function testGetAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
+    {
+        $kernel = new HydeKernel();
+
+        Config::set('hyde', []);
+
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $kernel->getAuthors());
+        $this->assertEmpty($kernel->getAuthors());
+    }
+
+    public function testGetAuthorsReturnsSingletonCollection()
+    {
+        $kernel = new HydeKernel();
+
+        $this->assertSame($kernel->getAuthors(), $kernel->getAuthors());
+    }
 }
 
 class CallableClass

From ad535d61b7b4962fadbc39b049bdfef7b5b32f85 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:01:13 +0200
Subject: [PATCH 2209/2811] Replace qualifiers with an import

---
 packages/framework/tests/Feature/HydeKernelTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index f7dd6223ef8..ded8ce2ae7f 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Features;
 use Hyde\Foundation\Facades\Pages;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Enums\Feature;
@@ -534,7 +535,7 @@ public function testGetAuthors()
     {
         $kernel = new HydeKernel();
 
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $kernel->getAuthors());
+        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
         $this->assertContainsOnlyInstancesOf(PostAuthor::class, $kernel->getAuthors());
 
         $this->assertSame([
@@ -552,7 +553,7 @@ public function testGetAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
 
         Config::set('hyde', []);
 
-        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $kernel->getAuthors());
+        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
         $this->assertEmpty($kernel->getAuthors());
     }
 

From 64f3e3617970cc706d96884dabbb0bfc9f42fdd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:01:49 +0200
Subject: [PATCH 2210/2811] Reorder tests

---
 .../framework/tests/Feature/HydeKernelTest.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index ded8ce2ae7f..2ac39e67970 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -547,21 +547,21 @@ public function testGetAuthors()
         ], $kernel->getAuthors()->toArray());
     }
 
-    public function testGetAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
+    public function testGetAuthorsReturnsSingletonCollection()
     {
         $kernel = new HydeKernel();
 
-        Config::set('hyde', []);
-
-        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
-        $this->assertEmpty($kernel->getAuthors());
+        $this->assertSame($kernel->getAuthors(), $kernel->getAuthors());
     }
 
-    public function testGetAuthorsReturnsSingletonCollection()
+    public function testGetAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
     {
         $kernel = new HydeKernel();
 
-        $this->assertSame($kernel->getAuthors(), $kernel->getAuthors());
+        Config::set('hyde', []);
+
+        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
+        $this->assertEmpty($kernel->getAuthors());
     }
 }
 

From c36bcaf5c26c6bfbd83cba87e68d6946cd394943 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:03:24 +0200
Subject: [PATCH 2211/2811] Assert same for scalar values

---
 .../framework/tests/Unit/PostAuthorTest.php   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 0e7469342d1..b12bba78e52 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -29,9 +29,9 @@ public function testCreateMethodAcceptsAllParameters()
     {
         $author = Author::create('foo', 'bar', 'https://example.com');
 
-        $this->assertEquals('foo', $author->username);
-        $this->assertEquals('bar', $author->name);
-        $this->assertEquals('https://example.com', $author->website);
+        $this->assertSame('foo', $author->username);
+        $this->assertSame('bar', $author->name);
+        $this->assertSame('https://example.com', $author->website);
     }
 
     public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
@@ -108,8 +108,8 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
         $author = PostAuthor::get('foo');
 
         $this->assertInstanceOf(PostAuthor::class, $author);
-        $this->assertEquals('foo', $author->username);
-        $this->assertEquals('bar', $author->name);
+        $this->assertSame('foo', $author->username);
+        $this->assertSame('bar', $author->name);
     }
 
     public function testGetMethodReturnsNewAuthorIfUsernameNotFoundInConfig()
@@ -118,28 +118,28 @@ public function testGetMethodReturnsNewAuthorIfUsernameNotFoundInConfig()
         $author = PostAuthor::get('foo');
 
         $this->assertInstanceOf(PostAuthor::class, $author);
-        $this->assertEquals('foo', $author->username);
+        $this->assertSame('foo', $author->username);
     }
 
     public function testGetNameHelperReturnsNameIfSet()
     {
         $author = new PostAuthor('username', 'John Doe');
 
-        $this->assertEquals('John Doe', $author->getName());
+        $this->assertSame('John Doe', $author->getName());
     }
 
     public function testGetNameHelperReturnsUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');
 
-        $this->assertEquals('username', $author->getName());
+        $this->assertSame('username', $author->getName());
     }
 
     public function testToStringHelperReturnsTheName()
     {
         $author = new PostAuthor('username', 'John Doe');
 
-        $this->assertEquals('John Doe', (string) $author);
+        $this->assertSame('John Doe', (string) $author);
     }
 
     public function testToArrayMethodReturnsArrayRepresentationOfAuthor()
@@ -179,13 +179,13 @@ public function testToJsonMethodReturnsJsonRepresentationOfAuthor()
     {
         $author = new PostAuthor('username', 'John Doe', 'https://example.com');
 
-        $this->assertEquals('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', $author->toJson());
+        $this->assertSame('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', $author->toJson());
     }
 
     public function testCanJsonEncodeAuthor()
     {
         $author = new PostAuthor('username', 'John Doe', 'https://example.com');
 
-        $this->assertEquals('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', json_encode($author));
+        $this->assertSame('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', json_encode($author));
     }
 }

From 7a90a2a9262d1a59533ff1645f33ac8d36768fea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:03:48 +0200
Subject: [PATCH 2212/2811] Filter empty fields from serialization

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php  | 5 +++--
 packages/framework/tests/Unit/PostAuthorTest.php           | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index fc22e534600..e0b4b22a3b7 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -13,6 +13,7 @@
 
 use function strtolower;
 use function is_string;
+use function array_filter;
 
 /**
  * Object representation of a blog post author for the site.
@@ -91,11 +92,11 @@ public function __toString(): string
 
     public function toArray(): array
     {
-        return [
+        return array_filter([
             'username' => $this->username,
             'name' => $this->name,
             'website' => $this->website,
-        ];
+        ]);
     }
 
     public function getName(): string
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index b12bba78e52..c48264f8c9d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -188,4 +188,11 @@ public function testCanJsonEncodeAuthor()
 
         $this->assertSame('{"username":"username","name":"John Doe","website":"https:\/\/example.com"}', json_encode($author));
     }
+
+    public function testEmptyFieldsAreRemovedFromSerializedModel()
+    {
+        $author = new PostAuthor('username', null, null);
+
+        $this->assertSame('{"username":"username"}', $author->toJson());
+    }
 }

From 0811dc92c7b6ea6198964778b24bb47b7b16538a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:09:22 +0200
Subject: [PATCH 2213/2811] Add semantic testing helper to reset the kernel

---
 packages/testing/src/UnitTestCase.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index cb0b4a48a43..23e6083a903 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -40,6 +40,11 @@ protected static function setupKernel(): void
         self::$hasSetUpKernel = true;
     }
 
+    protected static function resetKernel(): void
+    {
+        HydeKernel::setInstance(new HydeKernel());
+    }
+
     protected static function mockConfig(array $items = []): void
     {
         app()->bind('config', fn (): Repository => new Repository($items));

From 82ac9e38788a15e9e75fe1e798fef992f7d524f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:09:44 +0200
Subject: [PATCH 2214/2811] Move author discovery logic to kernel

---
 .../framework/src/Foundation/Concerns/HasKernelData.php    | 7 ++++++-
 .../src/Framework/Features/Blogging/Models/PostAuthor.php  | 6 ++----
 packages/framework/tests/Unit/PostAuthorTest.php           | 7 +++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 30d948feba1..b9c0ecb6983 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -4,9 +4,12 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
+use function strtolower;
+
 /**
  * Contains accessors and containers for data stored in the kernel.
  *
@@ -30,6 +33,8 @@ trait HasKernelData
      */
     public function getAuthors(): Collection
     {
-        return $this->authors ??= PostAuthor::all();
+        return $this->authors ??= (new Collection(Config::getArray('hyde.authors', [])))->mapWithKeys(function (PostAuthor $author): array {
+            return [strtolower($author->username) => $author];
+        });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index e0b4b22a3b7..5047f9ee5e0 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use Hyde\Hyde;
 use Stringable;
 use Hyde\Facades\Author;
-use Hyde\Facades\Config;
 use Illuminate\Support\Collection;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
@@ -80,9 +80,7 @@ public static function get(string $username): static
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
     public static function all(): Collection
     {
-        return (new Collection(Config::getArray('hyde.authors', [])))->mapWithKeys(function (self $author): array {
-            return [strtolower($author->username) => $author];
-        });
+        return Hyde::getAuthors();
     }
 
     public function __toString(): string
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index c48264f8c9d..f53c414013f 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -18,6 +18,13 @@ class PostAuthorTest extends UnitTestCase
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        self::resetKernel();
+    }
+
     public function testCreateMethodCreatesNewAuthorModel()
     {
         $author = Author::create('foo');

From 701fbbc4caee9e908d392f5dd42c5dc844c72842 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:15:12 +0200
Subject: [PATCH 2215/2811] Defer setting the authors property until the next
 try

---
 .../src/Foundation/Concerns/HasKernelData.php       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index b9c0ecb6983..0c8ca7481f4 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -33,7 +33,18 @@ trait HasKernelData
      */
     public function getAuthors(): Collection
     {
-        return $this->authors ??= (new Collection(Config::getArray('hyde.authors', [])))->mapWithKeys(function (PostAuthor $author): array {
+        if (isset($this->authors)) {
+            return $this->authors;
+        }
+
+        $config = new Collection(Config::getArray('hyde.authors', []));
+
+        if ($config->isEmpty()) {
+            // Defer setting the authors property until the next try.
+            return new Collection();
+        }
+
+        return $this->authors ??= $config->mapWithKeys(function (PostAuthor $author): array {
             return [strtolower($author->username) => $author];
         });
     }

From f02091ddc95933026b17ea0829cc8d3d2f718d4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:15:40 +0200
Subject: [PATCH 2216/2811] Remove getter prefix from kernel author accessor

 We don't use this for other kernel collections
---
 .../src/Foundation/Concerns/HasKernelData.php  |  2 +-
 .../Features/Blogging/Models/PostAuthor.php    |  2 +-
 .../framework/tests/Feature/HydeKernelTest.php | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 0c8ca7481f4..841e2131795 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -31,7 +31,7 @@ trait HasKernelData
      *
      * @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
      */
-    public function getAuthors(): Collection
+    public function authors(): Collection
     {
         if (isset($this->authors)) {
             return $this->authors;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 5047f9ee5e0..d3d2818c754 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -80,7 +80,7 @@ public static function get(string $username): static
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
     public static function all(): Collection
     {
-        return Hyde::getAuthors();
+        return Hyde::authors();
     }
 
     public function __toString(): string
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 2ac39e67970..0181cb0e212 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -531,12 +531,12 @@ public function testFeaturesClassIsBoundAsSingleton()
         $this->assertSame($kernel->features(), $kernel->features());
     }
 
-    public function testGetAuthors()
+    public function testAuthors()
     {
         $kernel = new HydeKernel();
 
-        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
-        $this->assertContainsOnlyInstancesOf(PostAuthor::class, $kernel->getAuthors());
+        $this->assertInstanceOf(Collection::class, $kernel->authors());
+        $this->assertContainsOnlyInstancesOf(PostAuthor::class, $kernel->authors());
 
         $this->assertSame([
             'mr_hyde' => [
@@ -544,24 +544,24 @@ public function testGetAuthors()
                 'name' => 'Mr. Hyde',
                 'website' => 'https://hydephp.com',
             ],
-        ], $kernel->getAuthors()->toArray());
+        ], $kernel->authors()->toArray());
     }
 
-    public function testGetAuthorsReturnsSingletonCollection()
+    public function testAuthorsReturnsSingletonCollection()
     {
         $kernel = new HydeKernel();
 
-        $this->assertSame($kernel->getAuthors(), $kernel->getAuthors());
+        $this->assertSame($kernel->authors(), $kernel->authors());
     }
 
-    public function testGetAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
+    public function testAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
     {
         $kernel = new HydeKernel();
 
         Config::set('hyde', []);
 
-        $this->assertInstanceOf(Collection::class, $kernel->getAuthors());
-        $this->assertEmpty($kernel->getAuthors());
+        $this->assertInstanceOf(Collection::class, $kernel->authors());
+        $this->assertEmpty($kernel->authors());
     }
 }
 

From f445f24fb8b28eac5ba1a0b22522a6f4b6bf74e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:19:05 +0200
Subject: [PATCH 2217/2811] Annotate the authors method

---
 packages/framework/src/Hyde.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 20b8313e897..c431e41dbe7 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -7,10 +7,12 @@
 use Hyde\Enums\Feature;
 use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
+use Illuminate\Support\Collection;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Kernel\RouteCollection;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Filesystem\SourceFile;
@@ -53,6 +55,7 @@
  * @method static string getMediaDirectory()
  * @method static string getMediaOutputDirectory()
  * @method static Features features()
+ * @method static Collection<string, PostAuthor> authors()
  * @method static FileCollection<SourceFile> files()
  * @method static PageCollection<HydePage> pages()
  * @method static RouteCollection<Route> routes()

From 84289ecd12985139f755008481c591bd6c88b1f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:23:18 +0200
Subject: [PATCH 2218/2811] Clean up formatting

---
 packages/framework/tests/Unit/PostAuthorTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index f53c414013f..041c808f6cb 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -86,6 +86,7 @@ public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
         Config::set('hyde.authors', [
             Author::create('foo'),
         ]);
+
         $authors = PostAuthor::all();
 
         $this->assertInstanceOf(Collection::class, $authors);
@@ -99,6 +100,7 @@ public function testMultipleAuthorsCanBeDefinedInConfig()
             Author::create('foo'),
             Author::create('bar'),
         ]);
+
         $authors = PostAuthor::all();
 
         $this->assertInstanceOf(Collection::class, $authors);

From d82a8f4593cc3bb5a824c8f3e3a14b7efba6c85d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:23:25 +0200
Subject: [PATCH 2219/2811] Test authors property is not written until there
 are authors defined

---
 .../framework/tests/Feature/HydeKernelTest.php     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 0181cb0e212..20a31f080a5 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Author;
 use Hyde\Facades\Features;
 use Hyde\Foundation\Facades\Pages;
 use Illuminate\Support\Collection;
@@ -563,6 +564,19 @@ public function testAuthorsReturnsEmptyCollectionWhenNoAuthorsDefined()
         $this->assertInstanceOf(Collection::class, $kernel->authors());
         $this->assertEmpty($kernel->authors());
     }
+
+    public function testAuthorsPropertyIsNotWrittenUntilThereAreAuthorsDefined()
+    {
+        $kernel = new HydeKernel();
+
+        Config::set('hyde', []);
+
+        $this->assertEmpty($kernel->authors()->toArray());
+
+        Config::set('hyde.authors', [Author::create('foo')]);
+
+        $this->assertNotEmpty($kernel->authors()->toArray());
+    }
 }
 
 class CallableClass

From 5b06ff49c8b51bc791b18a2083aedeaebf4f3539 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:30:29 +0200
Subject: [PATCH 2220/2811] Return the empty collection instead of creating a
 new one

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 841e2131795..dadef62aefa 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -41,7 +41,7 @@ public function authors(): Collection
 
         if ($config->isEmpty()) {
             // Defer setting the authors property until the next try.
-            return new Collection();
+            return $config;
         }
 
         return $this->authors ??= $config->mapWithKeys(function (PostAuthor $author): array {

From 8be7284fc5422cf719eeeff963f8e073a236a2c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:31:00 +0200
Subject: [PATCH 2221/2811] Remove null coalesce part of evaluated assignment

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index dadef62aefa..5b3238f2d96 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -44,7 +44,7 @@ public function authors(): Collection
             return $config;
         }
 
-        return $this->authors ??= $config->mapWithKeys(function (PostAuthor $author): array {
+        return $this->authors = $config->mapWithKeys(function (PostAuthor $author): array {
             return [strtolower($author->username) => $author];
         });
     }

From aff2083dcfcf06f948698402c85966e35daa3a81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:31:55 +0200
Subject: [PATCH 2222/2811] Extract helper method for parsing the authors

---
 .../framework/src/Foundation/Concerns/HasKernelData.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 5b3238f2d96..dd982feac3a 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -44,7 +44,12 @@ public function authors(): Collection
             return $config;
         }
 
-        return $this->authors = $config->mapWithKeys(function (PostAuthor $author): array {
+        return $this->authors = $this->parseConfigurationAuthors($config);
+    }
+
+    protected function parseConfigurationAuthors(Collection $authors): Collection
+    {
+        return $authors->mapWithKeys(function (PostAuthor $author): array {
             return [strtolower($author->username) => $author];
         });
     }

From 7a230e97ad4991e890ad69e2b0c0d5123cbb53de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 19:39:50 +0200
Subject: [PATCH 2223/2811] Update the blog post author configuration to be
 keyed by the usernames

> We may also want to consider keying the array, to make the username relationship more explicit. This means we would do this for v2.

See https://github.com/hydephp/develop/issues/1778
---
 config/hyde.php                                       |  2 +-
 packages/framework/config/hyde.php                    |  2 +-
 .../src/Foundation/Concerns/HasKernelData.php         |  6 ++----
 packages/framework/tests/Feature/HydeKernelTest.php   | 11 +++++++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 5e74e0784e2..9d6301a1bf7 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -284,7 +284,7 @@
     */
 
     'authors' => [
-        Author::create(
+        'mr_hyde' => Author::create(
             'mr_hyde', // Required username
             'Mr. Hyde', // Optional display name
             'https://hydephp.com' // Optional website URL
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 5e74e0784e2..9d6301a1bf7 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -284,7 +284,7 @@
     */
 
     'authors' => [
-        Author::create(
+        'mr_hyde' => Author::create(
             'mr_hyde', // Required username
             'Mr. Hyde', // Optional display name
             'https://hydephp.com' // Optional website URL
diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index dd982feac3a..2c0b34f9618 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -8,8 +8,6 @@
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
-use function strtolower;
-
 /**
  * Contains accessors and containers for data stored in the kernel.
  *
@@ -49,8 +47,8 @@ public function authors(): Collection
 
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
-        return $authors->mapWithKeys(function (PostAuthor $author): array {
-            return [strtolower($author->username) => $author];
+        return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
+            return [$username ?: $author->username => $author];
         });
     }
 }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 20a31f080a5..3732dc52878 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -577,6 +577,17 @@ public function testAuthorsPropertyIsNotWrittenUntilThereAreAuthorsDefined()
 
         $this->assertNotEmpty($kernel->authors()->toArray());
     }
+
+    public function testAuthorsUseTheConfigArrayKey()
+    {
+        Config::set('hyde.authors', ['foo' => Author::create('bar')]);
+
+        $this->assertSame([
+            'foo' => [
+                'username' => 'bar',
+            ],
+        ], Hyde::authors()->toArray());
+    }
 }
 
 class CallableClass

From 1faaa167abb873ef6813ed9e4631b5ebe44379ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:28:57 +0200
Subject: [PATCH 2224/2811] Update the kernel array representation to include
 the site authors

---
 packages/framework/src/Foundation/HydeKernel.php    | 1 +
 packages/framework/tests/Feature/HydeKernelTest.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index a41dd3371df..86b0c9c2bae 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -110,6 +110,7 @@ public function toArray(): array
             'files' => $this->files(),
             'pages' => $this->pages(),
             'routes' => $this->routes(),
+            'authors' => $this->authors(),
         ];
     }
 }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 3732dc52878..7d67c6203ed 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -283,6 +283,7 @@ public function testToArrayMethod()
             'files' => Hyde::files(),
             'pages' => Hyde::pages(),
             'routes' => Hyde::routes(),
+            'authors' => Hyde::authors(),
         ], Hyde::toArray());
     }
 

From 8891c8fd49b97cffb77de9eab4dbec0b3ff107bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:38:16 +0200
Subject: [PATCH 2225/2811] Clarify documentation

---
 docs/creating-content/blog-posts.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/blog-posts.md b/docs/creating-content/blog-posts.md
index 70f4b454e26..b50cc96fdf5 100644
--- a/docs/creating-content/blog-posts.md
+++ b/docs/creating-content/blog-posts.md
@@ -156,7 +156,7 @@ author:
 ```
 
 When specifying an array you don't need all the sub-properties. The example just shows all the supported values.
-Array values here will override all the values in the `authors` config entry.
+Array values here will override all the values in the `authors` config entry, if one exists.
 
 ### Image
 

From 4d5a936e56f2c9add6ce40fe61af16313f6064d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:47:15 +0200
Subject: [PATCH 2226/2811] Add base constructor tests

---
 packages/framework/tests/Unit/PostAuthorTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 041c808f6cb..a6da7cdcd48 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -25,6 +25,22 @@ protected function setUp(): void
         self::resetKernel();
     }
 
+    public function testCanCreateAuthorModel()
+    {
+        $author = new PostAuthor('foo');
+
+        $this->assertInstanceOf(PostAuthor::class, $author);
+    }
+
+    public function testCanCreateAuthorModelWithDetails()
+    {
+        $author = new PostAuthor('foo', 'bar', 'https://example.com');
+
+        $this->assertSame('foo', $author->username);
+        $this->assertSame('bar', $author->name);
+        $this->assertSame('https://example.com', $author->website);
+    }
+
     public function testCreateMethodCreatesNewAuthorModel()
     {
         $author = Author::create('foo');

From 0dfb841b809d41149ba870b69d09baacf072e18d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:50:01 +0200
Subject: [PATCH 2227/2811] Update post author name to fall back to username at
 construct time

---
 .../Framework/Features/Blogging/Models/PostAuthor.php    | 4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php      | 1 +
 packages/framework/tests/Feature/MarkdownPostTest.php    | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php         | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index d3d2818c754..142b74e7896 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -53,7 +53,7 @@ class PostAuthor implements Stringable, SerializableContract
     public function __construct(string $username, ?string $name = null, ?string $website = null)
     {
         $this->username = $username;
-        $this->name = $name;
+        $this->name = $name ?? $username;
         $this->website = $website;
     }
 
@@ -99,7 +99,7 @@ public function toArray(): array
 
     public function getName(): string
     {
-        return $this->name ?? $this->username;
+        return $this->name;
     }
 
     /** @param array{username?: string, name?: string, website?: string} $data */
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 7d67c6203ed..1b0d2838ef2 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -586,6 +586,7 @@ public function testAuthorsUseTheConfigArrayKey()
         $this->assertSame([
             'foo' => [
                 'username' => 'bar',
+                'name' => 'bar',
             ],
         ], Hyde::authors()->toArray());
     }
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 66c76b3a0ba..4040d1c35c7 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -25,7 +25,7 @@ public function testConstructorCanCreateANewAuthorInstanceFromUsernameString()
 
         $this->assertInstanceOf(PostAuthor::class, $post->author);
         $this->assertSame('John Doe', $post->author->username);
-        $this->assertNull($post->author->name);
+        $this->assertSame('John Doe', $post->author->name);
         $this->assertNull($post->author->website);
     }
 
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index a6da7cdcd48..cde23a22556 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -41,6 +41,13 @@ public function testCanCreateAuthorModelWithDetails()
         $this->assertSame('https://example.com', $author->website);
     }
 
+    public function testNameIsSetToUsernameIfNoNameIsProvided()
+    {
+        $author = new PostAuthor('foo');
+
+        $this->assertSame('foo', $author->name);
+    }
+
     public function testCreateMethodCreatesNewAuthorModel()
     {
         $author = Author::create('foo');
@@ -218,6 +225,6 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
     {
         $author = new PostAuthor('username', null, null);
 
-        $this->assertSame('{"username":"username"}', $author->toJson());
+        $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
     }
 }

From 96d39694429b2f0d7163897cd4a71b36b57abbb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:53:00 +0200
Subject: [PATCH 2228/2811] Return keyed author array

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 142b74e7896..fe4de590f17 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -90,11 +90,11 @@ public function __toString(): string
 
     public function toArray(): array
     {
-        return array_filter([
+        return [$this->username => array_filter([
             'username' => $this->username,
             'name' => $this->name,
             'website' => $this->website,
-        ]);
+        ])];
     }
 
     public function getName(): string

From 024067575a78ab91a094ae2143aace3213a713b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 20:53:17 +0200
Subject: [PATCH 2229/2811] Revert "Return keyed author array"

This reverts commit beef1acd94803618bea66a18a636effb3ec1d0c9.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index fe4de590f17..142b74e7896 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -90,11 +90,11 @@ public function __toString(): string
 
     public function toArray(): array
     {
-        return [$this->username => array_filter([
+        return array_filter([
             'username' => $this->username,
             'name' => $this->name,
             'website' => $this->website,
-        ])];
+        ]);
     }
 
     public function getName(): string

From 3151b640bd0e41f55f67c3ad3a47489c8f24beab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 21:24:40 +0200
Subject: [PATCH 2230/2811] Update authors to support setting a biography

---
 .../Framework/Features/Blogging/Models/PostAuthor.php  |  9 ++++++++-
 .../Contracts/FrontMatter/SubSchemas/AuthorSchema.php  |  1 +
 packages/framework/tests/Unit/PostAuthorTest.php       | 10 ++++++++++
 packages/framework/tests/Unit/SchemaContractsTest.php  |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 142b74e7896..fa07d05bdb0 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -41,6 +41,11 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public readonly ?string $website;
 
+    /**
+     * The author's biography.
+     */
+    public readonly ?string $bio;
+
     /**
      * Construct a new Post Author object.
      *
@@ -49,12 +54,14 @@ class PostAuthor implements Stringable, SerializableContract
      * @param  string  $username
      * @param  string|null  $name
      * @param  string|null  $website
+     * @param  string|null  $bio
      */
-    public function __construct(string $username, ?string $name = null, ?string $website = null)
+    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null)
     {
         $this->username = $username;
         $this->name = $name ?? $username;
         $this->website = $website;
+        $this->bio = $bio;
     }
 
     /**
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
index 7028cef6d6c..38ca6cfaa6b 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
@@ -15,5 +15,6 @@ interface AuthorSchema extends BlogPostSchema
         'name' => 'string',
         'username' => 'string',
         'website' => 'string',
+        'bio' => 'string',
     ];
 }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index cde23a22556..f97821360d5 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -41,6 +41,16 @@ public function testCanCreateAuthorModelWithDetails()
         $this->assertSame('https://example.com', $author->website);
     }
 
+    public function testCanCreateAuthorModelWithFullDetails()
+    {
+        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?');
+
+        $this->assertSame('mr_hyde', $author->username);
+        $this->assertSame('Mr. Hyde', $author->name);
+        $this->assertSame('https://HydePHP.com', $author->website);
+        $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
+    }
+
     public function testNameIsSetToUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 2d78f740b47..1223acb2fb5 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -60,6 +60,7 @@ public function testSchemasAreNotAccidentallyChanged()
             'name' => 'string',
             'username' => 'string',
             'website' => 'string',
+            'bio' => 'string',
         ], AuthorSchema::AUTHOR_SCHEMA);
 
         $this->assertSame([

From e370dc71937af7057f83a75b142ffd5789dbd5e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 21:33:50 +0200
Subject: [PATCH 2231/2811] Update authors to support setting social media
 handles

---
 .../Features/Blogging/Models/PostAuthor.php         | 13 ++++++++++++-
 .../FrontMatter/SubSchemas/AuthorSchema.php         |  1 +
 packages/framework/tests/Unit/PostAuthorTest.php    |  3 ++-
 .../framework/tests/Unit/SchemaContractsTest.php    |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index fa07d05bdb0..cbc212980e1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -46,6 +46,15 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public readonly ?string $bio;
 
+    /**
+     * The author's social media links/handles.
+     *
+     * @var array<string, string
+     *
+     * @example ['twitter' => 'mr_hyde'] ($service => $handle)
+     */
+    public array $socials = [];
+
     /**
      * Construct a new Post Author object.
      *
@@ -55,13 +64,15 @@ class PostAuthor implements Stringable, SerializableContract
      * @param  string|null  $name
      * @param  string|null  $website
      * @param  string|null  $bio
+     * @param  array<string, string>  $socials
      */
-    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null)
+    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, array $socials = [])
     {
         $this->username = $username;
         $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
+        $this->socials = $socials;
     }
 
     /**
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
index 38ca6cfaa6b..17f2e8e4517 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
@@ -16,5 +16,6 @@ interface AuthorSchema extends BlogPostSchema
         'username' => 'string',
         'website' => 'string',
         'bio' => 'string',
+        'socials' => 'array<string, string>',
     ];
 }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index f97821360d5..17a800b3597 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,12 +43,13 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?');
+        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']);
 
         $this->assertSame('mr_hyde', $author->username);
         $this->assertSame('Mr. Hyde', $author->name);
         $this->assertSame('https://HydePHP.com', $author->website);
         $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
+        $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author->socials);
     }
 
     public function testNameIsSetToUsernameIfNoNameIsProvided()
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 1223acb2fb5..9da068b9149 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -61,6 +61,7 @@ public function testSchemasAreNotAccidentallyChanged()
             'username' => 'string',
             'website' => 'string',
             'bio' => 'string',
+            'socials' => 'array<string, string>',
         ], AuthorSchema::AUTHOR_SCHEMA);
 
         $this->assertSame([

From 4425913f505fca3bf2fe76a0d1ce7cb91647dbf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 5 Jul 2024 22:01:13 +0200
Subject: [PATCH 2232/2811] Update authors to support setting avatars

---
 .../Framework/Features/Blogging/Models/PostAuthor.php | 11 ++++++++++-
 .../Contracts/FrontMatter/SubSchemas/AuthorSchema.php |  1 +
 packages/framework/tests/Unit/PostAuthorTest.php      |  3 ++-
 packages/framework/tests/Unit/SchemaContractsTest.php |  1 +
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index cbc212980e1..dbc6ffa36b7 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -46,6 +46,13 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public readonly ?string $bio;
 
+    /**
+     * The author's avatar image.
+     *
+     * If you in your Blade view use `Hyde::asset($author->avatar)`, then this value supports using both image names for files in `_media`, or full URIs starting with the protocol.
+     */
+    public readonly ?string $avatar;
+
     /**
      * The author's social media links/handles.
      *
@@ -64,14 +71,16 @@ class PostAuthor implements Stringable, SerializableContract
      * @param  string|null  $name
      * @param  string|null  $website
      * @param  string|null  $bio
+     * @param  string|null  $avatar
      * @param  array<string, string>  $socials
      */
-    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, array $socials = [])
+    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, array $socials = [])
     {
         $this->username = $username;
         $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
+        $this->avatar = $avatar;
         $this->socials = $socials;
     }
 
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
index 17f2e8e4517..028b9f24e1a 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
@@ -16,6 +16,7 @@ interface AuthorSchema extends BlogPostSchema
         'username' => 'string',
         'website' => 'string',
         'bio' => 'string',
+        'avatar' => 'string',
         'socials' => 'array<string, string>',
     ];
 }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 17a800b3597..ef895e02063 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,12 +43,13 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']);
+        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', 'mr_hyde.png', ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']);
 
         $this->assertSame('mr_hyde', $author->username);
         $this->assertSame('Mr. Hyde', $author->name);
         $this->assertSame('https://HydePHP.com', $author->website);
         $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
+        $this->assertSame('mr_hyde.png', $author->avatar);
         $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author->socials);
     }
 
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 9da068b9149..351d3a30d5c 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -61,6 +61,7 @@ public function testSchemasAreNotAccidentallyChanged()
             'username' => 'string',
             'website' => 'string',
             'bio' => 'string',
+            'avatar' => 'string',
             'socials' => 'array<string, string>',
         ], AuthorSchema::AUTHOR_SCHEMA);
 

From da1680eccfe9e4191b923de003e6fd7beb6da34a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:51:53 +0200
Subject: [PATCH 2233/2811] Clarify code documentation

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index dbc6ffa36b7..6a23266fc3c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -98,7 +98,7 @@ public static function getOrCreate(string|array $data): static
         return Author::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
     }
 
-    /** Get an Author from the config, or create it. */
+    /** Get an Author from the config, or create it with the username. */
     public static function get(string $username): static
     {
         return static::all()->firstWhere('username', strtolower($username)) ?? Author::create($username);

From bcebbc5fb452f6ef98b0c637e220c5ab3911539e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:55:44 +0200
Subject: [PATCH 2234/2811] Get authors by array key

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 6a23266fc3c..9482212daea 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -11,7 +11,6 @@
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function strtolower;
 use function is_string;
 use function array_filter;
 
@@ -101,7 +100,7 @@ public static function getOrCreate(string|array $data): static
     /** Get an Author from the config, or create it with the username. */
     public static function get(string $username): static
     {
-        return static::all()->firstWhere('username', strtolower($username)) ?? Author::create($username);
+        return static::all()->get($username) ?? Author::create($username);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */

From c56e92d5dc08eb78071b3827110880f85371e391 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:56:18 +0200
Subject: [PATCH 2235/2811] Make socials readonly

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 9482212daea..65301fa18c8 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -59,7 +59,7 @@ class PostAuthor implements Stringable, SerializableContract
      *
      * @example ['twitter' => 'mr_hyde'] ($service => $handle)
      */
-    public array $socials = [];
+    public readonly array $socials = [];
 
     /**
      * Construct a new Post Author object.

From 6bfef3ba3413a189e09c5051f2297e306eb4e365 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:56:48 +0200
Subject: [PATCH 2236/2811] Remove initializer from readonly field

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 65301fa18c8..4926b769810 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -59,7 +59,7 @@ class PostAuthor implements Stringable, SerializableContract
      *
      * @example ['twitter' => 'mr_hyde'] ($service => $handle)
      */
-    public readonly array $socials = [];
+    public readonly array $socials;
 
     /**
      * Construct a new Post Author object.

From 74b080f820722176c8de6a68a20dedd9b9bb2af0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:58:48 +0200
Subject: [PATCH 2237/2811] Split comma-separated values into multiple lines

---
 packages/framework/tests/Unit/PostAuthorTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index ef895e02063..4e7f44f897a 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,7 +43,14 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        $author = new PostAuthor('mr_hyde', 'Mr. Hyde', 'https://HydePHP.com', 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', 'mr_hyde.png', ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']);
+        $author = new PostAuthor(
+            'mr_hyde',
+            'Mr. Hyde',
+            'https://HydePHP.com',
+            'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?',
+            'mr_hyde.png',
+            ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']
+        );
 
         $this->assertSame('mr_hyde', $author->username);
         $this->assertSame('Mr. Hyde', $author->name);

From 03855869a767a7ac9882e17d711ff217567c7748 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 10:59:53 +0200
Subject: [PATCH 2238/2811] Introduce local variables

---
 .../framework/tests/Unit/PostAuthorTest.php   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 4e7f44f897a..8c7d151b3e7 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,21 +43,28 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
+        $username = 'mr_hyde';
+        $name = 'Mr. Hyde';
+        $website = 'https://HydePHP.com';
+        $bio = 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?';
+        $avatar = 'mr_hyde.png';
+        $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
+
         $author = new PostAuthor(
-            'mr_hyde',
-            'Mr. Hyde',
-            'https://HydePHP.com',
-            'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?',
-            'mr_hyde.png',
-            ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']
+            $username,
+            $name,
+            $website,
+            $bio,
+            $avatar,
+            $socials
         );
 
-        $this->assertSame('mr_hyde', $author->username);
-        $this->assertSame('Mr. Hyde', $author->name);
-        $this->assertSame('https://HydePHP.com', $author->website);
-        $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
-        $this->assertSame('mr_hyde.png', $author->avatar);
-        $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author->socials);
+        $this->assertSame($username, $author->username);
+        $this->assertSame($name, $author->name);
+        $this->assertSame($website, $author->website);
+        $this->assertSame($bio, $author->bio);
+        $this->assertSame($avatar, $author->avatar);
+        $this->assertSame($socials, $author->socials);
     }
 
     public function testNameIsSetToUsernameIfNoNameIsProvided()

From 0a494712df7a82a865df206dad9c23b42bd72b97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:00:04 +0200
Subject: [PATCH 2239/2811] Join comma-separated values into a single line

---
 packages/framework/tests/Unit/PostAuthorTest.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 8c7d151b3e7..efc26c7cacc 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -50,14 +50,7 @@ public function testCanCreateAuthorModelWithFullDetails()
         $avatar = 'mr_hyde.png';
         $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
 
-        $author = new PostAuthor(
-            $username,
-            $name,
-            $website,
-            $bio,
-            $avatar,
-            $socials
-        );
+        $author = new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
 
         $this->assertSame($username, $author->username);
         $this->assertSame($name, $author->name);

From 9b11c94ae0cdc0103f913d4c9aef4238fc12d450 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:00:07 +0200
Subject: [PATCH 2240/2811] Revert "Join comma-separated values into a single
 line"

This reverts commit 0a494712df7a82a865df206dad9c23b42bd72b97.
---
 packages/framework/tests/Unit/PostAuthorTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index efc26c7cacc..8c7d151b3e7 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -50,7 +50,14 @@ public function testCanCreateAuthorModelWithFullDetails()
         $avatar = 'mr_hyde.png';
         $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
 
-        $author = new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
+        $author = new PostAuthor(
+            $username,
+            $name,
+            $website,
+            $bio,
+            $avatar,
+            $socials
+        );
 
         $this->assertSame($username, $author->username);
         $this->assertSame($name, $author->name);

From abd618b23ae7e4ce5d94b4816535b123d0121efb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:00:25 +0200
Subject: [PATCH 2241/2811] Add name identifiers to arguments

---
 packages/framework/tests/Unit/PostAuthorTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 8c7d151b3e7..e1f44520c15 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -51,12 +51,12 @@ public function testCanCreateAuthorModelWithFullDetails()
         $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
 
         $author = new PostAuthor(
-            $username,
-            $name,
-            $website,
-            $bio,
-            $avatar,
-            $socials
+            username: $username,
+            name: $name,
+            website: $website,
+            bio: $bio,
+            avatar: $avatar,
+            socials: $socials
         );
 
         $this->assertSame($username, $author->username);

From dcae0aff3f9799204c499cc4a3d0e13b016e4a88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:01:41 +0200
Subject: [PATCH 2242/2811] Extract helper method

---
 .../framework/tests/Unit/PostAuthorTest.php   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e1f44520c15..e031aae879d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,12 +43,7 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        $username = 'mr_hyde';
-        $name = 'Mr. Hyde';
-        $website = 'https://HydePHP.com';
-        $bio = 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?';
-        $avatar = 'mr_hyde.png';
-        $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
+        [$username, $name, $website, $bio, $avatar, $socials] = $this->exampleData();
 
         $author = new PostAuthor(
             username: $username,
@@ -253,4 +248,16 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
 
         $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
     }
+
+    protected function exampleData(): array
+    {
+        $username = 'mr_hyde';
+        $name = 'Mr. Hyde';
+        $website = 'https://HydePHP.com';
+        $bio = 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?';
+        $avatar = 'mr_hyde.png';
+        $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
+
+        return [$username, $name, $website, $bio, $avatar, $socials];
+    }
 }

From 67d4b9e3e91570ac514ced55194d474243dba9f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:05:27 +0200
Subject: [PATCH 2243/2811] Split comma-separated values into multiple lines

---
 packages/framework/tests/Unit/PostAuthorTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e031aae879d..ce5325a89f5 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -258,6 +258,13 @@ protected function exampleData(): array
         $avatar = 'mr_hyde.png';
         $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
 
-        return [$username, $name, $website, $bio, $avatar, $socials];
+        return [
+            $username,
+            $name,
+            $website,
+            $bio,
+            $avatar,
+            $socials
+        ];
     }
 }

From dd70f876bdd0c2cda7db3486ccd6a4c5ee774929 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:06:01 +0200
Subject: [PATCH 2244/2811] Convert to keyed array

---
 packages/framework/tests/Unit/PostAuthorTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index ce5325a89f5..bc6a2403deb 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -43,7 +43,7 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        [$username, $name, $website, $bio, $avatar, $socials] = $this->exampleData();
+        [$username, $name, $website, $bio, $avatar, $socials] = array_values($this->exampleData());
 
         $author = new PostAuthor(
             username: $username,
@@ -259,12 +259,12 @@ protected function exampleData(): array
         $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
 
         return [
-            $username,
-            $name,
-            $website,
-            $bio,
-            $avatar,
-            $socials
+            'username' => $username,
+            'name' => $name,
+            'website' => $website,
+            'bio' => $bio,
+            'avatar' => $avatar,
+            'socials' => $socials
         ];
     }
 }

From 9b4dd57eed2e81f893c23dba363b0f0c6f89606a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:06:20 +0200
Subject: [PATCH 2245/2811] Inline local variables

---
 .../framework/tests/Unit/PostAuthorTest.php   | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index bc6a2403deb..d679d6fe571 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -251,20 +251,13 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
 
     protected function exampleData(): array
     {
-        $username = 'mr_hyde';
-        $name = 'Mr. Hyde';
-        $website = 'https://HydePHP.com';
-        $bio = 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?';
-        $avatar = 'mr_hyde.png';
-        $socials = ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'];
-
-        return [
-            'username' => $username,
-            'name' => $name,
-            'website' => $website,
-            'bio' => $bio,
-            'avatar' => $avatar,
-            'socials' => $socials
+         return [
+            'username' => 'mr_hyde',
+            'name' => 'Mr. Hyde',
+            'website' => 'https://HydePHP.com',
+            'bio' => 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?',
+            'avatar' => 'mr_hyde.png',
+            'socials' => ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']
         ];
     }
 }

From f55ffbb658209fb1d1c8707a3c93d46245c661f8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:15:27 +0200
Subject: [PATCH 2246/2811] Fix formatting

---
 packages/framework/tests/Unit/PostAuthorTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index d679d6fe571..bb301b59654 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -251,13 +251,13 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
 
     protected function exampleData(): array
     {
-         return [
+        return [
             'username' => 'mr_hyde',
             'name' => 'Mr. Hyde',
             'website' => 'https://HydePHP.com',
             'bio' => 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?',
             'avatar' => 'mr_hyde.png',
-            'socials' => ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com']
+            'socials' => ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'],
         ];
     }
 }

From d5454c2cb429f45cf9039d68c6127d183fd3817d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:08:49 +0200
Subject: [PATCH 2247/2811] Add ArrayShape to PHPDoc

---
 packages/framework/tests/Unit/PostAuthorTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index bb301b59654..439e98364f8 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -249,6 +249,9 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
         $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
     }
 
+    /**
+     * @return array{username: string, name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
+     */
     protected function exampleData(): array
     {
         return [

From b0a5c34c638cf4cc53d030006c11c68791ab7ce3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:09:31 +0200
Subject: [PATCH 2248/2811] Test can create author model with full details
 argument unpacking

---
 packages/framework/tests/Unit/PostAuthorTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 439e98364f8..49f0ec2598d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -62,6 +62,20 @@ public function testCanCreateAuthorModelWithFullDetails()
         $this->assertSame($socials, $author->socials);
     }
 
+    public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
+    {
+        $data = $this->exampleData();
+
+        $author = new PostAuthor(...$data);
+
+        $this->assertSame($data['username'], $author->username);
+        $this->assertSame($data['name'], $author->name);
+        $this->assertSame($data['website'], $author->website);
+        $this->assertSame($data['bio'], $author->bio);
+        $this->assertSame($data['avatar'], $author->avatar);
+        $this->assertSame($data['socials'], $author->socials);
+    }
+
     public function testNameIsSetToUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');

From d29744c40e6d8e21ab6746f68bf1fe2a8571d019 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:18:03 +0200
Subject: [PATCH 2249/2811] Remove faulty legacy argument from test

---
 packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index aa445431c65..48e1818fcf0 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -48,7 +48,6 @@ public function testComponentRendersPostWithAuthorObject()
         $view = $this->renderTestView(MarkdownPost::make(matter: [
             'author' => [
                 'name' => 'John Doe',
-                'url' => '#',
             ],
         ]));
 

From 5d6ddab87863b07b5e5910aa012135d021a99912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:14:59 +0200
Subject: [PATCH 2250/2811] Support setting all arguments through the array
 constructor

---
 .../Features/Blogging/Models/PostAuthor.php   |  5 +-
 .../framework/tests/Unit/PostAuthorTest.php   | 59 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4926b769810..9e2070f79e8 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,6 +12,7 @@
 use Hyde\Support\Contracts\SerializableContract;
 
 use function is_string;
+use function array_merge;
 use function array_filter;
 
 /**
@@ -94,7 +95,9 @@ public static function getOrCreate(string|array $data): static
             return static::get($data);
         }
 
-        return Author::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
+        return new static(...array_merge([
+            'username' => static::findUsername($data),
+        ], $data));
     }
 
     /** Get an Author from the config, or create it with the username. */
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 49f0ec2598d..9128b1d4e30 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -76,6 +76,65 @@ public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
         $this->assertSame($data['socials'], $author->socials);
     }
 
+    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate()
+    {
+        $data = $this->exampleData();
+
+        $author = PostAuthor::getOrCreate($data);
+
+        $this->assertSame($data['username'], $author->username);
+        $this->assertSame($data['name'], $author->name);
+        $this->assertSame($data['website'], $author->website);
+        $this->assertSame($data['bio'], $author->bio);
+        $this->assertSame($data['avatar'], $author->avatar);
+        $this->assertSame($data['socials'], $author->socials);
+    }
+
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate()
+    {
+        $data = $this->exampleData();
+
+        $author = PostAuthor::getOrCreate([
+            'username' => $data['username'],
+            'name' => $data['name'],
+            'website' => $data['website'],
+        ]);
+
+        $this->assertSame($data['username'], $author->username);
+        $this->assertSame($data['name'], $author->name);
+        $this->assertSame($data['website'], $author->website);
+        $this->assertNull($author->bio);
+        $this->assertNull($author->avatar);
+        $this->assertEmpty($author->socials);
+    }
+
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutUsername()
+    {
+        $data = $this->exampleData();
+
+        $author = PostAuthor::getOrCreate([
+            'name' => $data['name'],
+            'website' => $data['website'],
+        ]);
+
+        $this->assertSame($data['name'], $author->username);
+        $this->assertSame($data['name'], $author->name);
+        $this->assertSame($data['website'], $author->website);
+    }
+
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutAnyNames()
+    {
+        $data = $this->exampleData();
+
+        $author = PostAuthor::getOrCreate([
+            'website' => $data['website'],
+        ]);
+
+        $this->assertSame('Guest', $author->username);
+        $this->assertSame('Guest', $author->name);
+        $this->assertSame($data['website'], $author->website);
+    }
+
     public function testNameIsSetToUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');

From 1baa0c3523cdb3af0812785231abb3f783ea1a09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:17:48 +0200
Subject: [PATCH 2251/2811] Update outdated ArrayShape annotation

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 9e2070f79e8..a21d9f05f19 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -87,7 +87,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     /**
      * Dynamically get or create an author based on a username string or front matter array.
      *
-     * @param  string|array{username?: string, name?: string, website?: string}  $data
+     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
     public static function getOrCreate(string|array $data): static
     {

From 2f54b9f9aad5a9065ae51ec9df5dc9ee0d023795 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:22:27 +0200
Subject: [PATCH 2252/2811] Deprecate the `PostAuthor::getName()` method

This is not needed as the name property can be accessed directly
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index a21d9f05f19..94303a8323f 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -8,6 +8,7 @@
 use Stringable;
 use Hyde\Facades\Author;
 use Illuminate\Support\Collection;
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
 
@@ -126,6 +127,10 @@ public function toArray(): array
         ]);
     }
 
+    /**
+     * @deprecated This is not needed as the name property can be accessed directly.
+     */
+    #[Deprecated(reason: 'Use the name property instead.', replacement: '%class%->name')]
     public function getName(): string
     {
         return $this->name;

From 76ab3ab398a2241c6139f690c448d81cb000d001 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:23:12 +0200
Subject: [PATCH 2253/2811] Replace with '$this->name'

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 94303a8323f..ad0f880d7a3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -115,7 +115,7 @@ public static function all(): Collection
 
     public function __toString(): string
     {
-        return $this->getName();
+        return $this->name;
     }
 
     public function toArray(): array

From a20350acfa2eb87dd50da138b1d8c69fe422d174 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:23:41 +0200
Subject: [PATCH 2254/2811] Add newline

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index ad0f880d7a3..85675675c09 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -25,6 +25,7 @@ class PostAuthor implements Stringable, SerializableContract
 
     /**
      * The username of the author.
+     *
      * This is the key used to find authors in the config.
      */
     public readonly string $username;

From 369a7e68692284c3d57c50a4c1cd0dfd26921496 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:49:16 +0200
Subject: [PATCH 2255/2811] Test that post authors can be set in the Yaml
 config

---
 .../Feature/YamlConfigurationFeatureTest.php  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 41362764b04..bb3688e5cf6 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 /**
  * Test the Yaml configuration feature.
@@ -389,6 +390,54 @@ public function testSettingSiteNameSetsRssFeedSiteNameUnlessAlreadySpecifiedInSt
         $this->assertSame('Custom', config('hyde.rss.description'));
     }
 
+    public function testCanSetAuthorsInTheYamlConfig()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        authors:
+          username1:
+            name: 'User 1'
+            bio: 'Bio of user 1'
+            website: 'https://user1.com'
+            socials:
+              twitter: '@user1'
+              github: 'user1'
+        
+          username2:
+            name: 'User 2'
+            bio: 'Bio of user 2'
+            socials:
+              twitter: '@user2'
+              github: 'user2'
+        
+          test:
+            name: 'Test user'
+            bio: 'Bio of test user'
+            website: 'https://test.com'
+        YAML);
+
+        $this->runBootstrappers();
+
+        $authors = config('hyde.authors');
+
+        $this->assertCount(3, $authors);
+        $this->assertContainsOnlyInstancesOf(PostAuthor::class, $authors);
+        $this->assertSame('User 1', $authors['username1']->name);
+        $this->assertSame('User 2', $authors['username2']->name);
+        $this->assertSame('Test user', $authors['test']->name);
+
+        $this->assertSame('Bio of user 1', $authors['username1']->bio);
+        $this->assertSame('Bio of user 2', $authors['username2']->bio);
+        $this->assertSame('Bio of test user', $authors['test']->bio);
+
+        $this->assertSame('https://user1.com', $authors['username1']->website);
+        $this->assertNull($authors['username2']->website);
+        $this->assertSame('https://test.com', $authors['test']->website);
+
+        $this->assertSame(['twitter' => '@user1', 'github' => 'user1'], $authors['username1']->socials);
+        $this->assertSame(['twitter' => '@user2', 'github' => 'user2'], $authors['username2']->socials);
+        $this->assertSame([], $authors['test']->socials);
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 2ad343a8992ff0ce05937b5c2a685421964a64dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:33:08 +0200
Subject: [PATCH 2256/2811] Draft method to parse authors

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index d5d75accb3c..737c2fd7e37 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -51,4 +51,9 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     {
         $this->config[$namespace] = array_merge($this->config[$namespace] ?? [], $yaml);
     }
+
+    protected function parseAuthors(array $authors): array
+    {
+        return []; // TODO: Implement author parsing.
+    }
 }

From 8115c623c37af52ffa901ef1d1e9647d13ee04f0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:33:31 +0200
Subject: [PATCH 2257/2811] If namespace is for Hyde and authors are set then
 parse them

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 737c2fd7e37..2271b755a6b 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -43,6 +43,10 @@ public function bootstrap(Application $app): void
     protected function mergeParsedConfiguration(): void
     {
         foreach ($this->yaml->getData() as $namespace => $data) {
+            if ($namespace === 'hyde' && isset($data['authors'])) {
+                $data['authors'] = $this->parseAuthors($data['authors']);
+            }
+
             $this->mergeConfiguration($namespace, Arr::undot($data ?: []));
         }
     }

From 2191c88961406692dfa41f8c577c51762cf97965 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:34:56 +0200
Subject: [PATCH 2258/2811] Annotate the helper method generics

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 2271b755a6b..fd7a5e55593 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -56,6 +56,10 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
         $this->config[$namespace] = array_merge($this->config[$namespace] ?? [], $yaml);
     }
 
+    /**
+     * @param  array<string, array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}>  $authors
+     * @return array<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor>
+     */
     protected function parseAuthors(array $authors): array
     {
         return []; // TODO: Implement author parsing.

From ff2ddfc9398ab0ded4413a9f25c2c57743f0b70c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:39:12 +0200
Subject: [PATCH 2259/2811] Implement Yaml configuration author parsing

Fixes https://github.com/hydephp/develop/issues/1719
---
 .../src/Foundation/Internal/LoadYamlConfiguration.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index fd7a5e55593..f1976f8f788 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 use function array_merge;
 
@@ -62,6 +63,8 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
      */
     protected function parseAuthors(array $authors): array
     {
-        return []; // TODO: Implement author parsing.
+        return Arr::mapWithKeys($authors, function (array $author, string $username): array {
+            return [$username => PostAuthor::getOrCreate($author)];
+        });
     }
 }

From 208c84834f7b3d159080e4ec7b402f79a344de1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:52:52 +0200
Subject: [PATCH 2260/2811] Draft test for Yaml config authors being merged
 with the PHP config

---
 .../framework/tests/Feature/YamlConfigurationFeatureTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index bb3688e5cf6..563ea26cc82 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -438,6 +438,11 @@ public function testCanSetAuthorsInTheYamlConfig()
         $this->assertSame([], $authors['test']->socials);
     }
 
+    public function testYamlConfigAuthorsAreMergedWithPhpConfig()
+    {
+        //
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 5f1e2d360165f82bba25395e9ce784e2e6e94a6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:52:55 +0200
Subject: [PATCH 2261/2811] Revert "Draft test for Yaml config authors being
 merged with the PHP config"

This reverts commit 1a86dc454f3e34c388645511b06f4b779fb48c2a. See https://github.com/hydephp/develop/pull/1782/files#r1667340453
---
 .../framework/tests/Feature/YamlConfigurationFeatureTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 563ea26cc82..bb3688e5cf6 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -438,11 +438,6 @@ public function testCanSetAuthorsInTheYamlConfig()
         $this->assertSame([], $authors['test']->socials);
     }
 
-    public function testYamlConfigAuthorsAreMergedWithPhpConfig()
-    {
-        //
-    }
-
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 896860f91dec317b6ea408fd3a75a7b1d38e1f48 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 11:54:45 +0200
Subject: [PATCH 2262/2811] Add todo

---
 .../framework/tests/Feature/YamlConfigurationFeatureTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index bb3688e5cf6..a4f0ada878d 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -411,7 +411,7 @@ public function testCanSetAuthorsInTheYamlConfig()
         
           test:
             name: 'Test user'
-            bio: 'Bio of test user'
+            bio: 'Bio of test user' # TODO: support 'biography'
             website: 'https://test.com'
         YAML);
 

From a98d5be722b414a3f3ded1ea2669ac33252f9f0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 16:21:04 +0200
Subject: [PATCH 2263/2811] Use automatic array serialisation

Uses logic from https://github.com/hydephp/develop/pull/1793
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 85675675c09..e763ab1f659 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -121,11 +121,7 @@ public function __toString(): string
 
     public function toArray(): array
     {
-        return array_filter([
-            'username' => $this->username,
-            'name' => $this->name,
-            'website' => $this->website,
-        ]);
+        return array_filter($this->automaticallySerialize());
     }
 
     /**

From ad35ed37d3aae467e0a111d88ec8747a76bacadb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 16:22:19 +0200
Subject: [PATCH 2264/2811] Test to array method serializes all data

---
 packages/framework/tests/Unit/PostAuthorTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 9128b1d4e30..dc54a225051 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -279,6 +279,15 @@ public function testToArrayMethodReturnsArrayRepresentationOfAuthor()
         ], $author->toArray());
     }
 
+    public function testToArrayMethodSerializesAllData()
+    {
+        $data = $this->exampleData();
+
+        $author = new PostAuthor(...$data);
+
+        $this->assertSame($data, $author->toArray());
+    }
+
     public function testJsonSerializeMethodReturnsArrayRepresentationOfAuthor()
     {
         $author = new PostAuthor('username', 'John Doe', 'https://example.com');

From b7951a217a2a63b7c46bcf74de5ebee249591db7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 16:22:41 +0200
Subject: [PATCH 2265/2811] Move down test method

---
 .../framework/tests/Unit/PostAuthorTest.php    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index dc54a225051..a60620861fb 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -279,15 +279,6 @@ public function testToArrayMethodReturnsArrayRepresentationOfAuthor()
         ], $author->toArray());
     }
 
-    public function testToArrayMethodSerializesAllData()
-    {
-        $data = $this->exampleData();
-
-        $author = new PostAuthor(...$data);
-
-        $this->assertSame($data, $author->toArray());
-    }
-
     public function testJsonSerializeMethodReturnsArrayRepresentationOfAuthor()
     {
         $author = new PostAuthor('username', 'John Doe', 'https://example.com');
@@ -331,6 +322,15 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
         $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
     }
 
+    public function testToArrayMethodSerializesAllData()
+    {
+        $data = $this->exampleData();
+
+        $author = new PostAuthor(...$data);
+
+        $this->assertSame($data, $author->toArray());
+    }
+
     /**
      * @return array{username: string, name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
      */

From 86b5de9504eaed5bc528152d0ec81fa2823bb15b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 18:24:05 +0200
Subject: [PATCH 2266/2811] Add `$author->getPosts()` method to get all the
 author's posts

---
 .../Features/Blogging/Models/PostAuthor.php   | 14 +++++++++
 .../framework/tests/Unit/PostAuthorTest.php   | 29 +++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index e763ab1f659..10d79fc1bdf 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -7,9 +7,11 @@
 use Hyde\Hyde;
 use Stringable;
 use Hyde\Facades\Author;
+use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Collection;
 use JetBrains\PhpStorm\Deprecated;
 use Hyde\Support\Concerns\Serializable;
+use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
 use function is_string;
@@ -133,6 +135,18 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * Get all posts by this author.
+     *
+     * @return \Hyde\Foundation\Kernel\PageCollection<\Hyde\Pages\MarkdownPost>
+     */
+    public function getPosts(): PageCollection
+    {
+        return MarkdownPost::getLatestPosts()->filter(function (MarkdownPost $post) {
+            return $post->author?->username === $this->username;
+        });
+    }
+
     /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsername(array $data): string
     {
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index a60620861fb..c5832c34b3d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Hyde;
 use Hyde\Facades\Author;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
@@ -331,6 +333,33 @@ public function testToArrayMethodSerializesAllData()
         $this->assertSame($data, $author->toArray());
     }
 
+    public function testGetPostsWithNoPosts()
+    {
+        $author = new PostAuthor('username');
+
+        $this->assertSame([], $author->getPosts()->all());
+    }
+
+    public function testGetPostsReturnsAllPostsByAuthor()
+    {
+        Hyde::pages()->addPage(new MarkdownPost('foo', ['author' => 'username']));
+        Hyde::pages()->addPage(new MarkdownPost('bar', ['author' => 'username']));
+        Hyde::pages()->addPage(new MarkdownPost('baz', ['author' => 'other']));
+        Hyde::pages()->addPage(new MarkdownPost('qux'));
+
+        $author = new PostAuthor('username');
+
+        $this->assertCount(2, $author->getPosts());
+        $this->assertSame('username', $author->getPosts()->first()->author->username);
+        $this->assertSame('username', $author->getPosts()->last()->author->username);
+
+        $this->assertSame('foo', $author->getPosts()->first()->identifier);
+        $this->assertSame('bar', $author->getPosts()->last()->identifier);
+
+        $this->assertEquals($author, $author->getPosts()->first()->author);
+        $this->assertEquals($author, $author->getPosts()->last()->author);
+    }
+
     /**
      * @return array{username: string, name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
      */

From b3f9af6362964153fe504aab4a818bab5934651f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 18:26:10 +0200
Subject: [PATCH 2267/2811] Rename helper method to be clearer

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 10d79fc1bdf..343109e3b66 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -100,7 +100,7 @@ public static function getOrCreate(string|array $data): static
         }
 
         return new static(...array_merge([
-            'username' => static::findUsername($data),
+            'username' => static::findUsernameFromData($data),
         ], $data));
     }
 
@@ -148,7 +148,7 @@ public function getPosts(): PageCollection
     }
 
     /** @param array{username?: string, name?: string, website?: string} $data */
-    protected static function findUsername(array $data): string
+    protected static function findUsernameFromData(array $data): string
     {
         return $data['username'] ?? $data['name'] ?? 'Guest';
     }

From 5fb193eea80fe4e57ea8edbb575a1f06c245ac63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 18:32:30 +0200
Subject: [PATCH 2268/2811] Merge `getOrCreate` method into the `get` method

---
 .../Internal/LoadYamlConfiguration.php        |  2 +-
 .../Factories/BlogPostDataFactory.php         |  2 +-
 .../Features/Blogging/Models/PostAuthor.php   | 25 ++++++++-------
 .../framework/tests/Unit/PostAuthorTest.php   | 32 +++++++++----------
 4 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index f1976f8f788..5285d6bca7c 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -64,7 +64,7 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            return [$username => PostAuthor::getOrCreate($author)];
+            return [$username => PostAuthor::get($author)];
         });
     }
 }
diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 161477a98d9..983a97258b8 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -91,7 +91,7 @@ protected function makeDate(): ?DateString
     protected function makeAuthor(): ?PostAuthor
     {
         if ($this->getMatter('author')) {
-            return PostAuthor::getOrCreate($this->getMatter('author'));
+            return PostAuthor::get($this->getMatter('author'));
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 343109e3b66..14272106b96 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -89,25 +89,28 @@ public function __construct(string $username, ?string $name = null, ?string $web
     }
 
     /**
-     * Dynamically get or create an author based on a username string or front matter array.
+     * Get the author by their username, or create a new instance with the supplied data.
      *
-     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
+     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $usernameOrData
      */
-    public static function getOrCreate(string|array $data): static
+    public static function get(string|array $usernameOrData): static
     {
-        if (is_string($data)) {
-            return static::get($data);
+        if (is_string($usernameOrData)) {
+            if (static::all()->has($usernameOrData)) {
+                return static::all()->get($usernameOrData);
+            }
+
+            return static::fromArray(['username' => $usernameOrData]);
         }
 
-        return new static(...array_merge([
-            'username' => static::findUsernameFromData($data),
-        ], $data));
+        return static::fromArray($usernameOrData);
     }
 
-    /** Get an Author from the config, or create it with the username. */
-    public static function get(string $username): static
+    protected static function fromArray(array $data): static
     {
-        return static::all()->get($username) ?? Author::create($username);
+        return new static(...array_merge([
+            'username' => static::findUsernameFromData($data),
+        ], $data));
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index c5832c34b3d..16c832ed7bb 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -78,11 +78,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate()
+    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetHelper()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate($data);
+        $author = PostAuthor::get($data);
 
         $this->assertSame($data['username'], $author->username);
         $this->assertSame($data['name'], $author->name);
@@ -92,11 +92,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelper()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::get([
             'username' => $data['username'],
             'name' => $data['name'],
             'website' => $data['website'],
@@ -110,11 +110,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate
         $this->assertEmpty($author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutUsername()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelperWithoutUsername()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::get([
             'name' => $data['name'],
             'website' => $data['website'],
         ]);
@@ -124,11 +124,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate
         $this->assertSame($data['website'], $author->website);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutAnyNames()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelperWithoutAnyNames()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::get([
             'website' => $data['website'],
         ]);
 
@@ -160,24 +160,24 @@ public function testCreateMethodAcceptsAllParameters()
         $this->assertSame('https://example.com', $author->website);
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
+    public function testGetHelperMethodCreatesNewAuthorModelFromString()
     {
-        $author = PostAuthor::getOrCreate('foo');
+        $author = PostAuthor::get('foo');
         $this->assertEquals($author, new PostAuthor('foo'));
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
+    public function testGetHelperMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
             Author::create('foo', 'bar'),
         ]);
 
-        $this->assertEquals(PostAuthor::getOrCreate('foo'), Author::create('foo', 'bar'));
+        $this->assertEquals(PostAuthor::get('foo'), Author::create('foo', 'bar'));
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
+    public function testGetHelperMethodCreatesNewAuthorModelFromArray()
     {
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::get([
             'username' => 'foo',
             'name' => 'bar',
             'website' => 'https://example.com',
@@ -186,9 +186,9 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
         $this->assertEquals($author, Author::create('foo', 'bar', 'https://example.com'));
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
+    public function testGetHelperMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
     {
-        $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), Author::create('foo'));
+        $this->assertEquals(PostAuthor::get(['username' => 'foo']), Author::create('foo'));
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()

From a08fb507574c9ac47f97a06053a19b0a10905b73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:06:12 +0200
Subject: [PATCH 2269/2811] Revert "Merge `getOrCreate` method into the `get`
 method"

This reverts commit 5fb193eea80fe4e57ea8edbb575a1f06c245ac63.
---
 .../Internal/LoadYamlConfiguration.php        |  2 +-
 .../Factories/BlogPostDataFactory.php         |  2 +-
 .../Features/Blogging/Models/PostAuthor.php   | 25 +++++++--------
 .../framework/tests/Unit/PostAuthorTest.php   | 32 +++++++++----------
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 5285d6bca7c..f1976f8f788 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -64,7 +64,7 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            return [$username => PostAuthor::get($author)];
+            return [$username => PostAuthor::getOrCreate($author)];
         });
     }
 }
diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 983a97258b8..161477a98d9 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -91,7 +91,7 @@ protected function makeDate(): ?DateString
     protected function makeAuthor(): ?PostAuthor
     {
         if ($this->getMatter('author')) {
-            return PostAuthor::get($this->getMatter('author'));
+            return PostAuthor::getOrCreate($this->getMatter('author'));
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 14272106b96..343109e3b66 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -89,30 +89,27 @@ public function __construct(string $username, ?string $name = null, ?string $web
     }
 
     /**
-     * Get the author by their username, or create a new instance with the supplied data.
+     * Dynamically get or create an author based on a username string or front matter array.
      *
-     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $usernameOrData
+     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
-    public static function get(string|array $usernameOrData): static
+    public static function getOrCreate(string|array $data): static
     {
-        if (is_string($usernameOrData)) {
-            if (static::all()->has($usernameOrData)) {
-                return static::all()->get($usernameOrData);
-            }
-
-            return static::fromArray(['username' => $usernameOrData]);
+        if (is_string($data)) {
+            return static::get($data);
         }
 
-        return static::fromArray($usernameOrData);
-    }
-
-    protected static function fromArray(array $data): static
-    {
         return new static(...array_merge([
             'username' => static::findUsernameFromData($data),
         ], $data));
     }
 
+    /** Get an Author from the config, or create it with the username. */
+    public static function get(string $username): static
+    {
+        return static::all()->get($username) ?? Author::create($username);
+    }
+
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
     public static function all(): Collection
     {
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 16c832ed7bb..c5832c34b3d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -78,11 +78,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetHelper()
+    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::get($data);
+        $author = PostAuthor::getOrCreate($data);
 
         $this->assertSame($data['username'], $author->username);
         $this->assertSame($data['name'], $author->name);
@@ -92,11 +92,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetHelper()
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelper()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::get([
+        $author = PostAuthor::getOrCreate([
             'username' => $data['username'],
             'name' => $data['name'],
             'website' => $data['website'],
@@ -110,11 +110,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelper()
         $this->assertEmpty($author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelperWithoutUsername()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutUsername()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::get([
+        $author = PostAuthor::getOrCreate([
             'name' => $data['name'],
             'website' => $data['website'],
         ]);
@@ -124,11 +124,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelperWi
         $this->assertSame($data['website'], $author->website);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetHelperWithoutAnyNames()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutAnyNames()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::get([
+        $author = PostAuthor::getOrCreate([
             'website' => $data['website'],
         ]);
 
@@ -160,24 +160,24 @@ public function testCreateMethodAcceptsAllParameters()
         $this->assertSame('https://example.com', $author->website);
     }
 
-    public function testGetHelperMethodCreatesNewAuthorModelFromString()
+    public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
     {
-        $author = PostAuthor::get('foo');
+        $author = PostAuthor::getOrCreate('foo');
         $this->assertEquals($author, new PostAuthor('foo'));
     }
 
-    public function testGetHelperMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
+    public function testGetOrCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
             Author::create('foo', 'bar'),
         ]);
 
-        $this->assertEquals(PostAuthor::get('foo'), Author::create('foo', 'bar'));
+        $this->assertEquals(PostAuthor::getOrCreate('foo'), Author::create('foo', 'bar'));
     }
 
-    public function testGetHelperMethodCreatesNewAuthorModelFromArray()
+    public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
     {
-        $author = PostAuthor::get([
+        $author = PostAuthor::getOrCreate([
             'username' => 'foo',
             'name' => 'bar',
             'website' => 'https://example.com',
@@ -186,9 +186,9 @@ public function testGetHelperMethodCreatesNewAuthorModelFromArray()
         $this->assertEquals($author, Author::create('foo', 'bar', 'https://example.com'));
     }
 
-    public function testGetHelperMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
+    public function testGetOrCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
     {
-        $this->assertEquals(PostAuthor::get(['username' => 'foo']), Author::create('foo'));
+        $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), Author::create('foo'));
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()

From 3f8e6a3cb06a55e3d39ec1716ea3d585095b1de1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:22:08 +0200
Subject: [PATCH 2270/2811] Split out creator methods

https://claude.ai/chat/d82c5409-76af-4cf4-b88b-fdd74edd7728
---
 .../Features/Blogging/Models/PostAuthor.php      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 343109e3b66..ed2e88740ac 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -89,25 +89,23 @@ public function __construct(string $username, ?string $name = null, ?string $web
     }
 
     /**
-     * Dynamically get or create an author based on a username string or front matter array.
+     * Create an author from the given data.
      *
      * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
-    public static function getOrCreate(string|array $data): static
+    public static function create(string|array $data): static
     {
-        if (is_string($data)) {
-            return static::get($data);
-        }
-
         return new static(...array_merge([
             'username' => static::findUsernameFromData($data),
         ], $data));
     }
 
-    /** Get an Author from the config, or create it with the username. */
-    public static function get(string $username): static
+    /**
+     * Get an author by the given username, or null if not found.
+     */
+    public static function get(string $username): ?static
     {
-        return static::all()->get($username) ?? Author::create($username);
+        return static::all()->get($username);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */

From bef60ad0f1349dc82170ea42052db64be312f200 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:22:10 +0200
Subject: [PATCH 2271/2811] Revert "Split out creator methods"

This reverts commit 3f8e6a3cb06a55e3d39ec1716ea3d585095b1de1.
---
 .../Features/Blogging/Models/PostAuthor.php      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index ed2e88740ac..343109e3b66 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -89,23 +89,25 @@ public function __construct(string $username, ?string $name = null, ?string $web
     }
 
     /**
-     * Create an author from the given data.
+     * Dynamically get or create an author based on a username string or front matter array.
      *
      * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
-    public static function create(string|array $data): static
+    public static function getOrCreate(string|array $data): static
     {
+        if (is_string($data)) {
+            return static::get($data);
+        }
+
         return new static(...array_merge([
             'username' => static::findUsernameFromData($data),
         ], $data));
     }
 
-    /**
-     * Get an author by the given username, or null if not found.
-     */
-    public static function get(string $username): ?static
+    /** Get an Author from the config, or create it with the username. */
+    public static function get(string $username): static
     {
-        return static::all()->get($username);
+        return static::all()->get($username) ?? Author::create($username);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */

From 453a6c45e1a7019bdd61690fd4465d56cc3dcdc6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:49:39 +0200
Subject: [PATCH 2272/2811] Remove deprecated `PostAuthor::getName()` method

---
 .../Features/Blogging/Models/PostAuthor.php        | 10 ----------
 packages/framework/tests/Unit/PostAuthorTest.php   | 14 --------------
 2 files changed, 24 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 343109e3b66..665279ba2cd 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -9,7 +9,6 @@
 use Hyde\Facades\Author;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Collection;
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
@@ -126,15 +125,6 @@ public function toArray(): array
         return array_filter($this->automaticallySerialize());
     }
 
-    /**
-     * @deprecated This is not needed as the name property can be accessed directly.
-     */
-    #[Deprecated(reason: 'Use the name property instead.', replacement: '%class%->name')]
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
     /**
      * Get all posts by this author.
      *
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index cc5611e2a05..cd7a9258785 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -249,20 +249,6 @@ public function testGetMethodReturnsNewAuthorIfUsernameNotFoundInConfig()
         $this->assertSame('foo', $author->username);
     }
 
-    public function testGetNameHelperReturnsNameIfSet()
-    {
-        $author = new PostAuthor('username', 'John Doe');
-
-        $this->assertSame('John Doe', $author->getName());
-    }
-
-    public function testGetNameHelperReturnsUsernameIfNameIsNotSet()
-    {
-        $author = new PostAuthor('username');
-
-        $this->assertSame('username', $author->getName());
-    }
-
     public function testNameIsSetToUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');

From af6fa4317ba8a05cb01bfbe579af75f25e736bfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:51:11 +0200
Subject: [PATCH 2273/2811] Add todo

See https://github.com/hydephp/develop/pull/1782/files#r1667091929
---
 .../Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
index 028b9f24e1a..1cf190c13c7 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/AuthorSchema.php
@@ -15,7 +15,7 @@ interface AuthorSchema extends BlogPostSchema
         'name' => 'string',
         'username' => 'string',
         'website' => 'string',
-        'bio' => 'string',
+        'bio' => 'string', // Todo: Support 'biography' as well?
         'avatar' => 'string',
         'socials' => 'array<string, string>',
     ];

From f6a4725f367727e7c7e85797953594fe6b8e4f15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:53:16 +0200
Subject: [PATCH 2274/2811] Use a collect call instead of new collection

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 2c0b34f9618..5f630e0ef20 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -8,6 +8,8 @@
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
+use function collect;
+
 /**
  * Contains accessors and containers for data stored in the kernel.
  *
@@ -35,7 +37,7 @@ public function authors(): Collection
             return $this->authors;
         }
 
-        $config = new Collection(Config::getArray('hyde.authors', []));
+        $config = collect(Config::getArray('hyde.authors', []));
 
         if ($config->isEmpty()) {
             // Defer setting the authors property until the next try.

From d4f7d95b2af1e2718599c465642840803421ede9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:53:28 +0200
Subject: [PATCH 2275/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f0044b91a63..7a9cb87ec89 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,7 @@ This serves two purposes:
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
 - **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
 - **Breaking:** Renamed class `DataCollections` to `DataCollection`. For more information, see below.
+- **Breaking:** The `hyde.authors` config setting should now be keyed by the usernames. For more information, see below.
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -29,6 +30,7 @@ This serves two purposes:
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
+- Overhauled the blog post author feature in https://github.com/hydephp/develop/pull/1782
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749
 - The `hasFeature` method on the Hyde facade and HydeKernel now only accepts a Feature enum value instead of a string for its parameter.
@@ -47,6 +49,7 @@ This serves two purposes:
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
 - Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
 - Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now returning `null` if no base URL is set in https://github.com/hydephp/develop/pull/1760
+- Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 
 ### Fixed
@@ -146,6 +149,23 @@ Of course, if you have disabled any of the features, do not include them in the
 
 ## General impact
 
+### Post Author changes
+
+This release makes major improvements into the usability and design of the blog post author feature.
+
+Here is the full list of changes:
+
+- Breaking: The `hyde.authors` config setting should now be keyed by the usernames
+- Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`)
+- Feature: We now support setting authors in the YAML configuration! Fixes `#1719`
+- Feature: Added a `$author->getPosts()` method to get all author's posts
+- Feature: Authors now can also have custom biographies and social media links
+- The PostAuthor class is now Arrayable and JsonSerializable
+- The collection of site authors are now stored in the HydeKernel
+- Authors can additionally be accessed through `Hyde::authors()`
+
+For more information, see https://github.com/hydephp/develop/pull/1782
+
 ### Documentation search page changes
 
 The documentation search page and search index have been changed to be generated as `InMemoryPages` instead of a post-build task.

From 63675c78262bf6b3f9aca642928a18ab201e73d0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 6 Jul 2024 20:37:32 +0200
Subject: [PATCH 2276/2811] Remove nullable modifier from author name as it is
 now never null

Cherry picks https://github.com/hydephp/develop/pull/1794/commits/f389ef4fecd10a4ca05dcf82fc9043abbaa92585 as it was lost when merging the branch into 2.x
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 665279ba2cd..d28d271e370 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -34,7 +34,7 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * The display name of the author.
      */
-    public readonly ?string $name;
+    public readonly string $name;
 
     /**
      * The author's website URL.

From 48beca6b440ba06b92c4c19ee338da8cb4cc9e0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:38:20 +0200
Subject: [PATCH 2277/2811] Add missing array keys to mocked config values

Updates to use the new format specified in https://github.com/hydephp/develop/pull/1782
---
 packages/framework/tests/Feature/HydeKernelTest.php    |  2 +-
 .../tests/Feature/PostsAuthorIntegrationTest.php       |  4 ++--
 packages/framework/tests/Unit/PostAuthorTest.php       | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 5ab1a1025a1..f0838709ff9 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -575,7 +575,7 @@ public function testAuthorsPropertyIsNotWrittenUntilThereAreAuthorsDefined()
 
         $this->assertEmpty($kernel->authors()->toArray());
 
-        Config::set('hyde.authors', [Author::create('foo')]);
+        Config::set('hyde.authors', ['foo' => Author::create('foo')]);
 
         $this->assertNotEmpty($kernel->authors()->toArray());
     }
diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index a8e1a134eae..2157efb43ec 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -51,7 +51,7 @@ public function testCreatePostWithDefinedAuthorWithName()
         $this->createPostFile('post-with-defined-author-with-name', 'named_author');
 
         Config::set('hyde.authors', [
-            Author::create('named_author', 'Test Author', null),
+            'named_author' => Author::create('named_author', 'Test Author', null),
         ]);
 
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
@@ -72,7 +72,7 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
         $this->createPostFile('post-with-defined-author-with-name', 'test_author_with_website');
 
         Config::set('hyde.authors', [
-            Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
+            'test_author_with_website' => Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 448be1837ed..b4c03887784 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -169,7 +169,7 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
     public function testGetOrCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
-            Author::create('foo', 'bar'),
+            'foo' => Author::create('foo', 'bar'),
         ]);
 
         $this->assertEquals(PostAuthor::getOrCreate('foo'), Author::create('foo', 'bar'));
@@ -203,7 +203,7 @@ public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
     public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
     {
         Config::set('hyde.authors', [
-            Author::create('foo'),
+            'foo' => Author::create('foo'),
         ]);
 
         $authors = PostAuthor::all();
@@ -216,8 +216,8 @@ public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
     public function testMultipleAuthorsCanBeDefinedInConfig()
     {
         Config::set('hyde.authors', [
-            Author::create('foo'),
-            Author::create('bar'),
+            'foo' => Author::create('foo'),
+            'bar' => Author::create('bar'),
         ]);
 
         $authors = PostAuthor::all();
@@ -231,7 +231,7 @@ public function testMultipleAuthorsCanBeDefinedInConfig()
     public function testGetMethodReturnsConfigDefinedAuthorByUsername()
     {
         Config::set('hyde.authors', [
-            Author::create('foo', 'bar'),
+            'foo' => Author::create('foo', 'bar'),
         ]);
         $author = PostAuthor::get('foo');
 

From b2dcd7a0713a693705581516d7a0d810443176be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:26:40 +0200
Subject: [PATCH 2278/2811] Clarify test name and expect the described result

---
 packages/framework/tests/Feature/HydeKernelTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index f0838709ff9..39cb505427f 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -580,13 +580,13 @@ public function testAuthorsPropertyIsNotWrittenUntilThereAreAuthorsDefined()
         $this->assertNotEmpty($kernel->authors()->toArray());
     }
 
-    public function testAuthorsUseTheConfigArrayKey()
+    public function testAuthorsUseTheConfigArrayKeyAsTheUsername()
     {
         Config::set('hyde.authors', ['foo' => Author::create('bar')]);
 
         $this->assertSame([
             'foo' => [
-                'username' => 'bar',
+                'username' => 'foo',
                 'name' => 'bar',
             ],
         ], Hyde::authors()->toArray());

From f43a3aff3305e100d922054733400b564204d625 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:33:01 +0200
Subject: [PATCH 2279/2811] Remove readonly modifier from author username

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index d28d271e370..b1a53ecf5c9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -29,7 +29,7 @@ class PostAuthor implements Stringable, SerializableContract
      *
      * This is the key used to find authors in the config.
      */
-    public readonly string $username;
+    public string $username;
 
     /**
      * The display name of the author.

From 26be37d82f80ac5d1229420129f28008d995d284 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:33:30 +0200
Subject: [PATCH 2280/2811] Update parser to tap author to set the username to
 the array key

Normalizes the API
---
 packages/framework/src/Foundation/Concerns/HasKernelData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 5f630e0ef20..fd632c8c9fa 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -50,7 +50,7 @@ public function authors(): Collection
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
         return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
-            return [$username ?: $author->username => $author];
+            return [$username => tap($author, fn (PostAuthor $author) => $author->username = $username)];
         });
     }
 }

From fb12b6bca77e51031d54bdd97b0491e2230da15b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:36:47 +0200
Subject: [PATCH 2281/2811] Throw an InvalidArgumentException when missing the
 array key

Enforces the new state. Consider adding a BadConfigurationException?
---
 .../src/Foundation/Concerns/HasKernelData.php         |  5 +++++
 packages/framework/tests/Feature/HydeKernelTest.php   | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index fd632c8c9fa..37254e0903f 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Facades\Config;
+use InvalidArgumentException;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
@@ -50,6 +51,10 @@ public function authors(): Collection
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
         return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
+            if (! $username) {
+                throw new InvalidArgumentException('Author username cannot be empty. Did you forget to set the author\'s array key?');
+            }
+
             return [$username => tap($author, fn (PostAuthor $author) => $author->username = $username)];
         });
     }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 39cb505427f..8c1470b4206 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Author;
 use Hyde\Facades\Features;
+use InvalidArgumentException;
 use Hyde\Foundation\Facades\Pages;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
@@ -591,6 +592,16 @@ public function testAuthorsUseTheConfigArrayKeyAsTheUsername()
             ],
         ], Hyde::authors()->toArray());
     }
+
+    public function testAuthorsThrowsExceptionWhenUsernameIsNotSet()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Author username cannot be empty. Did you forget to set the author\'s array key?');
+
+        Config::set('hyde.authors', ['' => Author::create('foo')]);
+
+        Hyde::authors();
+    }
 }
 
 class CallableClass

From fbfa5075fc798da6ed33a3575d9da88b8bc3836c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:44:46 +0200
Subject: [PATCH 2282/2811] Deprecate the `Author::create` method's `$username`
 parameter

This leads to duplication which gets confusing
---
 packages/framework/src/Facades/Author.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 16976036fb5..62e488cc7cd 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Facades;
 
+use JetBrains\PhpStorm\Deprecated;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Illuminate\Support\Collection;
 
@@ -24,7 +25,7 @@ class Author
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      */
-    public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor
+    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website);
     }

From a1b9cfe5a1f7dbb1d664548bd434060d7f502b55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:48:19 +0200
Subject: [PATCH 2283/2811] Update the `Author::create` method to support all
 parameters

---
 packages/framework/src/Facades/Author.php        |  4 ++--
 packages/framework/tests/Unit/PostAuthorTest.php | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 62e488cc7cd..6740fafbe68 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -25,9 +25,9 @@ class Author
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      */
-    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null): PostAuthor
+    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, array $socials = []): PostAuthor
     {
-        return new PostAuthor($username, $name, $website);
+        return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index b4c03887784..c730e70cbc2 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -151,7 +151,7 @@ public function testCreateMethodCreatesNewAuthorModel()
         $this->assertInstanceOf(PostAuthor::class, $author);
     }
 
-    public function testCreateMethodAcceptsAllParameters()
+    public function testCreateMethodAcceptsExtraParameters()
     {
         $author = Author::create('foo', 'bar', 'https://example.com');
 
@@ -160,6 +160,18 @@ public function testCreateMethodAcceptsAllParameters()
         $this->assertSame('https://example.com', $author->website);
     }
 
+    public function testCreateMethodAcceptsAllParameters()
+    {
+        $author = Author::create(...$this->exampleData());
+
+        $this->assertSame('mr_hyde', $author->username);
+        $this->assertSame('Mr. Hyde', $author->name);
+        $this->assertSame('https://HydePHP.com', $author->website);
+        $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
+        $this->assertSame('mr_hyde.png', $author->avatar);
+        $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author->socials);
+    }
+
     public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
     {
         $author = PostAuthor::getOrCreate('foo');

From f5a66ee03dc66595a2bf4025e705e6fdc4d84659 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:51:19 +0200
Subject: [PATCH 2284/2811] Create InvalidConfigurationException.php

---
 .../Exceptions/InvalidConfigurationException.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
new file mode 100644
index 00000000000..80c29c2d50e
--- /dev/null
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Exceptions;
+
+class InvalidConfigurationException
+{
+    //
+}

From 26aeea731a9c24373aa6361c95f14d9c275847c4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:51:39 +0200
Subject: [PATCH 2285/2811] Update InvalidConfigurationException to extend
 InvalidArgumentException

---
 .../Framework/Exceptions/InvalidConfigurationException.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 80c29c2d50e..9394b39eb3d 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Exceptions;
 
-class InvalidConfigurationException
+use InvalidArgumentException;
+
+class InvalidConfigurationException extends InvalidArgumentException
 {
     //
 }

From 1bdda780691181c2dfb45a559a2e80862d2cb123 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:52:06 +0200
Subject: [PATCH 2286/2811] Throw custom InvalidConfigurationException

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 37254e0903f..ae23b49f1a9 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -5,9 +5,9 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Facades\Config;
-use InvalidArgumentException;
 use Illuminate\Support\Collection;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 use function collect;
 
@@ -52,7 +52,7 @@ protected function parseConfigurationAuthors(Collection $authors): Collection
     {
         return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
             if (! $username) {
-                throw new InvalidArgumentException('Author username cannot be empty. Did you forget to set the author\'s array key?');
+                throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?');
             }
 
             return [$username => tap($author, fn (PostAuthor $author) => $author->username = $username)];

From fb029e1888d875b0fd863147fdf4ec9d10c9b721 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:02:07 +0200
Subject: [PATCH 2287/2811] Override constructor

---
 .../Framework/Exceptions/InvalidConfigurationException.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 9394b39eb3d..ee57bc39266 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -8,5 +8,8 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    //
+    public function __construct(string $message = 'Invalid configuration detected.')
+    {
+        parent::__construct($message);
+    }
 }

From 771d84db2a53599eb44a143cc5c1852d1294b056 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:08:10 +0200
Subject: [PATCH 2288/2811] Create initial logic to find the errored config
 line

---
 .../InvalidConfigurationException.php         | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index ee57bc39266..b27f960bd70 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -8,8 +8,32 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.')
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
     {
+        if ($namespace && $key) {
+            [$file, $line] = $this->findConfigLine($namespace, $key);
+
+            if ($file && $line) {
+                $this->file = $file;
+                $this->line = $line;
+            }
+        }
+
         parent::__construct($message);
     }
+
+    protected function findConfigLine(string $namespace, string $key): array
+    {
+        $file = "config/$namespace.php";
+        $contents = file_get_contents(base_path($file));
+        $lines = explode("\n", $contents);
+
+        foreach ($lines as $line => $content) {
+            if (str_contains($content, "'$key' =>")) {
+                break;
+            }
+        }
+
+        return [$file, $line + 1];
+    }
 }

From e7748bc11267f5b9520e301cfe5dbf2db78f5153 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:08:45 +0200
Subject: [PATCH 2289/2811] Replace break with early return

---
 .../Framework/Exceptions/InvalidConfigurationException.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index b27f960bd70..25589bffae9 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -30,10 +30,10 @@ protected function findConfigLine(string $namespace, string $key): array
 
         foreach ($lines as $line => $content) {
             if (str_contains($content, "'$key' =>")) {
-                break;
+                return [$file, $line + 1];
             }
         }
 
-        return [$file, $line + 1];
+        return [null, null];
     }
 }

From 5f414e53b999b35dd53cbdd2b4b8eff4951adf75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:13:51 +0200
Subject: [PATCH 2290/2811] Add spacing

---
 .../src/Framework/Exceptions/InvalidConfigurationException.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 25589bffae9..771a368b7fb 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -26,6 +26,7 @@ protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";
         $contents = file_get_contents(base_path($file));
+
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {

From e57592ac6d0bc18da87a8560b6d4f03ba91b8fbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:13:57 +0200
Subject: [PATCH 2291/2811] Annotate return types

---
 .../src/Framework/Exceptions/InvalidConfigurationException.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 771a368b7fb..d556429cc2b 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -22,6 +22,7 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
+    /** @return array{string|null, int|null} */
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";

From d343f0ab3f8404b4b2f3dfec1cb8d8da700e76aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:16:38 +0200
Subject: [PATCH 2292/2811] Remove graceful handling as internal developer
 needs to use proper paths

If we can't find the line, it's probably because an internal/package developer made a mistake
---
 .../Exceptions/InvalidConfigurationException.php      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index d556429cc2b..ef1b907e62c 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -13,10 +13,8 @@ public function __construct(string $message = 'Invalid configuration detected.',
         if ($namespace && $key) {
             [$file, $line] = $this->findConfigLine($namespace, $key);
 
-            if ($file && $line) {
-                $this->file = $file;
-                $this->line = $line;
-            }
+            $this->file = $file;
+            $this->line = $line;
         }
 
         parent::__construct($message);
@@ -27,15 +25,14 @@ protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";
         $contents = file_get_contents(base_path($file));
-
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
             if (str_contains($content, "'$key' =>")) {
-                return [$file, $line + 1];
+                break;
             }
         }
 
-        return [null, null];
+        return [$file, $line + 1];
     }
 }

From 901b0588c9939e07024060588774d3d7f9ad48b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:21:37 +0200
Subject: [PATCH 2293/2811] Cleanup and improve the line finder code

---
 .../Exceptions/InvalidConfigurationException.php   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index ef1b907e62c..8a6f7722492 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,8 +4,13 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
+use function assert;
+use function explode;
+use function realpath;
+
 class InvalidConfigurationException extends InvalidArgumentException
 {
     public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
@@ -20,11 +25,11 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
-    /** @return array{string|null, int|null} */
+    /** @return array{string, int} */
     protected function findConfigLine(string $namespace, string $key): array
     {
-        $file = "config/$namespace.php";
-        $contents = file_get_contents(base_path($file));
+        $file = realpath("config/$namespace.php");
+        $contents = Filesystem::getContents($file);
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
@@ -33,6 +38,9 @@ protected function findConfigLine(string $namespace, string $key): array
             }
         }
 
+        assert($file !== false);
+        assert(isset($line));
+
         return [$file, $line + 1];
     }
 }

From 56306f7f8568fe8dab9824d6a91324b62bfbec6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:22:09 +0200
Subject: [PATCH 2294/2811] Inline local variables

---
 .../Framework/Exceptions/InvalidConfigurationException.php   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 8a6f7722492..1ea898af91f 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -16,10 +16,7 @@ class InvalidConfigurationException extends InvalidArgumentException
     public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
     {
         if ($namespace && $key) {
-            [$file, $line] = $this->findConfigLine($namespace, $key);
-
-            $this->file = $file;
-            $this->line = $line;
+            [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
         }
 
         parent::__construct($message);

From ba2a3526389e0ed890ed6aead1f5b07535539cc1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:23:46 +0200
Subject: [PATCH 2295/2811] Mark helper as experimental

---
 .../Framework/Exceptions/InvalidConfigurationException.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 1ea898af91f..67a13ba331c 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -22,7 +22,11 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
-    /** @return array{string, int} */
+    /**
+     * @experimental Please report any issues with this method to the authors at https://github.com/hydephp/develop/issues
+     *
+     * @return array{string, int}
+     */
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = realpath("config/$namespace.php");

From 46d0bd2820f506aecca3b77601bbd30dc7e96329 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:25:43 +0200
Subject: [PATCH 2296/2811] Clarify trait scope

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index ae23b49f1a9..fcfb45a3539 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -12,7 +12,7 @@
 use function collect;
 
 /**
- * Contains accessors and containers for data stored in the kernel.
+ * Contains accessors and containers for general data stored in the kernel.
  *
  * @internal Single-use trait for the HydeKernel class.
  *

From 4b369ecb3de08569afe73f0110096a5d8ed1c2f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:26:26 +0200
Subject: [PATCH 2297/2811] Specify the exception location

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index fcfb45a3539..5868dc39a67 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -52,7 +52,7 @@ protected function parseConfigurationAuthors(Collection $authors): Collection
     {
         return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
             if (! $username) {
-                throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?');
+                throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
 
             return [$username => tap($author, fn (PostAuthor $author) => $author->username = $username)];

From bb566a650991705d293723eb05a25578d8200c70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:51:19 +0200
Subject: [PATCH 2298/2811] Create InvalidConfigurationException.php

---
 .../Exceptions/InvalidConfigurationException.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
new file mode 100644
index 00000000000..80c29c2d50e
--- /dev/null
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Exceptions;
+
+class InvalidConfigurationException
+{
+    //
+}

From ce7e96f8cfb32ce9fd5f88480b63edc7f0605fa8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 14:51:39 +0200
Subject: [PATCH 2299/2811] Update InvalidConfigurationException to extend
 InvalidArgumentException

---
 .../Framework/Exceptions/InvalidConfigurationException.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 80c29c2d50e..9394b39eb3d 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Exceptions;
 
-class InvalidConfigurationException
+use InvalidArgumentException;
+
+class InvalidConfigurationException extends InvalidArgumentException
 {
     //
 }

From 11dde57d1ed53158c4d26e13b2ff513f2f86c56d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:02:07 +0200
Subject: [PATCH 2300/2811] Override constructor

---
 .../Framework/Exceptions/InvalidConfigurationException.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 9394b39eb3d..ee57bc39266 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -8,5 +8,8 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    //
+    public function __construct(string $message = 'Invalid configuration detected.')
+    {
+        parent::__construct($message);
+    }
 }

From 5947a85ba314bd7c2402f649ba9690b3a9731312 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:08:10 +0200
Subject: [PATCH 2301/2811] Create initial logic to find the errored config
 line

---
 .../InvalidConfigurationException.php         | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index ee57bc39266..b27f960bd70 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -8,8 +8,32 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.')
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
     {
+        if ($namespace && $key) {
+            [$file, $line] = $this->findConfigLine($namespace, $key);
+
+            if ($file && $line) {
+                $this->file = $file;
+                $this->line = $line;
+            }
+        }
+
         parent::__construct($message);
     }
+
+    protected function findConfigLine(string $namespace, string $key): array
+    {
+        $file = "config/$namespace.php";
+        $contents = file_get_contents(base_path($file));
+        $lines = explode("\n", $contents);
+
+        foreach ($lines as $line => $content) {
+            if (str_contains($content, "'$key' =>")) {
+                break;
+            }
+        }
+
+        return [$file, $line + 1];
+    }
 }

From 65d113c577b8d1189d5c0657c10ff7a406932e54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:08:45 +0200
Subject: [PATCH 2302/2811] Replace break with early return

---
 .../Framework/Exceptions/InvalidConfigurationException.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index b27f960bd70..25589bffae9 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -30,10 +30,10 @@ protected function findConfigLine(string $namespace, string $key): array
 
         foreach ($lines as $line => $content) {
             if (str_contains($content, "'$key' =>")) {
-                break;
+                return [$file, $line + 1];
             }
         }
 
-        return [$file, $line + 1];
+        return [null, null];
     }
 }

From 0cf1c4d473d83f0395245ef2c99a9b2626b58e6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:13:51 +0200
Subject: [PATCH 2303/2811] Add spacing

---
 .../src/Framework/Exceptions/InvalidConfigurationException.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 25589bffae9..771a368b7fb 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -26,6 +26,7 @@ protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";
         $contents = file_get_contents(base_path($file));
+
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {

From 4b751931ada809467324ad0192d93948c6327f38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:13:57 +0200
Subject: [PATCH 2304/2811] Annotate return types

---
 .../src/Framework/Exceptions/InvalidConfigurationException.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 771a368b7fb..d556429cc2b 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -22,6 +22,7 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
+    /** @return array{string|null, int|null} */
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";

From 52895b9f3884a20c2c7dbad62682532b8f308c72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:16:38 +0200
Subject: [PATCH 2305/2811] Remove graceful handling as internal developer
 needs to use proper paths

If we can't find the line, it's probably because an internal/package developer made a mistake
---
 .../Exceptions/InvalidConfigurationException.php      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index d556429cc2b..ef1b907e62c 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -13,10 +13,8 @@ public function __construct(string $message = 'Invalid configuration detected.',
         if ($namespace && $key) {
             [$file, $line] = $this->findConfigLine($namespace, $key);
 
-            if ($file && $line) {
-                $this->file = $file;
-                $this->line = $line;
-            }
+            $this->file = $file;
+            $this->line = $line;
         }
 
         parent::__construct($message);
@@ -27,15 +25,14 @@ protected function findConfigLine(string $namespace, string $key): array
     {
         $file = "config/$namespace.php";
         $contents = file_get_contents(base_path($file));
-
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
             if (str_contains($content, "'$key' =>")) {
-                return [$file, $line + 1];
+                break;
             }
         }
 
-        return [null, null];
+        return [$file, $line + 1];
     }
 }

From 9d7cf76e5f02850d91158c1b0555472475ccb7dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:21:37 +0200
Subject: [PATCH 2306/2811] Cleanup and improve the line finder code

---
 .../Exceptions/InvalidConfigurationException.php   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index ef1b907e62c..8a6f7722492 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,8 +4,13 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
+use function assert;
+use function explode;
+use function realpath;
+
 class InvalidConfigurationException extends InvalidArgumentException
 {
     public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
@@ -20,11 +25,11 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
-    /** @return array{string|null, int|null} */
+    /** @return array{string, int} */
     protected function findConfigLine(string $namespace, string $key): array
     {
-        $file = "config/$namespace.php";
-        $contents = file_get_contents(base_path($file));
+        $file = realpath("config/$namespace.php");
+        $contents = Filesystem::getContents($file);
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
@@ -33,6 +38,9 @@ protected function findConfigLine(string $namespace, string $key): array
             }
         }
 
+        assert($file !== false);
+        assert(isset($line));
+
         return [$file, $line + 1];
     }
 }

From f2c667d4c56d1d5e27838e323bd0bfdc575ec590 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:22:09 +0200
Subject: [PATCH 2307/2811] Inline local variables

---
 .../Framework/Exceptions/InvalidConfigurationException.php   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 8a6f7722492..1ea898af91f 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -16,10 +16,7 @@ class InvalidConfigurationException extends InvalidArgumentException
     public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
     {
         if ($namespace && $key) {
-            [$file, $line] = $this->findConfigLine($namespace, $key);
-
-            $this->file = $file;
-            $this->line = $line;
+            [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
         }
 
         parent::__construct($message);

From dc495d1ff20bb35803ffc4a1e12f236995d756ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:23:46 +0200
Subject: [PATCH 2308/2811] Mark helper as experimental

---
 .../Framework/Exceptions/InvalidConfigurationException.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 1ea898af91f..67a13ba331c 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -22,7 +22,11 @@ public function __construct(string $message = 'Invalid configuration detected.',
         parent::__construct($message);
     }
 
-    /** @return array{string, int} */
+    /**
+     * @experimental Please report any issues with this method to the authors at https://github.com/hydephp/develop/issues
+     *
+     * @return array{string, int}
+     */
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = realpath("config/$namespace.php");

From 7e912288494f294095c323e229150316ccde7442 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:31:41 +0200
Subject: [PATCH 2309/2811] Test covers InvalidConfigurationException

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 38be357f085..8b6e94e5831 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -19,6 +19,7 @@
  * @covers \Hyde\Framework\Exceptions\FileNotFoundException
  * @covers \Hyde\Framework\Exceptions\RouteNotFoundException
  * @covers \Hyde\Framework\Exceptions\UnsupportedPageTypeException
+ * @covers \Hyde\Framework\Exceptions\InvalidConfigurationException
  * @covers \Hyde\Framework\Exceptions\ParseException
  */
 class CustomExceptionsTest extends UnitTestCase

From 07fc54208f09aeadad6a149485a9c451ddb71c80 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:35:28 +0200
Subject: [PATCH 2310/2811] Generate tests with Claude

---
 .../tests/Unit/CustomExceptionsTest.php       | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 8b6e94e5831..f2a1bd38b77 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -13,6 +13,7 @@
 use Hyde\Framework\Exceptions\ParseException;
 use RuntimeException;
 use Exception;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 /**
  * @covers \Hyde\Framework\Exceptions\FileConflictException
@@ -174,4 +175,55 @@ public function testParseExceptionWithPrevious()
         $this->assertSame("Invalid Markdown in file: 'example.md' (Parsing error)", $exception->getMessage());
         $this->assertSame($previous, $exception->getPrevious());
     }
+
+    public function testInvalidConfigurationExceptionWithDefaultMessage()
+    {
+        $exception = new InvalidConfigurationException();
+
+        $this->assertSame('Invalid configuration detected.', $exception->getMessage());
+    }
+
+    public function testInvalidConfigurationExceptionWithCustomMessage()
+    {
+        $exception = new InvalidConfigurationException('Custom error message.');
+
+        $this->assertSame('Custom error message.', $exception->getMessage());
+    }
+
+    public function testInvalidConfigurationExceptionWithNamespaceAndKey()
+    {
+        $exception = new InvalidConfigurationException('Invalid configuration.', 'app', 'debug');
+
+        $this->assertSame('Invalid configuration.', $exception->getMessage());
+        $this->assertFileExists($exception->file);
+        $this->assertIsInt($exception->line);
+    }
+
+    public function testInvalidConfigurationExceptionWithNonExistentNamespace()
+    {
+        $this->expectException(\AssertionError::class);
+        new InvalidConfigurationException('Invalid configuration.', 'non_existent', 'key');
+    }
+
+    public function testInvalidConfigurationExceptionWithNonExistentKey()
+    {
+        $this->expectException(\AssertionError::class);
+        new InvalidConfigurationException('Invalid configuration.', 'app', 'non_existent_key');
+    }
+
+    public function testInvalidConfigurationExceptionFindConfigLine()
+    {
+        $exception = new class('Invalid configuration.', 'app', 'debug') extends InvalidConfigurationException {
+            public function exposedFindConfigLine(string $namespace, string $key): array
+            {
+                return $this->findConfigLine($namespace, $key);
+            }
+        };
+
+        [$file, $line] = $exception->exposedFindConfigLine('app', 'debug');
+
+        $this->assertFileExists($file);
+        $this->assertIsInt($line);
+        $this->assertGreaterThan(0, $line);
+    }
 }

From 29234ce757bf150f3593a745eccf562ebec6bfe1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:37:24 +0200
Subject: [PATCH 2311/2811] Fix up generated tests

---
 .../framework/tests/Unit/CustomExceptionsTest.php     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index f2a1bd38b77..fad2c5e664e 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -192,11 +192,14 @@ public function testInvalidConfigurationExceptionWithCustomMessage()
 
     public function testInvalidConfigurationExceptionWithNamespaceAndKey()
     {
-        $exception = new InvalidConfigurationException('Invalid configuration.', 'app', 'debug');
+        $exception = new InvalidConfigurationException('Invalid configuration.', 'hyde', 'name');
 
         $this->assertSame('Invalid configuration.', $exception->getMessage());
-        $this->assertFileExists($exception->file);
-        $this->assertIsInt($exception->line);
+        $this->assertFileExists($exception->getFile());
+        $this->assertIsInt($exception->getLine());
+
+        $this->assertStringContainsString('config'.DIRECTORY_SEPARATOR.'hyde.php', $exception->getFile());
+        $this->assertGreaterThan(0, $exception->getLine());
     }
 
     public function testInvalidConfigurationExceptionWithNonExistentNamespace()
@@ -213,7 +216,7 @@ public function testInvalidConfigurationExceptionWithNonExistentKey()
 
     public function testInvalidConfigurationExceptionFindConfigLine()
     {
-        $exception = new class('Invalid configuration.', 'app', 'debug') extends InvalidConfigurationException {
+        $exception = new class('Invalid configuration.', 'hyde', 'name') extends InvalidConfigurationException {
             public function exposedFindConfigLine(string $namespace, string $key): array
             {
                 return $this->findConfigLine($namespace, $key);

From 3083c7f0230da7f42dd449c2e05691a59f8e9be9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:37:37 +0200
Subject: [PATCH 2312/2811] Remove unnecessary tests

---
 .../tests/Unit/CustomExceptionsTest.php       | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index fad2c5e664e..dc6e9b460f7 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -201,32 +201,4 @@ public function testInvalidConfigurationExceptionWithNamespaceAndKey()
         $this->assertStringContainsString('config'.DIRECTORY_SEPARATOR.'hyde.php', $exception->getFile());
         $this->assertGreaterThan(0, $exception->getLine());
     }
-
-    public function testInvalidConfigurationExceptionWithNonExistentNamespace()
-    {
-        $this->expectException(\AssertionError::class);
-        new InvalidConfigurationException('Invalid configuration.', 'non_existent', 'key');
-    }
-
-    public function testInvalidConfigurationExceptionWithNonExistentKey()
-    {
-        $this->expectException(\AssertionError::class);
-        new InvalidConfigurationException('Invalid configuration.', 'app', 'non_existent_key');
-    }
-
-    public function testInvalidConfigurationExceptionFindConfigLine()
-    {
-        $exception = new class('Invalid configuration.', 'hyde', 'name') extends InvalidConfigurationException {
-            public function exposedFindConfigLine(string $namespace, string $key): array
-            {
-                return $this->findConfigLine($namespace, $key);
-            }
-        };
-
-        [$file, $line] = $exception->exposedFindConfigLine('app', 'debug');
-
-        $this->assertFileExists($file);
-        $this->assertIsInt($line);
-        $this->assertGreaterThan(0, $line);
-    }
 }

From f8c884797c198665aa71058caa927d6c4a0b4055 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:39:40 +0200
Subject: [PATCH 2313/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7a9cb87ec89..3a3f3fc2eb5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,6 +13,7 @@ This serves two purposes:
 - You can now specify navigation priorities by adding a numeric prefix to the source file names in https://github.com/hydephp/develop/pull/1709
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 - Added a new `\Hyde\Framework\Exceptions\ParseException` exception class to handle parsing exceptions in data collection files in https://github.com/hydephp/develop/pull/1732
+- Added a new `\Hyde\Framework\Exceptions\InvalidConfigurationException` exception class to handle invalid configuration exceptions in https://github.com/hydephp/develop/pull/1799
 - The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
 
 ### Changed

From 8250a7992f8f6c4d82f5b63a07d99fe1513be6f6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 15:25:43 +0200
Subject: [PATCH 2314/2811] Clarify trait scope

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 5f630e0ef20..ccd14e60a72 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -11,7 +11,7 @@
 use function collect;
 
 /**
- * Contains accessors and containers for data stored in the kernel.
+ * Contains accessors and containers for general data stored in the kernel.
  *
  * @internal Single-use trait for the HydeKernel class.
  *

From 49f3be18b178e7bcd60e0c5df187e13abd02b870 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 16:16:37 +0200
Subject: [PATCH 2315/2811] Add missing generics closing tag

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index b1a53ecf5c9..2bca30114b7 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -59,7 +59,7 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * The author's social media links/handles.
      *
-     * @var array<string, string
+     * @var array<string, string>
      *
      * @example ['twitter' => 'mr_hyde'] ($service => $handle)
      */

From 89a3eb7bb7c97854fa49baf5f6f3847d51a9c3c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 16:18:17 +0200
Subject: [PATCH 2316/2811] Make the socials array nullable to match other
 properties in class

---
 packages/framework/src/Facades/Author.php                   | 2 +-
 .../src/Framework/Features/Blogging/Models/PostAuthor.php   | 6 +++---
 .../tests/Feature/YamlConfigurationFeatureTest.php          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 6740fafbe68..c989e9df35b 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -25,7 +25,7 @@ class Author
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      */
-    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, array $socials = []): PostAuthor
+    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 2bca30114b7..cb4f673df01 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -59,11 +59,11 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * The author's social media links/handles.
      *
-     * @var array<string, string>
+     * @var ?array<string, string>
      *
      * @example ['twitter' => 'mr_hyde'] ($service => $handle)
      */
-    public readonly array $socials;
+    public readonly ?array $socials;
 
     /**
      * Construct a new Post Author object.
@@ -77,7 +77,7 @@ class PostAuthor implements Stringable, SerializableContract
      * @param  string|null  $avatar
      * @param  array<string, string>  $socials
      */
-    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, array $socials = [])
+    public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
         $this->username = $username;
         $this->name = $name ?? $username;
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index a4f0ada878d..41d657de0c8 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -435,7 +435,7 @@ public function testCanSetAuthorsInTheYamlConfig()
 
         $this->assertSame(['twitter' => '@user1', 'github' => 'user1'], $authors['username1']->socials);
         $this->assertSame(['twitter' => '@user2', 'github' => 'user2'], $authors['username2']->socials);
-        $this->assertSame([], $authors['test']->socials);
+        $this->assertSame(null, $authors['test']->socials);
     }
 
     protected function runBootstrappers(?array $withMergedConfig = null): void

From 239e67c06e54c6db820851d48903b5eebcd7f466 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 16:20:53 +0200
Subject: [PATCH 2317/2811] Document the deprecation reason

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

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index c989e9df35b..ebb9e86aed0 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -25,7 +25,7 @@ class Author
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      */
-    public static function create(#[Deprecated]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
+    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }

From 156461988740bdb6d366f27c1f352663e60fad5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:03:52 +0200
Subject: [PATCH 2318/2811] Make deprecated parameter optional

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

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index ebb9e86aed0..ae9b0fca2f4 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -25,7 +25,7 @@ class Author
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      */
-    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
+    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = '', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }

From 93b812a1489c174f241f977a29443a39320157f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:10:51 +0200
Subject: [PATCH 2319/2811] Document remaining constructor properties

---
 packages/framework/src/Facades/Author.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index ae9b0fca2f4..6ad831e39be 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -24,6 +24,9 @@ class Author
      * @param  string  $username  The username of the author. This is the key used to find authors in the config.
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
+     * @param  string|null  $bio  The author's optional biography text. Markdown supported.
+     * @param  string|null  $avatar  The author's optional avatar image. Supports both image names and full URIs.
+     * @param  array<string, string>|null  $socials  The author's optional social media links/handles.
      */
     public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = '', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {

From 9c7c4f4016d37ea46d25e7c3213c9c453143ff9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:16:15 +0200
Subject: [PATCH 2320/2811] Add name identifiers to the author fields in the
 config example

---
 config/hyde.php                    | 6 +++---
 packages/framework/config/hyde.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 9d6301a1bf7..bc76bb9151c 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -285,9 +285,9 @@
 
     'authors' => [
         'mr_hyde' => Author::create(
-            'mr_hyde', // Required username
-            'Mr. Hyde', // Optional display name
-            'https://hydephp.com' // Optional website URL
+            username: 'mr_hyde', // Required username
+            name: 'Mr. Hyde', // Optional display name
+            website: 'https://hydephp.com' // Optional website URL
         ),
     ],
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 9d6301a1bf7..bc76bb9151c 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -285,9 +285,9 @@
 
     'authors' => [
         'mr_hyde' => Author::create(
-            'mr_hyde', // Required username
-            'Mr. Hyde', // Optional display name
-            'https://hydephp.com' // Optional website URL
+            username: 'mr_hyde', // Required username
+            name: 'Mr. Hyde', // Optional display name
+            website: 'https://hydephp.com' // Optional website URL
         ),
     ],
 

From 4500a5fcd63f6b1db8d6d84b82091c4664bb05d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:18:26 +0200
Subject: [PATCH 2321/2811] Fill in all the author fields in the config example

---
 config/hyde.php                    | 8 +++++++-
 packages/framework/config/hyde.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index bc76bb9151c..adf4a49079f 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -287,7 +287,13 @@
         'mr_hyde' => Author::create(
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
-            website: 'https://hydephp.com' // Optional website URL
+            website: 'https://hydephp.com', // Optional website URL
+            bio: 'The mysterious author of HydePHP', // Optional biography
+            avatar: 'avatar.png', // Optional avatar image (media asset/URI)
+            socials: [ // Optional social media links
+                'twitter' => 'HydeFramework',
+                'github' => 'hydephp',
+            ],
         ),
     ],
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index bc76bb9151c..adf4a49079f 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -287,7 +287,13 @@
         'mr_hyde' => Author::create(
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
-            website: 'https://hydephp.com' // Optional website URL
+            website: 'https://hydephp.com', // Optional website URL
+            bio: 'The mysterious author of HydePHP', // Optional biography
+            avatar: 'avatar.png', // Optional avatar image (media asset/URI)
+            socials: [ // Optional social media links
+                'twitter' => 'HydeFramework',
+                'github' => 'hydephp',
+            ],
         ),
     ],
 

From b0d9115d10460e62760a054f49a1b8d68a95d237 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:19:01 +0200
Subject: [PATCH 2322/2811] Comment out extra author fields

---
 config/hyde.php                    | 12 ++++++------
 packages/framework/config/hyde.php | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index adf4a49079f..fc9a0d5963d 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -288,12 +288,12 @@
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
-            bio: 'The mysterious author of HydePHP', // Optional biography
-            avatar: 'avatar.png', // Optional avatar image (media asset/URI)
-            socials: [ // Optional social media links
-                'twitter' => 'HydeFramework',
-                'github' => 'hydephp',
-            ],
+            // bio: 'The mysterious author of HydePHP', // Optional biography
+            // avatar: 'avatar.png', // Optional avatar image (media asset/URI)
+            // socials: [ // Optional social media links
+            //     'twitter' => 'HydeFramework',
+            //     'github' => 'hydephp',
+            // ],
         ),
     ],
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index adf4a49079f..fc9a0d5963d 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -288,12 +288,12 @@
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
-            bio: 'The mysterious author of HydePHP', // Optional biography
-            avatar: 'avatar.png', // Optional avatar image (media asset/URI)
-            socials: [ // Optional social media links
-                'twitter' => 'HydeFramework',
-                'github' => 'hydephp',
-            ],
+            // bio: 'The mysterious author of HydePHP', // Optional biography
+            // avatar: 'avatar.png', // Optional avatar image (media asset/URI)
+            // socials: [ // Optional social media links
+            //     'twitter' => 'HydeFramework',
+            //     'github' => 'hydephp',
+            // ],
         ),
     ],
 

From a6263d1897d598b8982739b0cc3ed6d1e8ca90e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:24:31 +0200
Subject: [PATCH 2323/2811] Improve the author configuration documentation

---
 config/hyde.php                    | 6 +++---
 packages/framework/config/hyde.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index fc9a0d5963d..a7c8f86c8d9 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -277,9 +277,9 @@
     | However, it's tedious to have to add those to each and every
     | post you make, and keeping them updated is even harder.
     |
-    | Here you can add predefined authors. When writing posts,
-    | just specify the username in the front matter, and the
-    | rest of the data will be pulled from a matching entry.
+    | To solve this problem, you can add predefined authors with this setting.
+    | When writing posts just specify the author's username (the array key).
+    | Hyde will pull the matching data from here and fill in the blanks.
     |
     */
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index fc9a0d5963d..a7c8f86c8d9 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -277,9 +277,9 @@
     | However, it's tedious to have to add those to each and every
     | post you make, and keeping them updated is even harder.
     |
-    | Here you can add predefined authors. When writing posts,
-    | just specify the username in the front matter, and the
-    | rest of the data will be pulled from a matching entry.
+    | To solve this problem, you can add predefined authors with this setting.
+    | When writing posts just specify the author's username (the array key).
+    | Hyde will pull the matching data from here and fill in the blanks.
     |
     */
 

From 960989cdfdaea89802f3e61a534516a7bed7146c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:27:55 +0200
Subject: [PATCH 2324/2811] Improve inline author config documentation

---
 config/hyde.php                    | 10 +++++++---
 packages/framework/config/hyde.php | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index a7c8f86c8d9..a3302f2d63d 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -285,12 +285,16 @@
 
     'authors' => [
         'mr_hyde' => Author::create(
+            // The following settings are used in the default blog post template.
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
-            // bio: 'The mysterious author of HydePHP', // Optional biography
-            // avatar: 'avatar.png', // Optional avatar image (media asset/URI)
-            // socials: [ // Optional social media links
+
+            // The following settings are not used in the bundled templates,
+            // but you can use them in your own custom views, for example.
+            // bio: 'The mysterious author of HydePHP',
+            // avatar: 'avatar.png',
+            // socials: [
             //     'twitter' => 'HydeFramework',
             //     'github' => 'hydephp',
             // ],
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index a7c8f86c8d9..a3302f2d63d 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -285,12 +285,16 @@
 
     'authors' => [
         'mr_hyde' => Author::create(
+            // The following settings are used in the default blog post template.
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
-            // bio: 'The mysterious author of HydePHP', // Optional biography
-            // avatar: 'avatar.png', // Optional avatar image (media asset/URI)
-            // socials: [ // Optional social media links
+
+            // The following settings are not used in the bundled templates,
+            // but you can use them in your own custom views, for example.
+            // bio: 'The mysterious author of HydePHP',
+            // avatar: 'avatar.png',
+            // socials: [
             //     'twitter' => 'HydeFramework',
             //     'github' => 'hydephp',
             // ],

From c780fc8d964fc929f4fad409da62a9f3efea4191 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:30:11 +0200
Subject: [PATCH 2325/2811] Return new static

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index cb4f673df01..b69bed14d14 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -106,7 +106,7 @@ public static function getOrCreate(string|array $data): static
     /** Get an Author from the config, or create it with the username. */
     public static function get(string $username): static
     {
-        return static::all()->get($username) ?? Author::create($username);
+        return static::all()->get($username) ?? new static($username);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */

From 8030c1885b509979551655282be4926c4d721e98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:35:03 +0200
Subject: [PATCH 2326/2811] Test against new post author

---
 packages/framework/tests/Unit/PostAuthorTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index c730e70cbc2..6736e8992a4 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -222,7 +222,7 @@ public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(Author::create('foo'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo'), $authors->first());
     }
 
     public function testMultipleAuthorsCanBeDefinedInConfig()
@@ -236,8 +236,8 @@ public function testMultipleAuthorsCanBeDefinedInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(2, $authors);
-        $this->assertEquals(Author::create('foo'), $authors->first());
-        $this->assertEquals(Author::create('bar'), $authors->last());
+        $this->assertEquals(new PostAuthor('foo'), $authors->first());
+        $this->assertEquals(new PostAuthor('bar'), $authors->last());
     }
 
     public function testGetMethodReturnsConfigDefinedAuthorByUsername()

From 4ade2141e4a157965dc409b713c372e14bcb29b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:37:22 +0200
Subject: [PATCH 2327/2811] Annotate the closure return

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

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 5868dc39a67..d1c15f8e3cc 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -55,7 +55,7 @@ protected function parseConfigurationAuthors(Collection $authors): Collection
                 throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
 
-            return [$username => tap($author, fn (PostAuthor $author) => $author->username = $username)];
+            return [$username => tap($author, fn (PostAuthor $author): string => $author->username = $username)];
         });
     }
 }

From dd082623b4d557d83ab6e69304314f072cd33913 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:38:39 +0200
Subject: [PATCH 2328/2811] Remove unused use statement

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index b69bed14d14..4e2d7ef57a2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Stringable;
-use Hyde\Facades\Author;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Collection;
 use Hyde\Support\Concerns\Serializable;

From 5639b1bb97bf20df1283dd205ebb7c2ad8bc7578 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:44:47 +0200
Subject: [PATCH 2329/2811] Set default blank username to guest

Matches name coalesce chain
---
 packages/framework/src/Facades/Author.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 6ad831e39be..9cdd1594d2a 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -28,7 +28,7 @@ class Author
      * @param  string|null  $avatar  The author's optional avatar image. Supports both image names and full URIs.
      * @param  array<string, string>|null  $socials  The author's optional social media links/handles.
      */
-    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = '', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
+    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = 'guest', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }

From e9731c9cae3df91558cc8a7aefe4a8776bb08671 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:45:11 +0200
Subject: [PATCH 2330/2811] Test can define author with no data in config

---
 packages/framework/tests/Unit/PostAuthorTest.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 6736e8992a4..b5e197f5d76 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -203,6 +203,19 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUser
         $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), Author::create('foo'));
     }
 
+    public function testCanDefineAuthorWithNoDataInConfig()
+    {
+        Config::set('hyde.authors', [
+            'foo' => Author::create(),
+        ]);
+
+        $authors = PostAuthor::all();
+
+        $this->assertInstanceOf(Collection::class, $authors);
+        $this->assertCount(1, $authors);
+        $this->assertEquals(new PostAuthor('foo', 'guest'), $authors->first());
+    }
+
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
     {
         Config::set('hyde.authors', []);

From ac9f5f74b5087c02648e3e68f138f749b22124eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:46:19 +0200
Subject: [PATCH 2331/2811] Capitalize the username when making the name
 fallback

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php | 3 ++-
 packages/framework/tests/Feature/HydeKernelTest.php       | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php          | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4e2d7ef57a2..64d97a685e1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,6 +12,7 @@
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
+use function ucfirst;
 use function is_string;
 use function array_merge;
 use function array_filter;
@@ -79,7 +80,7 @@ class PostAuthor implements Stringable, SerializableContract
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
         $this->username = $username;
-        $this->name = $name ?? $username;
+        $this->name = $name ?? ucfirst($username);
         $this->website = $website;
         $this->bio = $bio;
         $this->avatar = $avatar;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 8c1470b4206..7f586ae15a3 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -588,7 +588,7 @@ public function testAuthorsUseTheConfigArrayKeyAsTheUsername()
         $this->assertSame([
             'foo' => [
                 'username' => 'foo',
-                'name' => 'bar',
+                'name' => 'Bar',
             ],
         ], Hyde::authors()->toArray());
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index b5e197f5d76..78938e0793d 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -141,7 +141,7 @@ public function testNameIsSetToUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');
 
-        $this->assertSame('foo', $author->name);
+        $this->assertSame('Foo', $author->name);
     }
 
     public function testCreateMethodCreatesNewAuthorModel()
@@ -213,7 +213,7 @@ public function testCanDefineAuthorWithNoDataInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo', 'guest'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo', 'Guest'), $authors->first());
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
@@ -278,7 +278,7 @@ public function testNameIsSetToUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');
 
-        $this->assertSame('username', $author->name);
+        $this->assertSame('Username', $author->name);
     }
 
     public function testToStringHelperReturnsTheName()
@@ -339,7 +339,7 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
     {
         $author = new PostAuthor('username', null, null);
 
-        $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
+        $this->assertSame('{"username":"username","name":"Username"}', $author->toJson());
     }
 
     public function testToArrayMethodSerializesAllData()

From 94588e42e95e51d3afc65452a90e449b8a9b5b4c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:54:51 +0200
Subject: [PATCH 2332/2811] Revert "Capitalize the username when making the
 name fallback"

This reverts commit ac9f5f74b5087c02648e3e68f138f749b22124eb.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php | 3 +--
 packages/framework/tests/Feature/HydeKernelTest.php       | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php          | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 64d97a685e1..4e2d7ef57a2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,7 +12,6 @@
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function ucfirst;
 use function is_string;
 use function array_merge;
 use function array_filter;
@@ -80,7 +79,7 @@ class PostAuthor implements Stringable, SerializableContract
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
         $this->username = $username;
-        $this->name = $name ?? ucfirst($username);
+        $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
         $this->avatar = $avatar;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 7f586ae15a3..8c1470b4206 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -588,7 +588,7 @@ public function testAuthorsUseTheConfigArrayKeyAsTheUsername()
         $this->assertSame([
             'foo' => [
                 'username' => 'foo',
-                'name' => 'Bar',
+                'name' => 'bar',
             ],
         ], Hyde::authors()->toArray());
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 78938e0793d..b5e197f5d76 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -141,7 +141,7 @@ public function testNameIsSetToUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');
 
-        $this->assertSame('Foo', $author->name);
+        $this->assertSame('foo', $author->name);
     }
 
     public function testCreateMethodCreatesNewAuthorModel()
@@ -213,7 +213,7 @@ public function testCanDefineAuthorWithNoDataInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo', 'Guest'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo', 'guest'), $authors->first());
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
@@ -278,7 +278,7 @@ public function testNameIsSetToUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');
 
-        $this->assertSame('Username', $author->name);
+        $this->assertSame('username', $author->name);
     }
 
     public function testToStringHelperReturnsTheName()
@@ -339,7 +339,7 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
     {
         $author = new PostAuthor('username', null, null);
 
-        $this->assertSame('{"username":"username","name":"Username"}', $author->toJson());
+        $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
     }
 
     public function testToArrayMethodSerializesAllData()

From aa81aba5da1b4e25615718c96f06add07fba3739 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:54:55 +0200
Subject: [PATCH 2333/2811] Revert "Set default blank username to guest"

This reverts commit 5639b1bb97bf20df1283dd205ebb7c2ad8bc7578.
---
 packages/framework/src/Facades/Author.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 9cdd1594d2a..6ad831e39be 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -28,7 +28,7 @@ class Author
      * @param  string|null  $avatar  The author's optional avatar image. Supports both image names and full URIs.
      * @param  array<string, string>|null  $socials  The author's optional social media links/handles.
      */
-    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = 'guest', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
+    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = '', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
     }

From 8ea1b911b1f9f7dbbe32b4dc796d494d3be46d8c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 18:55:20 +0200
Subject: [PATCH 2334/2811] Update PostAuthorTest.php

---
 packages/framework/tests/Unit/PostAuthorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index b5e197f5d76..1d1215faf1c 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -213,7 +213,7 @@ public function testCanDefineAuthorWithNoDataInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo', 'guest'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo', ''), $authors->first());
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()

From b9235dce1ff3cdb3818b01045da249b168a7229f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 19:09:36 +0200
Subject: [PATCH 2335/2811] Create a new and improved Author facade system

Fixes https://github.com/hydephp/develop/issues/1797 by decoupling the facade method from instantiating an element we need to tap with new data, and where the facade should not allow usernames, but the object must require it. A big BC break, but the most elegant way I can think of accomplishing this. We might also be able to reduce overlapping logic from the Yaml author configuration loader.
---
 config/hyde.php                               |  1 -
 packages/framework/config/hyde.php            |  1 -
 packages/framework/src/Facades/Author.php     | 11 ++--
 .../src/Foundation/Concerns/HasKernelData.php |  6 +-
 .../Features/Blogging/Models/PostAuthor.php   |  2 +-
 .../Feature/PostsAuthorIntegrationTest.php    |  4 +-
 .../tests/Unit/Facades/AuthorTest.php         | 40 ++++++++++--
 .../framework/tests/Unit/PostAuthorTest.php   | 62 +++++++++++--------
 8 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index a3302f2d63d..0898d2a80f4 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -286,7 +286,6 @@
     'authors' => [
         'mr_hyde' => Author::create(
             // The following settings are used in the default blog post template.
-            username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index a3302f2d63d..0898d2a80f4 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -286,7 +286,6 @@
     'authors' => [
         'mr_hyde' => Author::create(
             // The following settings are used in the default blog post template.
-            username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com', // Optional website URL
 
diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 6ad831e39be..5949b49f001 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Facades;
 
-use JetBrains\PhpStorm\Deprecated;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Illuminate\Support\Collection;
 
@@ -16,21 +15,21 @@
 class Author
 {
     /**
-     * Construct a new Post Author. For Hyde to discover this author,
-     * you must call this method from your hyde.php config file.
+     * Configuration helper method to define a new blog post author, with better IDE support.
+     *
+     * The returned array will then be used by the framework to create a new PostAuthor instance.
      *
      * @see https://hydephp.com/docs/1.x/customization.html#authors
      *
-     * @param  string  $username  The username of the author. This is the key used to find authors in the config.
      * @param  string|null  $name  The optional display name of the author, leave blank to use the username.
      * @param  string|null  $website  The author's optional website URL. Website, Twitter, etc.
      * @param  string|null  $bio  The author's optional biography text. Markdown supported.
      * @param  string|null  $avatar  The author's optional avatar image. Supports both image names and full URIs.
      * @param  array<string, string>|null  $socials  The author's optional social media links/handles.
      */
-    public static function create(#[Deprecated(reason: 'The username is set by the array key in the configuration file')]string $username = '', ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): PostAuthor
+    public static function create(?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null): array
     {
-        return new PostAuthor($username, $name, $website, $bio, $avatar, $socials);
+        return compact('name', 'website', 'bio', 'avatar', 'socials');
     }
 
     /**
diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index d1c15f8e3cc..02123db1800 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -50,12 +50,14 @@ public function authors(): Collection
 
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
-        return $authors->mapWithKeys(function (PostAuthor $author, string $username): array {
+        return $authors->mapWithKeys(function (array $author, string $username): array {
             if (! $username) {
                 throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
 
-            return [$username => tap($author, fn (PostAuthor $author): string => $author->username = $username)];
+            $author['username'] = $username;
+
+            return [$username => PostAuthor::getOrCreate($author)];
         });
     }
 }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4e2d7ef57a2..be167e00b7d 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -28,7 +28,7 @@ class PostAuthor implements Stringable, SerializableContract
      *
      * This is the key used to find authors in the config.
      */
-    public string $username;
+    public readonly string $username;
 
     /**
      * The display name of the author.
diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 2157efb43ec..ce5d49b5879 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -51,7 +51,7 @@ public function testCreatePostWithDefinedAuthorWithName()
         $this->createPostFile('post-with-defined-author-with-name', 'named_author');
 
         Config::set('hyde.authors', [
-            'named_author' => Author::create('named_author', 'Test Author', null),
+            'named_author' => Author::create('Test Author', null),
         ]);
 
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
@@ -72,7 +72,7 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
         $this->createPostFile('post-with-defined-author-with-name', 'test_author_with_website');
 
         Config::set('hyde.authors', [
-            'test_author_with_website' => Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
+            'test_author_with_website' => Author::create('Test Author', 'https://example.org'),
         ]);
 
         $this->artisan('rebuild _posts/post-with-defined-author-with-name.md')->assertExitCode(0);
diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index f89502369a2..b15dec9a55f 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -15,19 +15,49 @@ class AuthorTest extends TestCase
 {
     public function testCreate()
     {
-        $author = Author::create('john_doe', 'John Doe', 'https://johndoe.com');
+        $author = Author::create('John Doe', 'https://johndoe.com');
 
-        $this->assertSame('john_doe', $author->username);
-        $this->assertSame('John Doe', $author->name);
-        $this->assertSame('https://johndoe.com', $author->website);
+        $this->assertIsArray($author);
+        $this->assertFalse(isset($author['username']));
+        $this->assertSame('John Doe', $author['name']);
+        $this->assertSame('https://johndoe.com', $author['website']);
 
-        $this->assertEquals(Author::create('foo', null, null), Author::create('foo'));
+        $this->assertSame([
+            'name' => 'John Doe',
+            'website' => 'https://johndoe.com',
+            'bio' => null,
+            'avatar' => null,
+            'socials' => null,
+        ], $author);
+
+        $this->assertEquals(Author::create('foo'), Author::create('foo'));
+    }
+
+    public function testCreateWithAllParameters()
+    {
+        $author = Author::create('John Doe', 'https://johndoe.com', 'A cool guy', 'https://johndoe.com/avatar.jpg', [
+            'twitter' => 'johndoe',
+            'github' => 'johndoe',
+        ]);
+
+        $this->assertSame([
+            'name' => 'John Doe',
+            'website' => 'https://johndoe.com',
+            'bio' => 'A cool guy',
+            'avatar' => 'https://johndoe.com/avatar.jpg',
+            'socials' => [
+                'twitter' => 'johndoe',
+                'github' => 'johndoe',
+            ],
+        ], $author);
     }
 
     public function testGet()
     {
         $author = Author::get('mr_hyde');
 
+        $this->assertInstanceOf(PostAuthor::class, $author);
+
         $this->assertSame('mr_hyde', $author->username);
         $this->assertSame('Mr. Hyde', $author->name);
         $this->assertSame('https://hydephp.com', $author->website);
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 1d1215faf1c..e86fb73d0e8 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -45,7 +45,7 @@ public function testCanCreateAuthorModelWithDetails()
 
     public function testCanCreateAuthorModelWithFullDetails()
     {
-        [$username, $name, $website, $bio, $avatar, $socials] = array_values($this->exampleData());
+        [$username, $name, $website, $bio, $avatar, $socials] = array_values($this->exampleDataWithUsername());
 
         $author = new PostAuthor(
             username: $username,
@@ -66,7 +66,7 @@ public function testCanCreateAuthorModelWithFullDetails()
 
     public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
     {
-        $data = $this->exampleData();
+        $data = $this->exampleDataWithUsername();
 
         $author = new PostAuthor(...$data);
 
@@ -84,7 +84,6 @@ public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate
 
         $author = PostAuthor::getOrCreate($data);
 
-        $this->assertSame($data['username'], $author->username);
         $this->assertSame($data['name'], $author->name);
         $this->assertSame($data['website'], $author->website);
         $this->assertSame($data['bio'], $author->bio);
@@ -97,12 +96,10 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate
         $data = $this->exampleData();
 
         $author = PostAuthor::getOrCreate([
-            'username' => $data['username'],
             'name' => $data['name'],
             'website' => $data['website'],
         ]);
 
-        $this->assertSame($data['username'], $author->username);
         $this->assertSame($data['name'], $author->name);
         $this->assertSame($data['website'], $author->website);
         $this->assertNull($author->bio);
@@ -144,32 +141,38 @@ public function testNameIsSetToUsernameIfNoNameIsProvided()
         $this->assertSame('foo', $author->name);
     }
 
-    public function testCreateMethodCreatesNewAuthorModel()
+    public function testCreateMethodCreatesNewPendingAuthorArray()
     {
         $author = Author::create('foo');
 
-        $this->assertInstanceOf(PostAuthor::class, $author);
+        $this->assertSame([
+            'name' => 'foo',
+            'website' => null,
+            'bio' => null,
+            'avatar' => null,
+            'socials' => null,
+        ], $author);
     }
 
     public function testCreateMethodAcceptsExtraParameters()
     {
-        $author = Author::create('foo', 'bar', 'https://example.com');
+        $author = Author::create('foo', 'https://example.com');
 
-        $this->assertSame('foo', $author->username);
-        $this->assertSame('bar', $author->name);
-        $this->assertSame('https://example.com', $author->website);
+        $this->assertFalse(isset($author['username']));
+        $this->assertSame('foo', $author['name']);
+        $this->assertSame('https://example.com', $author['website']);
     }
 
     public function testCreateMethodAcceptsAllParameters()
     {
         $author = Author::create(...$this->exampleData());
 
-        $this->assertSame('mr_hyde', $author->username);
-        $this->assertSame('Mr. Hyde', $author->name);
-        $this->assertSame('https://HydePHP.com', $author->website);
-        $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author->bio);
-        $this->assertSame('mr_hyde.png', $author->avatar);
-        $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author->socials);
+        $this->assertFalse(isset($author['username']));
+        $this->assertSame('Mr. Hyde', $author['name']);
+        $this->assertSame('https://HydePHP.com', $author['website']);
+        $this->assertSame('A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?', $author['bio']);
+        $this->assertSame('mr_hyde.png', $author['avatar']);
+        $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author['socials']);
     }
 
     public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
@@ -181,10 +184,10 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
     public function testGetOrCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
-            'foo' => Author::create('foo', 'bar'),
+            'foo' => Author::create('bar'),
         ]);
 
-        $this->assertEquals(PostAuthor::getOrCreate('foo'), Author::create('foo', 'bar'));
+        $this->assertEquals(PostAuthor::getOrCreate('foo'), new PostAuthor('foo', 'bar'));
     }
 
     public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
@@ -195,12 +198,12 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
             'website' => 'https://example.com',
         ]);
 
-        $this->assertEquals($author, Author::create('foo', 'bar', 'https://example.com'));
+        $this->assertEquals($author, new PostAuthor('foo', 'bar', 'https://example.com'));
     }
 
     public function testGetOrCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
     {
-        $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), Author::create('foo'));
+        $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), new PostAuthor('foo'));
     }
 
     public function testCanDefineAuthorWithNoDataInConfig()
@@ -213,7 +216,7 @@ public function testCanDefineAuthorWithNoDataInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo', ''), $authors->first());
+        $this->assertEquals(new PostAuthor('foo', 'foo'), $authors->first());
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
@@ -256,7 +259,7 @@ public function testMultipleAuthorsCanBeDefinedInConfig()
     public function testGetMethodReturnsConfigDefinedAuthorByUsername()
     {
         Config::set('hyde.authors', [
-            'foo' => Author::create('foo', 'bar'),
+            'foo' => Author::create('bar'),
         ]);
         $author = PostAuthor::get('foo');
 
@@ -344,7 +347,7 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
 
     public function testToArrayMethodSerializesAllData()
     {
-        $data = $this->exampleData();
+        $data = $this->exampleDataWithUsername();
 
         $author = new PostAuthor(...$data);
 
@@ -379,12 +382,11 @@ public function testGetPostsReturnsAllPostsByAuthor()
     }
 
     /**
-     * @return array{username: string, name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
+     * @return array{name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
      */
     protected function exampleData(): array
     {
         return [
-            'username' => 'mr_hyde',
             'name' => 'Mr. Hyde',
             'website' => 'https://HydePHP.com',
             'bio' => 'A mysterious figure. Is he as evil as he seems? And what did he do with Dr. Jekyll?',
@@ -392,4 +394,12 @@ protected function exampleData(): array
             'socials' => ['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'],
         ];
     }
+
+    /**
+     * @return array{username: string, name: string, website: string, bio: string, avatar: string, socials: array{twitter: string, github: string, custom: string}}
+     */
+    protected function exampleDataWithUsername(): array
+    {
+        return array_merge(['username' => 'mr_hyde'], $this->exampleData());
+    }
 }

From b8dc3a448f411dd9f5c36837944028f809d0cad9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:33:39 +0200
Subject: [PATCH 2336/2811] Update Author getters to return null when username
 is not found

---
 packages/framework/src/Facades/Author.php                 | 5 ++---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php | 8 ++++----
 packages/framework/tests/Unit/PostAuthorTest.php          | 5 ++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 5949b49f001..1b810bb19ee 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -33,10 +33,9 @@ public static function create(?string $name = null, ?string $website = null, ?st
     }
 
     /**
-     * Get a Post Author instance from the config. If no author matching the username is found,
-     * a new Post Author instance will be created with just username supplied to the method.
+     * Get a Post Author instance by username, or null if not found.
      */
-    public static function get(string $username): PostAuthor
+    public static function get(string $username): ?PostAuthor
     {
         return PostAuthor::get($username);
     }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index be167e00b7d..32e599cb85b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
-            return static::get($data);
+            return static::get($data) ?? new static($data);
         }
 
         return new static(...array_merge([
@@ -102,10 +102,10 @@ public static function getOrCreate(string|array $data): static
         ], $data));
     }
 
-    /** Get an Author from the config, or create it with the username. */
-    public static function get(string $username): static
+    /**  Get a Post Author instance by username, or null if not found. */
+    public static function get(string $username): ?static
     {
-        return static::all()->get($username) ?? new static($username);
+        return static::all()->get($username);
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e86fb73d0e8..be1e4892f36 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -268,13 +268,12 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
         $this->assertSame('bar', $author->name);
     }
 
-    public function testGetMethodReturnsNewAuthorIfUsernameNotFoundInConfig()
+    public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
     {
         Config::set('hyde.authors', []);
         $author = PostAuthor::get('foo');
 
-        $this->assertInstanceOf(PostAuthor::class, $author);
-        $this->assertSame('foo', $author->username);
+        $this->assertNull($author);
     }
 
     public function testNameIsSetToUsernameIfNameIsNotSet()

From fabf4040522400826f4a54b90a65183e6c765ca9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:36:30 +0200
Subject: [PATCH 2337/2811] Simplify get or create method logic

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 32e599cb85b..11ca0fe1857 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,8 +93,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data)) {
-            return static::get($data) ?? new static($data);
+        if (is_string($data) && ($author = static::get($data))) {
+            return $author;
         }
 
         return new static(...array_merge([

From 05c52544856a890b2caf27c583e2db5f2f6aa4ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:37:30 +0200
Subject: [PATCH 2338/2811] Revert "Simplify get or create method logic"

This reverts commit fabf4040522400826f4a54b90a65183e6c765ca9.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 11ca0fe1857..32e599cb85b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,8 +93,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data) && ($author = static::get($data))) {
-            return $author;
+        if (is_string($data)) {
+            return static::get($data) ?? new static($data);
         }
 
         return new static(...array_merge([

From 66212b8dfc1983fbfcd6c046f900d1f7d50d31a1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:37:41 +0200
Subject: [PATCH 2339/2811] Reapply "Simplify get or create method logic"

This reverts commit 05c52544856a890b2caf27c583e2db5f2f6aa4ac.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 32e599cb85b..11ca0fe1857 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,8 +93,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data)) {
-            return static::get($data) ?? new static($data);
+        if (is_string($data) && ($author = static::get($data))) {
+            return $author;
         }
 
         return new static(...array_merge([

From a892c1baae0dc92332f4e9f30ca92a457b7824e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:37:54 +0200
Subject: [PATCH 2340/2811] Move assignment out of the condition

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 11ca0fe1857..088d39962af 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,7 +93,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data) && ($author = static::get($data))) {
+        $author = static::get($data);
+        if (is_string($data) && ($author)) {
             return $author;
         }
 

From dca99914df39b03323eef1b5ee7037bebdcb8cd7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:38:02 +0200
Subject: [PATCH 2341/2811] Remove unnecessary parentheses

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 088d39962af..597d3abaaa5 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         $author = static::get($data);
-        if (is_string($data) && ($author)) {
+        if (is_string($data) && $author) {
             return $author;
         }
 

From 65c7dec433bd85e5414baf1df8e089fad1da969f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:38:53 +0200
Subject: [PATCH 2342/2811] New ternary logic

---
 .../Framework/Features/Blogging/Models/PostAuthor.php  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 597d3abaaa5..16bdc627d5a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,9 +93,13 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        $author = static::get($data);
-        if (is_string($data) && $author) {
-            return $author;
+        if (is_string($data)) {
+            $author = static::get($data);
+            if ($author !== null) {
+                return $author;
+            } else {
+                $data = ['username' => $data];
+            }
         }
 
         return new static(...array_merge([

From 43dda0b877eb89aaed3b8fd9bbab38504593e6b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:38:58 +0200
Subject: [PATCH 2343/2811] Revert "New ternary logic"

This reverts commit 65c7dec433bd85e5414baf1df8e089fad1da969f.
---
 .../Framework/Features/Blogging/Models/PostAuthor.php  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 16bdc627d5a..597d3abaaa5 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,13 +93,9 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data)) {
-            $author = static::get($data);
-            if ($author !== null) {
-                return $author;
-            } else {
-                $data = ['username' => $data];
-            }
+        $author = static::get($data);
+        if (is_string($data) && $author) {
+            return $author;
         }
 
         return new static(...array_merge([

From 7872a233ce8bb1017ca9226fd4af3cd1b7337509 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:39:01 +0200
Subject: [PATCH 2344/2811] Revert "Remove unnecessary parentheses"

This reverts commit dca99914df39b03323eef1b5ee7037bebdcb8cd7.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 597d3abaaa5..088d39962af 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         $author = static::get($data);
-        if (is_string($data) && $author) {
+        if (is_string($data) && ($author)) {
             return $author;
         }
 

From 5eb61bec63ab238dd64c95208d3584832a8e8f7d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:39:07 +0200
Subject: [PATCH 2345/2811] Revert "Move assignment out of the condition"

This reverts commit a892c1baae0dc92332f4e9f30ca92a457b7824e2.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 088d39962af..11ca0fe1857 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,8 +93,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        $author = static::get($data);
-        if (is_string($data) && ($author)) {
+        if (is_string($data) && ($author = static::get($data))) {
             return $author;
         }
 

From e41853c337b13612c13d1a569a6834ee86bcd49a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:39:09 +0200
Subject: [PATCH 2346/2811] Revert "Reapply "Simplify get or create method
 logic""

This reverts commit 66212b8dfc1983fbfcd6c046f900d1f7d50d31a1.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 11ca0fe1857..32e599cb85b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -93,8 +93,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
      */
     public static function getOrCreate(string|array $data): static
     {
-        if (is_string($data) && ($author = static::get($data))) {
-            return $author;
+        if (is_string($data)) {
+            return static::get($data) ?? new static($data);
         }
 
         return new static(...array_merge([

From 53f61cf338efd5dbf10172a8abc3918c62a07d57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:39:41 +0200
Subject: [PATCH 2347/2811] Fall back to method retry with username

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 32e599cb85b..4290d18b392 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
-            return static::get($data) ?? new static($data);
+            return static::get($data) ?? static::getOrCreate(['username' => $data]);
         }
 
         return new static(...array_merge([

From d9e7a8bd3500e73a50da544356b9e616d0d36927 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:39:51 +0200
Subject: [PATCH 2348/2811] Revert "Fall back to method retry with username"

This reverts commit 53f61cf338efd5dbf10172a8abc3918c62a07d57.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4290d18b392..32e599cb85b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
-            return static::get($data) ?? static::getOrCreate(['username' => $data]);
+            return static::get($data) ?? new static($data);
         }
 
         return new static(...array_merge([

From 473a625321792fec907f1035c252651d46533d8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:41:01 +0200
Subject: [PATCH 2349/2811] Reapply "Fall back to method retry with username"

This reverts commit d9e7a8bd3500e73a50da544356b9e616d0d36927.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 32e599cb85b..4290d18b392 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -94,7 +94,7 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
-            return static::get($data) ?? new static($data);
+            return static::get($data) ?? static::getOrCreate(['username' => $data]);
         }
 
         return new static(...array_merge([

From 57ab54475323b87bd0173ebe0a79f5e91f632855 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:58:41 +0200
Subject: [PATCH 2350/2811] Clarify test method names

---
 packages/framework/tests/Unit/PostAuthorTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index be1e4892f36..ebfd6731501 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -141,7 +141,7 @@ public function testNameIsSetToUsernameIfNoNameIsProvided()
         $this->assertSame('foo', $author->name);
     }
 
-    public function testCreateMethodCreatesNewPendingAuthorArray()
+    public function testFacadeCreateMethodCreatesNewPendingAuthorArray()
     {
         $author = Author::create('foo');
 
@@ -154,7 +154,7 @@ public function testCreateMethodCreatesNewPendingAuthorArray()
         ], $author);
     }
 
-    public function testCreateMethodAcceptsExtraParameters()
+    public function testFacadeCreateMethodAcceptsExtraParameters()
     {
         $author = Author::create('foo', 'https://example.com');
 
@@ -163,7 +163,7 @@ public function testCreateMethodAcceptsExtraParameters()
         $this->assertSame('https://example.com', $author['website']);
     }
 
-    public function testCreateMethodAcceptsAllParameters()
+    public function testFacadeCreateMethodAcceptsAllParameters()
     {
         $author = Author::create(...$this->exampleData());
 

From 9d689b49fca5a6409b1c79967765e4a4055801e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:41:58 +0200
Subject: [PATCH 2351/2811] Extract new more scoped create method

---
 .../Features/Blogging/Models/PostAuthor.php    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4290d18b392..5b7cbe869da 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -86,6 +86,18 @@ public function __construct(string $username, ?string $name = null, ?string $web
         $this->socials = $socials;
     }
 
+    /**
+     * Create a new Post Author instance from an array of data.
+     *
+     * @param  array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
+     */
+    public static function create(array $data): PostAuthor
+    {
+        return new static(...array_merge([
+            'username' => static::findUsernameFromData($data),
+        ], $data));
+    }
+
     /**
      * Dynamically get or create an author based on a username string or front matter array.
      *
@@ -94,12 +106,10 @@ public function __construct(string $username, ?string $name = null, ?string $web
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
-            return static::get($data) ?? static::getOrCreate(['username' => $data]);
+            return static::get($data) ?? static::create(['username' => $data]);
         }
 
-        return new static(...array_merge([
-            'username' => static::findUsernameFromData($data),
-        ], $data));
+        return self::create($data);
     }
 
     /**  Get a Post Author instance by username, or null if not found. */

From 1e9f09d54b09522a4278240b2211a516a726562a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 20:57:05 +0200
Subject: [PATCH 2352/2811] Deprecate the `PostAuthor::getOrCreate` method

---
 .../Features/Blogging/Models/PostAuthor.php   |  2 +
 .../framework/tests/Unit/PostAuthorTest.php   | 48 ++++++++++++-------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 5b7cbe869da..20918870ca3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -101,6 +101,8 @@ public static function create(array $data): PostAuthor
     /**
      * Dynamically get or create an author based on a username string or front matter array.
      *
+     * @deprecated Use either `get` or `create` directly depending on your use case.
+     *
      * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
     public static function getOrCreate(string|array $data): static
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index ebfd6731501..e5b5828b996 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -78,11 +78,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArgumentUnpacking()
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate()
+    public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingCreate()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate($data);
+        $author = PostAuthor::create($data);
 
         $this->assertSame($data['name'], $author->name);
         $this->assertSame($data['website'], $author->website);
@@ -91,11 +91,11 @@ public function testCanCreateAuthorModelWithFullDetailsFromArrayUsingGetOrCreate
         $this->assertSame($data['socials'], $author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreate()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::create([
             'name' => $data['name'],
             'website' => $data['website'],
         ]);
@@ -107,11 +107,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate
         $this->assertEmpty($author->socials);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutUsername()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWithoutUsername()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::create([
             'name' => $data['name'],
             'website' => $data['website'],
         ]);
@@ -121,11 +121,11 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreate
         $this->assertSame($data['website'], $author->website);
     }
 
-    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingGetOrCreateWithoutAnyNames()
+    public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWithoutAnyNames()
     {
         $data = $this->exampleData();
 
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::create([
             'website' => $data['website'],
         ]);
 
@@ -175,24 +175,24 @@ public function testFacadeCreateMethodAcceptsAllParameters()
         $this->assertSame(['twitter' => 'HydeFramework', 'github' => 'hydephp', 'custom' => 'https://example.com'], $author['socials']);
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromString()
+    public function testGetMethodReturnsNullWhenAuthorIsNotFound()
     {
-        $author = PostAuthor::getOrCreate('foo');
-        $this->assertEquals($author, new PostAuthor('foo'));
+        $author = PostAuthor::get('foo');
+        $this->assertNull($author);
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
+    public function testGetMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
             'foo' => Author::create('bar'),
         ]);
 
-        $this->assertEquals(PostAuthor::getOrCreate('foo'), new PostAuthor('foo', 'bar'));
+        $this->assertEquals(PostAuthor::get('foo'), new PostAuthor('foo', 'bar'));
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
+    public function testGetMethodCreatesNewAuthorModelFromArray()
     {
-        $author = PostAuthor::getOrCreate([
+        $author = PostAuthor::create([
             'username' => 'foo',
             'name' => 'bar',
             'website' => 'https://example.com',
@@ -201,9 +201,23 @@ public function testGetOrCreateMethodCreatesNewAuthorModelFromArray()
         $this->assertEquals($author, new PostAuthor('foo', 'bar', 'https://example.com'));
     }
 
-    public function testGetOrCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
+    public function testCreateMethodCreatesNewAuthorModelFromArrayOnlyNeedsUsername()
+    {
+        $this->assertEquals(PostAuthor::create(['username' => 'foo']), new PostAuthor('foo'));
+    }
+
+    public function testCreateMethodWithNoUsernameUsesNameAsUsernameIfNameIsSupplied()
     {
-        $this->assertEquals(PostAuthor::getOrCreate(['username' => 'foo']), new PostAuthor('foo'));
+        $author = PostAuthor::create(['name' => 'foo']);
+
+        $this->assertEquals($author, new PostAuthor('foo'));
+    }
+
+    public function testCreateMethodWithNoUsernameUsesGuestAsUsernameIfNoNameIsSupplied()
+    {
+        $author = PostAuthor::create([]);
+
+        $this->assertEquals($author, new PostAuthor('Guest'));
     }
 
     public function testCanDefineAuthorWithNoDataInConfig()

From bf10755c00126263dd7e791eb4732f09af5f4419 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:07:35 +0200
Subject: [PATCH 2353/2811] Use the create method as there should be no models
 before parsing

It makes no sense to check for existing models when we are in the process of creating them
---
 packages/framework/src/Foundation/Concerns/HasKernelData.php    | 2 +-
 .../framework/src/Foundation/Internal/LoadYamlConfiguration.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 02123db1800..0e292d09c2f 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -57,7 +57,7 @@ protected function parseConfigurationAuthors(Collection $authors): Collection
 
             $author['username'] = $username;
 
-            return [$username => PostAuthor::getOrCreate($author)];
+            return [$username => PostAuthor::create($author)];
         });
     }
 }
diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index f1976f8f788..12d2591fdc6 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -64,7 +64,7 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            return [$username => PostAuthor::getOrCreate($author)];
+            return [$username => PostAuthor::create($author)];
         });
     }
 }

From b673d6b651cbb2c110402c534229c5de100eca08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:11:11 +0200
Subject: [PATCH 2354/2811] Add todo

---
 packages/framework/tests/Unit/PostAuthorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e5b5828b996..4b59ada48d2 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -217,7 +217,7 @@ public function testCreateMethodWithNoUsernameUsesGuestAsUsernameIfNoNameIsSuppl
     {
         $author = PostAuthor::create([]);
 
-        $this->assertEquals($author, new PostAuthor('Guest'));
+        $this->assertEquals($author, new PostAuthor('Guest')); // Todo: Should we expect (and normalize to?) lowercase 'guest'?
     }
 
     public function testCanDefineAuthorWithNoDataInConfig()

From a2d15ee8a3c267434ca8e9a0fdcddffe44f77d9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:11:14 +0200
Subject: [PATCH 2355/2811] Add todo

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

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 12d2591fdc6..8a8ee8ced32 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -64,6 +64,8 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
+            // Todo: Catch type errors so we can rethrow them as InvalidConfigurationException with the correct context.
+
             return [$username => PostAuthor::create($author)];
         });
     }

From cf4831d784a4180958f6a75634fb998b090d7131 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:13:14 +0200
Subject: [PATCH 2356/2811] Extract helper method

---
 .../src/Framework/Factories/BlogPostDataFactory.php        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 161477a98d9..d78faccf18f 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -91,7 +91,7 @@ protected function makeDate(): ?DateString
     protected function makeAuthor(): ?PostAuthor
     {
         if ($this->getMatter('author')) {
-            return PostAuthor::getOrCreate($this->getMatter('author'));
+            return $this->getOrCreateAuthor();
         }
 
         return null;
@@ -111,6 +111,11 @@ private function makeDescriptionFromMarkdownBody(): string
         return Str::limit((new ConvertsMarkdownToPlainText($this->markdown->body()))->execute(), 125);
     }
 
+    private function getOrCreateAuthor(): PostAuthor
+    {
+        return PostAuthor::getOrCreate($this->getMatter('author'));
+    }
+
     protected function getMatter(string $key): string|null|array
     {
         /** @var string|null|array $value */

From fdc4d8355ac639b4d058ff93ec242c1f8a1e3915 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:14:11 +0200
Subject: [PATCH 2357/2811] Introduce local variable

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index d78faccf18f..c5f27d7439c 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -113,7 +113,9 @@ private function makeDescriptionFromMarkdownBody(): string
 
     private function getOrCreateAuthor(): PostAuthor
     {
-        return PostAuthor::getOrCreate($this->getMatter('author'));
+        $data = $this->getMatter('author');
+
+        return PostAuthor::getOrCreate($data);
     }
 
     protected function getMatter(string $key): string|null|array

From ceec673c3ec686e6b87ec571d3e4dd0d8bed23ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:15:06 +0200
Subject: [PATCH 2358/2811] Inline the helper method usage into last remaining
 usage

---
 .../src/Framework/Factories/BlogPostDataFactory.php       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index c5f27d7439c..2a1f781e7b8 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -14,6 +14,8 @@
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Support\Models\DateString;
 
+use function is_string;
+
 /**
  * Streamlines the data construction specific to a blog post.
  *
@@ -115,7 +117,11 @@ private function getOrCreateAuthor(): PostAuthor
     {
         $data = $this->getMatter('author');
 
-        return PostAuthor::getOrCreate($data);
+        if (is_string($data)) {
+            return PostAuthor::get($data) ?? PostAuthor::create(['username' => $data]);
+        }
+
+        return PostAuthor::create($data);
     }
 
     protected function getMatter(string $key): string|null|array

From fa4213fc16251e4a5f3a8c19f4d51ff3fde8fb96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:15:33 +0200
Subject: [PATCH 2359/2811] Ignore coverage for deprecated method

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 20918870ca3..c8b0aaa8054 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -103,6 +103,8 @@ public static function create(array $data): PostAuthor
      *
      * @deprecated Use either `get` or `create` directly depending on your use case.
      *
+     * @codeCoverageIgnore Until we can remove this method.
+     *
      * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
     public static function getOrCreate(string|array $data): static

From 672cfb5ae47b5b31603ab70a212efad590346e2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:16:32 +0200
Subject: [PATCH 2360/2811] Use static instead of self

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index c8b0aaa8054..a40ae89ec37 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -113,7 +113,7 @@ public static function getOrCreate(string|array $data): static
             return static::get($data) ?? static::create(['username' => $data]);
         }
 
-        return self::create($data);
+        return static::create($data);
     }
 
     /**  Get a Post Author instance by username, or null if not found. */

From 9fa15e62b608cfc71f2ccb2c4c3134b6d0c899fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:17:12 +0200
Subject: [PATCH 2361/2811] Update documentation for replacement method

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index a40ae89ec37..92d673c2d89 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -67,7 +67,7 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * Construct a new Post Author object.
      *
-     * If your input is in the form of an array, you may rather want to use the `getOrCreate` method.
+     * If your input is in the form of an array, you may rather want to use the `create` method.
      *
      * @param  string  $username
      * @param  string|null  $name

From bac4eb2428dbe8e2fa31a3757e4cbb7564bf626b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:17:27 +0200
Subject: [PATCH 2362/2811] Remove the `PostAuthor::getOrCreate` method

---
 .../Features/Blogging/Models/PostAuthor.php   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 92d673c2d89..f48a3c17c4a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,7 +12,6 @@
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function is_string;
 use function array_merge;
 use function array_filter;
 
@@ -98,24 +97,6 @@ public static function create(array $data): PostAuthor
         ], $data));
     }
 
-    /**
-     * Dynamically get or create an author based on a username string or front matter array.
-     *
-     * @deprecated Use either `get` or `create` directly depending on your use case.
-     *
-     * @codeCoverageIgnore Until we can remove this method.
-     *
-     * @param  string|array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
-     */
-    public static function getOrCreate(string|array $data): static
-    {
-        if (is_string($data)) {
-            return static::get($data) ?? static::create(['username' => $data]);
-        }
-
-        return static::create($data);
-    }
-
     /**  Get a Post Author instance by username, or null if not found. */
     public static function get(string $username): ?static
     {

From 557168f22acbdec2a3c6b979b1b75dd6b5c65683 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:20:33 +0200
Subject: [PATCH 2363/2811] Normalize documentation formatting

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index f48a3c17c4a..0740774cfd9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -64,7 +64,7 @@ class PostAuthor implements Stringable, SerializableContract
     public readonly ?array $socials;
 
     /**
-     * Construct a new Post Author object.
+     * Construct a new Post Author instance with the given data.
      *
      * If your input is in the form of an array, you may rather want to use the `create` method.
      *

From c5270468cb20783111e0b76c11d609fa3261c0cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:20:54 +0200
Subject: [PATCH 2364/2811] Document that username will never be null

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 0740774cfd9..adbb48c8b75 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -88,6 +88,8 @@ public function __construct(string $username, ?string $name = null, ?string $web
     /**
      * Create a new Post Author instance from an array of data.
      *
+     * If you do not supply a username, the name will be used as the username, or 'Guest' if no name is provided.
+     *
      * @param  array{username?: string, name?: string, website?: string, bio?: string, avatar?: string, socials?: array<string, string>}  $data
      */
     public static function create(array $data): PostAuthor

From 2f16657daf62039e387c9c1be912d3f11354b864 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:21:17 +0200
Subject: [PATCH 2365/2811] Document where the key comes from

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index adbb48c8b75..d60e98651d9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -25,7 +25,7 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * The username of the author.
      *
-     * This is the key used to find authors in the config.
+     * This is the key used to find authors in the config and is taken from that array key.
      */
     public readonly string $username;
 

From 7290ccd96b605039158059823a071eb518be49f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:25:32 +0200
Subject: [PATCH 2366/2811] Document string to string map type

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index d60e98651d9..a0fbd52b4ed 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -57,7 +57,7 @@ class PostAuthor implements Stringable, SerializableContract
     /**
      * The author's social media links/handles.
      *
-     * @var ?array<string, string>
+     * @var ?array<string, string> String-to-string map of social media services to their respective handles.
      *
      * @example ['twitter' => 'mr_hyde'] ($service => $handle)
      */

From f86d01c057d39675a51566a24cd159ce8ecae5a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:29:15 +0200
Subject: [PATCH 2367/2811] Update fallback username to be lowercase

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php   | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index a0fbd52b4ed..98b2aa6c2e8 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -136,6 +136,6 @@ public function getPosts(): PageCollection
     /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsernameFromData(array $data): string
     {
-        return $data['username'] ?? $data['name'] ?? 'Guest';
+        return $data['username'] ?? $data['name'] ?? 'guest';
     }
 }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 4b59ada48d2..a7ad69b21a3 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -129,8 +129,8 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWitho
             'website' => $data['website'],
         ]);
 
-        $this->assertSame('Guest', $author->username);
-        $this->assertSame('Guest', $author->name);
+        $this->assertSame('guest', $author->username);
+        $this->assertSame('guest', $author->name);
         $this->assertSame($data['website'], $author->website);
     }
 
@@ -217,7 +217,7 @@ public function testCreateMethodWithNoUsernameUsesGuestAsUsernameIfNoNameIsSuppl
     {
         $author = PostAuthor::create([]);
 
-        $this->assertEquals($author, new PostAuthor('Guest')); // Todo: Should we expect (and normalize to?) lowercase 'guest'?
+        $this->assertEquals($author, new PostAuthor('guest'));
     }
 
     public function testCanDefineAuthorWithNoDataInConfig()

From b8bad2560e936d10f8ddf5a173f57cb366333caa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:37:42 +0200
Subject: [PATCH 2368/2811] Normalize post author usernames to lowercase

This approach offers several benefits:

1.  Consistency: All internal operations use the lowercase username.
2.  Simplicity: We're not adding any new properties, just using the existing ones more effectively.
3.  Backwards compatibility: Existing code that uses the `username` property will continue to work, just with a normalized value.
4.  Flexibility: The pretty username (in the `name` property) can still be used for display purposes with any desired capitalization.

This solution adheres to the Principle of Least Astonishment by:

*   Using a consistent, predictable format for usernames internally
*   Allowing flexible display names through the existing `name` property
*   Maintaining the expected behavior of existing methods

It also improves DX by reducing the chance of errors due to case sensitivity in username comparisons.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php    | 5 +++--
 packages/framework/tests/Feature/MarkdownPostTest.php        | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php             | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 98b2aa6c2e8..094a9b8a926 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,6 +12,7 @@
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
+use function strtolower;
 use function array_merge;
 use function array_filter;
 
@@ -77,7 +78,7 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
-        $this->username = $username;
+        $this->username = strtolower($username);
         $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
@@ -136,6 +137,6 @@ public function getPosts(): PageCollection
     /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsernameFromData(array $data): string
     {
-        return $data['username'] ?? $data['name'] ?? 'guest';
+        return strtolower($data['username'] ?? $data['name'] ?? 'guest');
     }
 }
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 4040d1c35c7..d79b1525a45 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -24,7 +24,7 @@ public function testConstructorCanCreateANewAuthorInstanceFromUsernameString()
         ]));
 
         $this->assertInstanceOf(PostAuthor::class, $post->author);
-        $this->assertSame('John Doe', $post->author->username);
+        $this->assertSame('john doe', $post->author->username);
         $this->assertSame('John Doe', $post->author->name);
         $this->assertNull($post->author->website);
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index a7ad69b21a3..5a9e0fc20ac 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -116,7 +116,7 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWitho
             'website' => $data['website'],
         ]);
 
-        $this->assertSame($data['name'], $author->username);
+        $this->assertSame(strtolower($data['name']), $author->username);
         $this->assertSame($data['name'], $author->name);
         $this->assertSame($data['website'], $author->website);
     }

From 33a75b2c15e6890af3da5558c4462029422976b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:46:45 +0200
Subject: [PATCH 2369/2811] Normalize post author usernames to snake case

This approach offers several advantages:

1.  Consistency: All generated usernames will follow the same snake\_case format.
2.  URL-friendly: Snake_case is often used in URLs and is generally more web-friendly.
3.  Readability: It maintains readability while removing spaces and special characters.
4.  Uniqueness: It reduces the chance of conflicts between similar names.

In terms of the Principle of Least Astonishment and good DX:

1.  It's a common convention in many systems to use snake\_case for identifiers, so it aligns with developer expectations.
2.  It creates a clear distinction between the username (used for identification and linking) and the display name.
3.  It's predictable and easy to understand how a display name will be converted to a username.

While we usually use kebab-case slugs, I think using snake_case is better here as it matches what we recommend for the config keys, and the idea is to emulate those. Most importantly, these are URL routable compared to using just lowercase.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php   | 6 +++---
 packages/framework/tests/Feature/MarkdownPostTest.php       | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 094a9b8a926..2e79d4cb226 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -6,13 +6,13 @@
 
 use Hyde\Hyde;
 use Stringable;
+use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Collection;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Support\Contracts\SerializableContract;
 
-use function strtolower;
 use function array_merge;
 use function array_filter;
 
@@ -78,7 +78,7 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
-        $this->username = strtolower($username);
+        $this->username = Str::slug($username, '_');
         $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
@@ -137,6 +137,6 @@ public function getPosts(): PageCollection
     /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsernameFromData(array $data): string
     {
-        return strtolower($data['username'] ?? $data['name'] ?? 'guest');
+        return Str::slug($data['username'] ?? $data['name'] ?? 'guest', '_');
     }
 }
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index d79b1525a45..bf14c1946e6 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -24,7 +24,7 @@ public function testConstructorCanCreateANewAuthorInstanceFromUsernameString()
         ]));
 
         $this->assertInstanceOf(PostAuthor::class, $post->author);
-        $this->assertSame('john doe', $post->author->username);
+        $this->assertSame('john_doe', $post->author->username);
         $this->assertSame('John Doe', $post->author->name);
         $this->assertNull($post->author->website);
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 5a9e0fc20ac..5b33709909c 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -116,7 +116,7 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWitho
             'website' => $data['website'],
         ]);
 
-        $this->assertSame(strtolower($data['name']), $author->username);
+        $this->assertSame('mr_hyde', $author->username);
         $this->assertSame($data['name'], $author->name);
         $this->assertSame($data['website'], $author->website);
     }

From 1fd4ef24f6a0fdcc80ca4b0074775bc7b0c67b8f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:51:31 +0200
Subject: [PATCH 2370/2811] Extract helper method

---
 .../Framework/Features/Blogging/Models/PostAuthor.php    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 2e79d4cb226..68e592f7ee1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -78,7 +78,7 @@ class PostAuthor implements Stringable, SerializableContract
      */
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
-        $this->username = Str::slug($username, '_');
+        $this->username = static::normalizeUsername($username);
         $this->name = $name ?? $username;
         $this->website = $website;
         $this->bio = $bio;
@@ -137,6 +137,11 @@ public function getPosts(): PageCollection
     /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsernameFromData(array $data): string
     {
-        return Str::slug($data['username'] ?? $data['name'] ?? 'guest', '_');
+        return static::normalizeUsername($data['username'] ?? $data['name'] ?? 'guest');
+    }
+
+    protected static function normalizeUsername(string $username): string
+    {
+        return Str::slug($username, '_');
     }
 }

From b41c4a65924ca3cd70ac52f23dd3c54785a9ee55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 21:54:18 +0200
Subject: [PATCH 2371/2811] Test the username is normalized

---
 .../framework/tests/Unit/PostAuthorTest.php   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 5b33709909c..863654cac74 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -290,6 +290,27 @@ public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
         $this->assertNull($author);
     }
 
+    public function testUsernameIsNormalized()
+    {
+        $author = new PostAuthor('Foo Bar');
+
+        $this->assertSame('foo_bar', $author->username);
+    }
+
+    public function testUsernameIsNormalizedWhenCreatedFromArray()
+    {
+        $author = PostAuthor::create(['username' => 'Foo Bar']);
+
+        $this->assertSame('foo_bar', $author->username);
+    }
+
+    public function testUsernameGeneratedFromNameIsNormalized()
+    {
+        $author = PostAuthor::create(['name' => 'Foo Bar']);
+
+        $this->assertSame('foo_bar', $author->username);
+    }
+
     public function testNameIsSetToUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');

From c5c7611df98e37fb1ccd2d0d7a11dc0ebbfa847b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:04:30 +0200
Subject: [PATCH 2372/2811] Remove fixture with no bearing on test

---
 packages/framework/tests/Unit/PostAuthorTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 863654cac74..4aca0c3997a 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -245,7 +245,7 @@ public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
     public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
     {
         Config::set('hyde.authors', [
-            'foo' => Author::create('foo'),
+            'foo' => Author::create(),
         ]);
 
         $authors = PostAuthor::all();
@@ -258,8 +258,8 @@ public function testAllMethodReturnsCollectionWithAllAuthorsDefinedInConfig()
     public function testMultipleAuthorsCanBeDefinedInConfig()
     {
         Config::set('hyde.authors', [
-            'foo' => Author::create('foo'),
-            'bar' => Author::create('bar'),
+            'foo' => Author::create(),
+            'bar' => Author::create(),
         ]);
 
         $authors = PostAuthor::all();

From f7fac010f170f18ac06993b35d22c191c84935ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:08:14 +0200
Subject: [PATCH 2373/2811] Generate the name as a proper title

This approach offers several benefits:

1.  Consistency: It provides a predictable way to generate display names from usernames.
2.  Readability: The capitalized and spaced version is much more readable as a display name.
3.  Fallback mechanism: It ensures that even if no specific name is provided, there's still a presentable display name.

In terms of the Principle of Least Astonishment and good DX:

1.  It meets user expectations by presenting a capitalized name, which is more common in display contexts.
2.  It maintains the distinction between the lowercase, normalized username and the formatted display name.
3.  It's intuitive -- developers can easily predict how a username will be transformed into a display name.

Considered using just ucfirst, but I think this "all in" method is better. It gives a smart default, but can be easily overridden. Just how it should be in HydePHP.
---
 .../Features/Blogging/Models/PostAuthor.php   |  7 ++++-
 .../framework/tests/Feature/MetadataTest.php  |  2 +-
 .../Feature/PostsAuthorIntegrationTest.php    |  2 +-
 .../framework/tests/Unit/PostAuthorTest.php   | 26 +++++++++++++------
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 68e592f7ee1..a09f005153c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -79,7 +79,7 @@ class PostAuthor implements Stringable, SerializableContract
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)
     {
         $this->username = static::normalizeUsername($username);
-        $this->name = $name ?? $username;
+        $this->name = $name ?? static::generateName($username);
         $this->website = $website;
         $this->bio = $bio;
         $this->avatar = $avatar;
@@ -144,4 +144,9 @@ protected static function normalizeUsername(string $username): string
     {
         return Str::slug($username, '_');
     }
+
+    protected static function generateName(string $username): string
+    {
+        return Str::title($username);
+    }
 }
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index c5b31be52c3..52773b18a77 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -476,7 +476,7 @@ public function testDynamicPostAuthorReturnsAuthorNameWhenAuthorSetToArrayUsingU
             ],
         ]);
 
-        $this->assertPageHasMetadata($page, '<meta name="author" content="username">');
+        $this->assertPageHasMetadata($page, '<meta name="author" content="Username">');
     }
 
     public function testDynamicPostAuthorReturnsAuthorNameWhenAuthorSetToArrayUsingName()
diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index ce5d49b5879..647d53c668c 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -38,7 +38,7 @@ public function testCreatePostWithUndefinedAuthor()
 
         // Check that the author is rendered as is in the DOM
         $this->assertStringContainsString(
-            '>test_undefined_author</span>',
+            '>Test_Undefined_Author</span>',
             file_get_contents(Hyde::path('_site/posts/post-with-undefined-author.html'))
         );
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 4aca0c3997a..ba6376761f8 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -130,15 +130,15 @@ public function testCanCreateAuthorModelWithSomeDetailsFromArrayUsingCreateWitho
         ]);
 
         $this->assertSame('guest', $author->username);
-        $this->assertSame('guest', $author->name);
+        $this->assertSame('Guest', $author->name);
         $this->assertSame($data['website'], $author->website);
     }
 
-    public function testNameIsSetToUsernameIfNoNameIsProvided()
+    public function testNameIsGeneratedFromUsernameIfNoNameIsProvided()
     {
         $author = new PostAuthor('foo');
 
-        $this->assertSame('foo', $author->name);
+        $this->assertSame('Foo', $author->name);
     }
 
     public function testFacadeCreateMethodCreatesNewPendingAuthorArray()
@@ -210,7 +210,14 @@ public function testCreateMethodWithNoUsernameUsesNameAsUsernameIfNameIsSupplied
     {
         $author = PostAuthor::create(['name' => 'foo']);
 
-        $this->assertEquals($author, new PostAuthor('foo'));
+        $this->assertEquals($author, new PostAuthor('foo', 'foo'));
+    }
+
+    public function testCreateMethodWithNoUsernameUsesNormalizedNameAsUsernameIfNameIsSupplied()
+    {
+        $author = PostAuthor::create(['name' => 'Foo']);
+
+        $this->assertEquals($author, new PostAuthor('foo', 'Foo'));
     }
 
     public function testCreateMethodWithNoUsernameUsesGuestAsUsernameIfNoNameIsSupplied()
@@ -218,6 +225,9 @@ public function testCreateMethodWithNoUsernameUsesGuestAsUsernameIfNoNameIsSuppl
         $author = PostAuthor::create([]);
 
         $this->assertEquals($author, new PostAuthor('guest'));
+
+        $this->assertSame('guest', $author->username);
+        $this->assertSame('Guest', $author->name);
     }
 
     public function testCanDefineAuthorWithNoDataInConfig()
@@ -230,7 +240,7 @@ public function testCanDefineAuthorWithNoDataInConfig()
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo', 'foo'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo', 'Foo'), $authors->first());
     }
 
     public function testAllMethodReturnsEmptyCollectionIfNoAuthorsAreSetInConfig()
@@ -311,11 +321,11 @@ public function testUsernameGeneratedFromNameIsNormalized()
         $this->assertSame('foo_bar', $author->username);
     }
 
-    public function testNameIsSetToUsernameIfNameIsNotSet()
+    public function testNameIsCreatedFromUsernameIfNameIsNotSet()
     {
         $author = new PostAuthor('username');
 
-        $this->assertSame('username', $author->name);
+        $this->assertSame('Username', $author->name);
     }
 
     public function testToStringHelperReturnsTheName()
@@ -376,7 +386,7 @@ public function testEmptyFieldsAreRemovedFromSerializedModel()
     {
         $author = new PostAuthor('username', null, null);
 
-        $this->assertSame('{"username":"username","name":"username"}', $author->toJson());
+        $this->assertSame('{"username":"username","name":"Username"}', $author->toJson());
     }
 
     public function testToArrayMethodSerializesAllData()

From 88303fc8e46eb22b6218a34164ad7a9f5a89a9fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:15:17 +0200
Subject: [PATCH 2374/2811] Normalize name before making it into a title

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index a09f005153c..1538e65d1ac 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -147,6 +147,6 @@ protected static function normalizeUsername(string $username): string
 
     protected static function generateName(string $username): string
     {
-        return Str::title($username);
+        return Str::title(Str::slug($username, ' '));
     }
 }

From 27225c09f406bb507be07f9fa42bb6e99fbbc1dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:15:21 +0200
Subject: [PATCH 2375/2811] Revert "Normalize name before making it into a
 title"

This reverts commit 61828bbe2cb3edbbc00139b8b1bb117a458c1086.
---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 1538e65d1ac..a09f005153c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -147,6 +147,6 @@ protected static function normalizeUsername(string $username): string
 
     protected static function generateName(string $username): string
     {
-        return Str::title(Str::slug($username, ' '));
+        return Str::title($username);
     }
 }

From 6c30e0a2b0c11c6a916a7c82bea6e3cc86bfb33a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:23:06 +0200
Subject: [PATCH 2376/2811] Use more complex title parsing

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php  | 2 +-
 .../framework/tests/Feature/PostsAuthorIntegrationTest.php | 2 +-
 packages/framework/tests/Unit/PostAuthorTest.php           | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index a09f005153c..025d758d7df 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -147,6 +147,6 @@ protected static function normalizeUsername(string $username): string
 
     protected static function generateName(string $username): string
     {
-        return Str::title($username);
+        return Str::headline($username);
     }
 }
diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 647d53c668c..7a22d73d5b9 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -38,7 +38,7 @@ public function testCreatePostWithUndefinedAuthor()
 
         // Check that the author is rendered as is in the DOM
         $this->assertStringContainsString(
-            '>Test_Undefined_Author</span>',
+            '>Test Undefined Author</span>',
             file_get_contents(Hyde::path('_site/posts/post-with-undefined-author.html'))
         );
     }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index ba6376761f8..15a91b02c11 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -328,6 +328,13 @@ public function testNameIsCreatedFromUsernameIfNameIsNotSet()
         $this->assertSame('Username', $author->name);
     }
 
+    public function testNameIsCreatedFromComplexUsernameIfNameIsNotSet()
+    {
+        $author = new PostAuthor('foo_bar');
+
+        $this->assertSame('Foo Bar', $author->name);
+    }
+
     public function testToStringHelperReturnsTheName()
     {
         $author = new PostAuthor('username', 'John Doe');

From a0c832ee241b210ce2077758c8bf087e11b155bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:44:54 +0200
Subject: [PATCH 2377/2811] Initial Yaml config error rethrow proof of concept

---
 .../Internal/LoadYamlConfiguration.php        | 51 ++++++++++++++++++-
 .../Internal/YamlConfigurationRepository.php  |  6 ++-
 .../InvalidConfigurationException.php         | 17 +++++--
 .../Feature/YamlConfigurationFeatureTest.php  | 14 +++++
 4 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 8a8ee8ced32..1d3ecd02b57 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -4,11 +4,14 @@
 
 namespace Hyde\Foundation\Internal;
 
+use Throwable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 use function array_merge;
 
 /**
@@ -64,9 +67,53 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            // Todo: Catch type errors so we can rethrow them as InvalidConfigurationException with the correct context.
+            try {
+                return [$username => PostAuthor::create($author)];
+            } catch (Throwable $exception) {
+                $message = $exception->getMessage();
 
-            return [$username => PostAuthor::create($author)];
+                $message = $this->trimExceptionMessage($message);
+
+                throw new InvalidConfigurationException(
+                    $message,
+                    'hyde',
+                    "authors.$username",
+                    $this->yaml->getFilePath(),
+                    $this->findConfigLine(file($this->yaml->getFilePath()), $username),
+                    // $exception
+                );
+            }
         });
     }
+
+    private function findConfigLine(array $file, string $username): int
+    {
+        foreach ($file as $line => $content) {
+            if (str_contains($content, "$username:")) {
+                return $line + 1;
+            }
+        }
+    }
+
+    private function trimExceptionMessage(string $message): string
+    {
+        // Trim unnecessary information from the exception message.
+        $leftStrips = [
+            '__construct(): ',
+        ];
+        $rightStrips = [
+            ' called in ',
+        ];
+        // Trim the left side of the message.
+        foreach ($leftStrips as $strip) {
+            $message = Str::after($message, $strip);
+        }
+
+        // Trim the right side of the message.
+        foreach ($rightStrips as $strip) {
+            $message = Str::before($message, $strip);
+        }
+
+        return trim($message, ' .,');
+    }
 }
diff --git a/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php b/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
index 8745e40aa9e..4e44292fa45 100644
--- a/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
+++ b/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
@@ -54,8 +54,12 @@ protected function parseYamlFile(): array
         return Arr::undot((array) Yaml::parse(file_get_contents($this->file)));
     }
 
-    protected function getFilePath(): string|false
+    public function getFilePath(): string|false
     {
+        if (isset($this->file)) {
+            return $this->file;
+        }
+
         return match (true) {
             file_exists(Hyde::path('hyde.yml')) => Hyde::path('hyde.yml'),
             file_exists(Hyde::path('hyde.yaml')) => Hyde::path('hyde.yaml'),
diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 67a13ba331c..78242929720 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,22 +4,29 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Throwable;
 use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
 use function assert;
 use function explode;
 use function realpath;
+use function file_get_contents;
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null, ?string $file = null, ?int $line = null, ?Throwable $previous = null)
     {
-        if ($namespace && $key) {
-            [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
+        if ($file && $line) {
+            $this->file = $file;
+            $this->line = $line;
+        } else {
+            if ($namespace && $key) {
+                [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
+            }
         }
 
-        parent::__construct($message);
+        parent::__construct($message, previous: $previous);
     }
 
     /**
@@ -30,7 +37,7 @@ public function __construct(string $message = 'Invalid configuration detected.',
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = realpath("config/$namespace.php");
-        $contents = Filesystem::getContents($file);
+        $contents = file_get_contents($file);
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 41d657de0c8..f32c1872f65 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -7,6 +7,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 /**
  * Test the Yaml configuration feature.
@@ -438,6 +439,19 @@ public function testCanSetAuthorsInTheYamlConfig()
         $this->assertSame(null, $authors['test']->socials);
     }
 
+    public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        authors:
+          wrong:
+            name: false
+        YAML);
+
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid value for "name" in "authors.wrong"');
+        $this->runBootstrappers();
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 4c7cd81fb9c5cdfd24b6071d6e095d7287d9e1b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 7 Jul 2024 22:46:52 +0200
Subject: [PATCH 2378/2811] Revert "Initial Yaml config error rethrow proof of
 concept"

This reverts commit a0c832ee241b210ce2077758c8bf087e11b155bf.
---
 .../Internal/LoadYamlConfiguration.php        | 51 +------------------
 .../Internal/YamlConfigurationRepository.php  |  6 +--
 .../InvalidConfigurationException.php         | 17 ++-----
 .../Feature/YamlConfigurationFeatureTest.php  | 14 -----
 4 files changed, 8 insertions(+), 80 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 1d3ecd02b57..8a8ee8ced32 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -4,14 +4,11 @@
 
 namespace Hyde\Foundation\Internal;
 
-use Throwable;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
-use Hyde\Framework\Exceptions\InvalidConfigurationException;
 use function array_merge;
 
 /**
@@ -67,53 +64,9 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            try {
-                return [$username => PostAuthor::create($author)];
-            } catch (Throwable $exception) {
-                $message = $exception->getMessage();
+            // Todo: Catch type errors so we can rethrow them as InvalidConfigurationException with the correct context.
 
-                $message = $this->trimExceptionMessage($message);
-
-                throw new InvalidConfigurationException(
-                    $message,
-                    'hyde',
-                    "authors.$username",
-                    $this->yaml->getFilePath(),
-                    $this->findConfigLine(file($this->yaml->getFilePath()), $username),
-                    // $exception
-                );
-            }
+            return [$username => PostAuthor::create($author)];
         });
     }
-
-    private function findConfigLine(array $file, string $username): int
-    {
-        foreach ($file as $line => $content) {
-            if (str_contains($content, "$username:")) {
-                return $line + 1;
-            }
-        }
-    }
-
-    private function trimExceptionMessage(string $message): string
-    {
-        // Trim unnecessary information from the exception message.
-        $leftStrips = [
-            '__construct(): ',
-        ];
-        $rightStrips = [
-            ' called in ',
-        ];
-        // Trim the left side of the message.
-        foreach ($leftStrips as $strip) {
-            $message = Str::after($message, $strip);
-        }
-
-        // Trim the right side of the message.
-        foreach ($rightStrips as $strip) {
-            $message = Str::before($message, $strip);
-        }
-
-        return trim($message, ' .,');
-    }
 }
diff --git a/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php b/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
index 4e44292fa45..8745e40aa9e 100644
--- a/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
+++ b/packages/framework/src/Foundation/Internal/YamlConfigurationRepository.php
@@ -54,12 +54,8 @@ protected function parseYamlFile(): array
         return Arr::undot((array) Yaml::parse(file_get_contents($this->file)));
     }
 
-    public function getFilePath(): string|false
+    protected function getFilePath(): string|false
     {
-        if (isset($this->file)) {
-            return $this->file;
-        }
-
         return match (true) {
             file_exists(Hyde::path('hyde.yml')) => Hyde::path('hyde.yml'),
             file_exists(Hyde::path('hyde.yaml')) => Hyde::path('hyde.yaml'),
diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 78242929720..67a13ba331c 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,29 +4,22 @@
 
 namespace Hyde\Framework\Exceptions;
 
-use Throwable;
 use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
 use function assert;
 use function explode;
 use function realpath;
-use function file_get_contents;
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null, ?string $file = null, ?int $line = null, ?Throwable $previous = null)
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
     {
-        if ($file && $line) {
-            $this->file = $file;
-            $this->line = $line;
-        } else {
-            if ($namespace && $key) {
-                [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
-            }
+        if ($namespace && $key) {
+            [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
         }
 
-        parent::__construct($message, previous: $previous);
+        parent::__construct($message);
     }
 
     /**
@@ -37,7 +30,7 @@ public function __construct(string $message = 'Invalid configuration detected.',
     protected function findConfigLine(string $namespace, string $key): array
     {
         $file = realpath("config/$namespace.php");
-        $contents = file_get_contents($file);
+        $contents = Filesystem::getContents($file);
         $lines = explode("\n", $contents);
 
         foreach ($lines as $line => $content) {
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index f32c1872f65..41d657de0c8 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -7,7 +7,6 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 /**
  * Test the Yaml configuration feature.
@@ -439,19 +438,6 @@ public function testCanSetAuthorsInTheYamlConfig()
         $this->assertSame(null, $authors['test']->socials);
     }
 
-    public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
-    {
-        $this->file('hyde.yml', <<<'YAML'
-        authors:
-          wrong:
-            name: false
-        YAML);
-
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('Invalid value for "name" in "authors.wrong"');
-        $this->runBootstrappers();
-    }
-
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 9bb7853a466ca6a18dc08f26db3e519cd0571764 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:06:48 +0200
Subject: [PATCH 2379/2811] Rethrow type errors as configuration exceptions

Using line finding like in https://github.com/hydephp/develop/pull/1798/commits/a0c832ee241b210ce2077758c8bf087e11b155bf adds way too much complexity to be justified. Just a hint to check the syntax should be enough.
---
 .../Foundation/Internal/LoadYamlConfiguration.php  | 13 ++++++++++---
 .../tests/Feature/YamlConfigurationFeatureTest.php | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 8a8ee8ced32..6a1cda350e7 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -4,10 +4,12 @@
 
 namespace Hyde\Foundation\Internal;
 
+use Throwable;
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 use function array_merge;
 
@@ -64,9 +66,14 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            // Todo: Catch type errors so we can rethrow them as InvalidConfigurationException with the correct context.
-
-            return [$username => PostAuthor::create($author)];
+            try {
+                return [$username => PostAuthor::create($author)];
+            } catch (Throwable $exception) {
+                throw new InvalidConfigurationException(
+                    'Invalid author configuration detected in the YAML config file. Please double check the syntax.',
+                    previous: $exception
+                );
+            }
         });
     }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 41d657de0c8..1e7f788c4dc 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -7,6 +7,7 @@
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 /**
  * Test the Yaml configuration feature.
@@ -438,6 +439,19 @@ public function testCanSetAuthorsInTheYamlConfig()
         $this->assertSame(null, $authors['test']->socials);
     }
 
+    public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        authors:
+          wrong:
+            name: false
+        YAML);
+
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid author configuration detected in the YAML config file. Please double check the syntax.');
+        $this->runBootstrappers();
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 2ad5de23ecc0464e98cd066a5593f1e44e60cfb9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:07:01 +0200
Subject: [PATCH 2380/2811] Update custom exception class to accept previous
 throwable

---
 .../Framework/Exceptions/InvalidConfigurationException.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 67a13ba331c..694566ed717 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Throwable;
 use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
@@ -13,13 +14,13 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null, ?Throwable $previous = null)
     {
         if ($namespace && $key) {
             [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
         }
 
-        parent::__construct($message);
+        parent::__construct($message, previous: $previous);
     }
 
     /**

From 106b4c16f03857db39a58143e4814859edc8c126 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:09:18 +0200
Subject: [PATCH 2381/2811] Custom exception testing as default breaks file
 memory

For some reason, this tears down the application to soon, meaning the filesystem class is gone.
---
 .../tests/Feature/YamlConfigurationFeatureTest.php   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 1e7f788c4dc..9c34bf1fdec 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -441,15 +441,19 @@ public function testCanSetAuthorsInTheYamlConfig()
 
     public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
     {
-        $this->file('hyde.yml', <<<'YAML'
+        file_put_contents('hyde.yml', <<<'YAML'
         authors:
           wrong:
             name: false
         YAML);
 
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('Invalid author configuration detected in the YAML config file. Please double check the syntax.');
-        $this->runBootstrappers();
+        try {
+            $this->runBootstrappers();
+        } catch (InvalidConfigurationException $exception) {
+            $this->assertSame('Invalid author configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+        }
+
+        unlink('hyde.yml');
     }
 
     protected function runBootstrappers(?array $withMergedConfig = null): void

From 41e0d190413f4fbc8c6bbffb8bf3dc0ceaaa8b9f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:32:09 +0200
Subject: [PATCH 2382/2811] Fix wrong test names

---
 packages/framework/tests/Unit/PostAuthorTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 15a91b02c11..43e5239aa9e 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -181,7 +181,7 @@ public function testGetMethodReturnsNullWhenAuthorIsNotFound()
         $this->assertNull($author);
     }
 
-    public function testGetMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
+    public function testCreateMethodCreatesNewAuthorModelFromStringCanFindExistingAuthor()
     {
         Config::set('hyde.authors', [
             'foo' => Author::create('bar'),
@@ -190,7 +190,7 @@ public function testGetMethodCreatesNewAuthorModelFromStringCanFindExistingAutho
         $this->assertEquals(PostAuthor::get('foo'), new PostAuthor('foo', 'bar'));
     }
 
-    public function testGetMethodCreatesNewAuthorModelFromArray()
+    public function testCreateMethodCreatesNewAuthorModelFromArray()
     {
         $author = PostAuthor::create([
             'username' => 'foo',

From 58711e6f4929aad49088dc2a4f35b15e7c0f9444 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:32:47 +0200
Subject: [PATCH 2383/2811] Improve formatting

---
 packages/framework/tests/Unit/PostAuthorTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 43e5239aa9e..9f08f3ffd65 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -285,6 +285,7 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
         Config::set('hyde.authors', [
             'foo' => Author::create('bar'),
         ]);
+
         $author = PostAuthor::get('foo');
 
         $this->assertInstanceOf(PostAuthor::class, $author);
@@ -295,6 +296,7 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
     public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
     {
         Config::set('hyde.authors', []);
+
         $author = PostAuthor::get('foo');
 
         $this->assertNull($author);

From 21faf4687f18c7e176f82ac29e2cd758b12e71ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 12:07:01 +0200
Subject: [PATCH 2384/2811] Update custom exception class to accept previous
 throwable

---
 .../Exceptions/InvalidConfigurationException.php         | 5 +++--
 packages/framework/tests/Unit/CustomExceptionsTest.php   | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 67a13ba331c..694566ed717 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Exceptions;
 
+use Throwable;
 use Hyde\Facades\Filesystem;
 use InvalidArgumentException;
 
@@ -13,13 +14,13 @@
 
 class InvalidConfigurationException extends InvalidArgumentException
 {
-    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null)
+    public function __construct(string $message = 'Invalid configuration detected.', ?string $namespace = null, ?string $key = null, ?Throwable $previous = null)
     {
         if ($namespace && $key) {
             [$this->file, $this->line] = $this->findConfigLine($namespace, $key);
         }
 
-        parent::__construct($message);
+        parent::__construct($message, previous: $previous);
     }
 
     /**
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index dc6e9b460f7..6009a31bc4e 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -201,4 +201,13 @@ public function testInvalidConfigurationExceptionWithNamespaceAndKey()
         $this->assertStringContainsString('config'.DIRECTORY_SEPARATOR.'hyde.php', $exception->getFile());
         $this->assertGreaterThan(0, $exception->getLine());
     }
+
+    public function testInvalidConfigurationExceptionWithPreviousThrowable()
+    {
+        $previous = new Exception('Previous exception.');
+        $exception = new InvalidConfigurationException('Invalid configuration.', 'hyde', 'name', $previous);
+
+        $this->assertSame('Invalid configuration.', $exception->getMessage());
+        $this->assertSame($previous, $exception->getPrevious());
+    }
 }

From 41f5a91319302f086504ed3ca16e873b00878a51 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:08:17 +0200
Subject: [PATCH 2385/2811] Normalize the usernames when retrieving them

---
 .../Features/Blogging/Models/PostAuthor.php   |  2 +-
 .../tests/Feature/MarkdownPostTest.php        | 17 +++++++++++++
 .../framework/tests/Unit/PostAuthorTest.php   | 24 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 025d758d7df..553ce6777a6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -103,7 +103,7 @@ public static function create(array $data): PostAuthor
     /**  Get a Post Author instance by username, or null if not found. */
     public static function get(string $username): ?static
     {
-        return static::all()->get($username);
+        return static::all()->get(static::normalizeUsername($username));
     }
 
     /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index bf14c1946e6..9716c9c78bf 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -45,6 +45,23 @@ public function testConstructorCanCreateANewAuthorInstanceFromUserArray()
         $this->assertSame('https://example.com', $post->author->website);
     }
 
+    public function testAuthorRetrievalUsesNormalizedUsernameToFindTheRightAuthorRegardlessOfFormatting()
+    {
+        $postA = new MarkdownPost(matter: FrontMatter::fromArray([
+            'author' => 'mr hyde',
+        ]));
+
+        $postB = new MarkdownPost(matter: FrontMatter::fromArray([
+            'author' => 'Mr Hyde',
+        ]));
+
+        $postC = new MarkdownPost(matter: FrontMatter::fromArray([
+            'author' => 'mr_hyde',
+        ]));
+
+        $this->assertAllSame($postA->author, $postB->author, $postC->author);
+    }
+
     public function testConstructorCanCreateANewImageInstanceFromAString()
     {
         $post = new MarkdownPost(matter: FrontMatter::fromArray([
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 9f08f3ffd65..b30b200d917 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -7,6 +7,7 @@
 use Hyde\Hyde;
 use Hyde\Facades\Author;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Testing\FluentTestingHelpers;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Testing\UnitTestCase;
 use Illuminate\Support\Collection;
@@ -17,6 +18,8 @@
  */
 class PostAuthorTest extends UnitTestCase
 {
+    use FluentTestingHelpers;
+
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
@@ -293,6 +296,27 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
         $this->assertSame('bar', $author->name);
     }
 
+    public function testGetMethodNormalizesUsernamesForRetrieval()
+    {
+        Config::set('hyde.authors', [
+            'foo_bar' => Author::create(),
+        ]);
+
+        $author = PostAuthor::get('Foo bar');
+
+        $this->assertInstanceOf(PostAuthor::class, $author);
+        $this->assertSame('foo_bar', $author->username);
+        $this->assertSame('Foo Bar', $author->name);
+
+        $this->assertAllSame(
+            PostAuthor::get('foo_bar'),
+            PostAuthor::get('foo-bar'),
+            PostAuthor::get('foo bar'),
+            PostAuthor::get('Foo Bar'),
+            PostAuthor::get('FOO BAR'),
+        );
+    }
+
     public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
     {
         Config::set('hyde.authors', []);

From fc9bd9e0264641a0ff890f1966cf0ef5a09609af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:17:25 +0200
Subject: [PATCH 2386/2811] Move up test

---
 .../framework/tests/Unit/PostAuthorTest.php    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index b30b200d917..4eb4b00d243 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -296,6 +296,15 @@ public function testGetMethodReturnsConfigDefinedAuthorByUsername()
         $this->assertSame('bar', $author->name);
     }
 
+    public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
+    {
+        Config::set('hyde.authors', []);
+
+        $author = PostAuthor::get('foo');
+
+        $this->assertNull($author);
+    }
+
     public function testGetMethodNormalizesUsernamesForRetrieval()
     {
         Config::set('hyde.authors', [
@@ -317,15 +326,6 @@ public function testGetMethodNormalizesUsernamesForRetrieval()
         );
     }
 
-    public function testGetMethodReturnsNullIfUsernameNotFoundInConfig()
-    {
-        Config::set('hyde.authors', []);
-
-        $author = PostAuthor::get('foo');
-
-        $this->assertNull($author);
-    }
-
     public function testUsernameIsNormalized()
     {
         $author = new PostAuthor('Foo Bar');

From 9cdbed38deea18ca15aa771c0b2f66625ad82170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:24:48 +0200
Subject: [PATCH 2387/2811] Make protected normalization helper public internal

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 553ce6777a6..f7dd78593a5 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -140,7 +140,8 @@ protected static function findUsernameFromData(array $data): string
         return static::normalizeUsername($data['username'] ?? $data['name'] ?? 'guest');
     }
 
-    protected static function normalizeUsername(string $username): string
+    /** @internal */
+    public static function normalizeUsername(string $username): string
     {
         return Str::slug($username, '_');
     }

From d9ceeefc3b9b94e21eae40c8b3f4fac6e839be99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:30:33 +0200
Subject: [PATCH 2388/2811] Normalize the usernames when parsing the author
 config

See discussion at https://github.com/hydephp/develop/pull/1798#discussion_r1669148862
---
 .../src/Foundation/Concerns/HasKernelData.php |  2 ++
 .../framework/tests/Unit/PostAuthorTest.php   | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 0e292d09c2f..071d8d8caa6 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -55,6 +55,8 @@ protected function parseConfigurationAuthors(Collection $authors): Collection
                 throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
 
+            $username = PostAuthor::normalizeUsername($username);
+
             $author['username'] = $username;
 
             return [$username => PostAuthor::create($author)];
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 4eb4b00d243..8f5199cd4b7 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -326,6 +326,36 @@ public function testGetMethodNormalizesUsernamesForRetrieval()
         );
     }
 
+    public function testAuthorUsernamesAreNormalizedInTheConfig()
+    {
+        Config::set('hyde.authors', [
+            'foo_bar' => Author::create(),
+            'foo-bar' => Author::create(),
+            'foo bar' => Author::create(),
+            'Foo Bar' => Author::create(),
+            'FOO BAR' => Author::create(),
+        ]);
+
+        $this->assertCount(1, PostAuthor::all());
+    }
+
+    public function testOnlyLastAuthorWithNormalizedUsernameIsKept()
+    {
+        // Technically, a first come, first-served principle would make most sense,
+        // but this is the lightest code implementation and can be used for now.
+
+        Config::set('hyde.authors', [
+            'foo_bar' => Author::create('Author 1'),
+            'foo-bar' => Author::create('Author 2'),
+            'foo bar' => Author::create('Author 3'),
+        ]);
+
+        $authors = PostAuthor::all();
+
+        $this->assertCount(1, $authors);
+        $this->assertEquals(new PostAuthor('foo_bar', 'Author 3'), $authors->first());
+    }
+
     public function testUsernameIsNormalized()
     {
         $author = new PostAuthor('Foo Bar');

From 196ceb71312fdf9e3f8ab57badfc70967a742a5f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:34:12 +0200
Subject: [PATCH 2389/2811] Test covers HasKernelData trait

---
 packages/framework/tests/Unit/PostAuthorTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 8f5199cd4b7..e0204b1a906 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -15,6 +15,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\PostAuthor
+ * @covers \Hyde\Foundation\Concerns\HasKernelData
  */
 class PostAuthorTest extends UnitTestCase
 {

From a03541585e646144cf45f47b82ee2f170e6f9f9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:41:20 +0200
Subject: [PATCH 2390/2811] Add a filter pass to only keep the first author
 with matching username

See https://github.com/hydephp/develop/pull/1798#discussion_r1669181306
---
 .../framework/src/Foundation/Concerns/HasKernelData.php    | 4 +++-
 packages/framework/tests/Unit/PostAuthorTest.php           | 7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index 071d8d8caa6..d94ca8d5726 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -50,7 +50,9 @@ public function authors(): Collection
 
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
-        return $authors->mapWithKeys(function (array $author, string $username): array {
+        return $authors->unique(function (array $author, string $username): string {
+            return PostAuthor::normalizeUsername($username);
+        })->mapWithKeys(function (array $author, string $username): array {
             if (! $username) {
                 throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e0204b1a906..0afd4146ca1 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -340,11 +340,8 @@ public function testAuthorUsernamesAreNormalizedInTheConfig()
         $this->assertCount(1, PostAuthor::all());
     }
 
-    public function testOnlyLastAuthorWithNormalizedUsernameIsKept()
+    public function testOnlyFirstAuthorWithNormalizedUsernameIsKept()
     {
-        // Technically, a first come, first-served principle would make most sense,
-        // but this is the lightest code implementation and can be used for now.
-
         Config::set('hyde.authors', [
             'foo_bar' => Author::create('Author 1'),
             'foo-bar' => Author::create('Author 2'),
@@ -354,7 +351,7 @@ public function testOnlyLastAuthorWithNormalizedUsernameIsKept()
         $authors = PostAuthor::all();
 
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo_bar', 'Author 3'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo_bar', 'Author 1'), $authors->first());
     }
 
     public function testUsernameIsNormalized()

From e91e646e2472ebf3f8ba2187f675ecd33b58de70 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:41:47 +0200
Subject: [PATCH 2391/2811] Revert "Add a filter pass to only keep the first
 author"

This reverts commit 1c727fe4b15dcd46e8e4e14f33c5130036feb45e as the complexity cannot be justified. See https://github.com/hydephp/develop/pull/1798#discussion_r1669193311
---
 .../framework/src/Foundation/Concerns/HasKernelData.php    | 4 +---
 packages/framework/tests/Unit/PostAuthorTest.php           | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HasKernelData.php b/packages/framework/src/Foundation/Concerns/HasKernelData.php
index d94ca8d5726..071d8d8caa6 100644
--- a/packages/framework/src/Foundation/Concerns/HasKernelData.php
+++ b/packages/framework/src/Foundation/Concerns/HasKernelData.php
@@ -50,9 +50,7 @@ public function authors(): Collection
 
     protected function parseConfigurationAuthors(Collection $authors): Collection
     {
-        return $authors->unique(function (array $author, string $username): string {
-            return PostAuthor::normalizeUsername($username);
-        })->mapWithKeys(function (array $author, string $username): array {
+        return $authors->mapWithKeys(function (array $author, string $username): array {
             if (! $username) {
                 throw new InvalidConfigurationException('Author username cannot be empty. Did you forget to set the author\'s array key?', 'hyde', 'authors');
             }
diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index 0afd4146ca1..e0204b1a906 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -340,8 +340,11 @@ public function testAuthorUsernamesAreNormalizedInTheConfig()
         $this->assertCount(1, PostAuthor::all());
     }
 
-    public function testOnlyFirstAuthorWithNormalizedUsernameIsKept()
+    public function testOnlyLastAuthorWithNormalizedUsernameIsKept()
     {
+        // Technically, a first come, first-served principle would make most sense,
+        // but this is the lightest code implementation and can be used for now.
+
         Config::set('hyde.authors', [
             'foo_bar' => Author::create('Author 1'),
             'foo-bar' => Author::create('Author 2'),
@@ -351,7 +354,7 @@ public function testOnlyFirstAuthorWithNormalizedUsernameIsKept()
         $authors = PostAuthor::all();
 
         $this->assertCount(1, $authors);
-        $this->assertEquals(new PostAuthor('foo_bar', 'Author 1'), $authors->first());
+        $this->assertEquals(new PostAuthor('foo_bar', 'Author 3'), $authors->first());
     }
 
     public function testUsernameIsNormalized()

From 838fa42614d1649c2631fd1f581fc0ace238845a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 21:44:16 +0200
Subject: [PATCH 2392/2811] Remove todo

---
 packages/framework/tests/Unit/PostAuthorTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/tests/Unit/PostAuthorTest.php b/packages/framework/tests/Unit/PostAuthorTest.php
index e0204b1a906..3eeb7bd0d27 100644
--- a/packages/framework/tests/Unit/PostAuthorTest.php
+++ b/packages/framework/tests/Unit/PostAuthorTest.php
@@ -342,9 +342,6 @@ public function testAuthorUsernamesAreNormalizedInTheConfig()
 
     public function testOnlyLastAuthorWithNormalizedUsernameIsKept()
     {
-        // Technically, a first come, first-served principle would make most sense,
-        // but this is the lightest code implementation and can be used for now.
-
         Config::set('hyde.authors', [
             'foo_bar' => Author::create('Author 1'),
             'foo-bar' => Author::create('Author 2'),

From 86f9025f0e54ad0a8c0263f9f0aa609c21831823 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 8 Jul 2024 22:20:41 +0200
Subject: [PATCH 2393/2811] Write new release notes for the new author system

---
 RELEASE_NOTES.md | 52 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3a3f3fc2eb5..9e683ffcf96 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -152,20 +152,50 @@ Of course, if you have disabled any of the features, do not include them in the
 
 ### Post Author changes
 
-This release makes major improvements into the usability and design of the blog post author feature.
+This release makes major improvements to the usability and design of the blog post author feature.
 
 Here is the full list of changes:
 
-- Breaking: The `hyde.authors` config setting should now be keyed by the usernames
-- Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`)
-- Feature: We now support setting authors in the YAML configuration! Fixes `#1719`
-- Feature: Added a `$author->getPosts()` method to get all author's posts
-- Feature: Authors now can also have custom biographies and social media links
-- The PostAuthor class is now Arrayable and JsonSerializable
-- The collection of site authors are now stored in the HydeKernel
-- Authors can additionally be accessed through `Hyde::authors()`
-
-For more information, see https://github.com/hydephp/develop/pull/1782
+- Breaking: The `hyde.authors` config setting must now be keyed by the usernames, instead of providing the username in the author facade constructor.
+- Breaking: The `Author::create()` method now returns an array instead of a `PostAuthor` instance. This only affects custom code that uses the `Author` facade.
+- Breaking: The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. This only affects custom code that uses the `Author` facade.
+- Removed: The deprecated `PostAuthor::getName()` method has been removed (use `$author->name` instead).
+- Changed: Author usernames are now automatically normalized (converted to lowercase and spaces replaced with underscores in order to ensure URL routability).
+- Changed: If an author display name is not provided, it is now intelligently generated from the username.
+- Feature: Authors can now be set in the YAML configuration.
+- Feature: Added a `$author->getPosts()` method to get all of an author's posts.
+- Feature: Authors now support custom biographies, avatars, and social media links. Note that these are not currently used in any of the default templates, but you can use them in your custom views.
+- The collection of site authors is now stored in the HydeKernel, meaning authors can be accessed through `Hyde::authors()`.
+- The `PostAuthor` class is now Arrayable and JsonSerializable.
+
+#### Upgrade guide:
+
+1. Update your `config/hyde.php` file to use the new author configuration format:
+   ```php
+   'authors' => [
+       'username' => Author::create(
+           name: 'Display Name',
+           website: 'https://example.com',
+           bio: 'Author bio',
+           avatar: 'avatar.png',
+           socials: ['twitter' => '@username']
+       ),
+   ],
+   ```
+
+2. Review and update any code that uses the `Author` facade:
+  - The `create()` method now returns an array instead of a `PostAuthor` instance.
+  - The `get()` method may return `null`, so handle this case in your code.
+
+3. Check your blog post front matter and ensure that `author` fields match the new username keys in your configuration.
+
+4. If you have custom templates that use author data, update them to:
+  - Optional: Feel free to use the new available fields: `bio`, `avatar`, and `socials`.
+  - Account for usernames now being lowercase with underscores which may lead to changed HTML or URL paths.
+
+5. If you were relying on `Author::get()` to create new authors on the fly, update your code to handle `null` returns or create authors explicitly.
+
+For more information, see https://github.com/hydephp/develop/pull/1782 and https://github.com/hydephp/develop/pull/1798
 
 ### Documentation search page changes
 

From f25e4423543a8d53aeb58d90f0d66a34facc36e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 09:49:39 +0200
Subject: [PATCH 2394/2811] Document all breaking author changes in changelist

---
 RELEASE_NOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9e683ffcf96..998c920ef11 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -21,6 +21,8 @@ This serves two purposes:
 - **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
 - **Breaking:** Renamed class `DataCollections` to `DataCollection`. For more information, see below.
 - **Breaking:** The `hyde.authors` config setting should now be keyed by the usernames. For more information, see below.
+- **Breaking:** The `Author::create()` method now returns an array instead of a `PostAuthor` instance. For more information, see below.
+- **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)

From 50de689dafb9c569cfe93417bb4bb76aa68eee50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:09:44 +0200
Subject: [PATCH 2395/2811] Test all post author fields can be set in front
 matter

---
 .../Feature/PostsAuthorIntegrationTest.php    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 7a22d73d5b9..9fdc0f22ec8 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Facades\Author;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -91,6 +92,46 @@ public function testCreatePostWithDefinedAuthorWithWebsite()
         );
     }
 
+    public function testAllPostAuthorFieldsCanBeSetInFrontMatter()
+    {
+        $this->file('_posts/post-with-all-author-fields.md', <<<'MD'
+            ---
+            author:
+                username: mr_hyde
+                name: Mr. Hyde
+                website: https://hydephp.com
+                bio: The mysterious author of HydePHP
+                avatar: avatar.png
+                socials:
+                    twitter: "@HydeFramework"
+                    github: hydephp
+            ---
+            
+            # Post with all author fields
+            MD
+        );
+
+        $this->artisan('rebuild _posts/post-with-all-author-fields.md')->assertExitCode(0);
+        $this->cleanUpWhenDone('_site/posts/post-with-all-author-fields.html');
+        $this->assertFileExists(Hyde::path('_site/posts/post-with-all-author-fields.html'));
+
+        $page = MarkdownPost::get('post-with-all-author-fields');
+        $this->assertNotNull($page);
+        $this->assertNotNull($page->author);
+
+        $this->assertSame([
+            'username' => 'mr_hyde',
+            'name' => 'Mr. Hyde',
+            'website' => 'https://hydephp.com',
+            'bio' => 'The mysterious author of HydePHP',
+            'avatar' => 'avatar.png',
+            'socials' => [
+                'twitter' => '@HydeFramework',
+                'github' => 'hydephp',
+            ],
+        ], $page->author->toArray());
+    }
+
     protected function createPostFile(string $title, string $author): void
     {
         (new CreatesNewMarkdownPostFile($title, '', '', $author))->save();

From 6c3f56d1f10f9acb32b58fd0b6842ec4826cfcb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:15:44 +0200
Subject: [PATCH 2396/2811] Update customization documentation for new author
 system

---
 docs/digging-deeper/customization.md | 31 +++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index de5730d01e1..58bddbbf00e 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -124,21 +124,29 @@ Here are the default settings:
 
 ### Authors
 
-Hyde has support for adding authors in front matter, for example to automatically add a link to your website or social media profiles.
-However, it's tedious to have to add those to each and every post you make, and keeping them updated is even harder.
+Hyde supports adding authors to blog posts, allowing you to automatically include information like display names and website links.
+We even support fields for avatars, biographies, and social media profiles, which you can use in your custom Blade templates. 
 
+While you can set all this data directly in the front matter, that quickly becomes tedious and hard to maintain.
 Instead, you can predefine authors in the Hyde config. When writing posts, just specify the username in the front matter,
 and the rest of the data will be pulled from a matching entry found in the configuration file.
 
-#### Example
+#### Configuration
+
+Authors are defined in the `config/hyde.php` file under the `authors` key. Each author is keyed by their username and configured using the `Author::create()` method:
 
 ```php
 // filepath: config/hyde.php
 'authors' => [
-    Author::create(
-        username: 'mr_hyde', // Required username
-        name: 'Mr. Hyde', // Optional display name
-        website: 'https://hydephp.com' // Optional website URL
+    'mr_hyde' => Author::create(
+        name: 'Mr. Hyde',
+        website: 'https://hydephp.com',
+        bio: 'The mysterious author of HydePHP',
+        avatar: 'avatar.png',
+        socials: [
+            'twitter' => '@HydeFramework',
+            'github' => 'hydephp',
+        ],
     ),
 ],
 ```
@@ -150,14 +158,21 @@ author:
     username: mr_hyde
     name: Mr. Hyde
     website: https://hydephp.com
+    bio: The mysterious author of HydePHP
+    avatar: avatar.png
+    socials:
+        twitter: "@HydeFramework"
+        github: hydephp
 ```
 
-But you only have to specify the username:
+But you only have to specify the username to get all the other data.
 
 ```yaml
 author: mr_hyde
 ```
 
+If you want to override some of the data for a specific post, you can do so in the front matter. Additionally, the front matter method is great for guest authors or one-off posts.
+
 ### Footer
 
 Most websites have a footer with copyright details and contact information. You probably want to change the Markdown to include your information, though you are of course welcome to keep the default attribution link!

From c788172bac8a30a7b4bdc136964107cf1844df56 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:18:10 +0200
Subject: [PATCH 2397/2811] Improve wording

---
 docs/digging-deeper/customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 58bddbbf00e..9e245974bc4 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -133,7 +133,7 @@ and the rest of the data will be pulled from a matching entry found in the confi
 
 #### Configuration
 
-Authors are defined in the `config/hyde.php` file under the `authors` key. Each author is keyed by their username and configured using the `Author::create()` method:
+Authors are defined in the `config/hyde.php` file under the `authors` key. Each author is keyed by their username and is configured using the `Author::create()` method:
 
 ```php
 // filepath: config/hyde.php

From 9510e21445ac269420ace0dd6dcde6134fdadcc7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:19:22 +0200
Subject: [PATCH 2398/2811] Link to related docs

---
 docs/digging-deeper/customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 9e245974bc4..be9bf142863 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -127,7 +127,7 @@ Here are the default settings:
 Hyde supports adding authors to blog posts, allowing you to automatically include information like display names and website links.
 We even support fields for avatars, biographies, and social media profiles, which you can use in your custom Blade templates. 
 
-While you can set all this data directly in the front matter, that quickly becomes tedious and hard to maintain.
+While you can set all this data directly in the [front matter](blog-posts#author), that quickly becomes tedious and hard to maintain.
 Instead, you can predefine authors in the Hyde config. When writing posts, just specify the username in the front matter,
 and the rest of the data will be pulled from a matching entry found in the configuration file.
 

From 33d786bfbc56f7c50d6d62be394fa61ac6f1ded9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:16:18 +0200
Subject: [PATCH 2399/2811] Test configured post author fields can be
 customized in front matter

---
 .../Feature/PostsAuthorIntegrationTest.php    | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index 9fdc0f22ec8..d6ee4467e49 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -132,6 +132,81 @@ public function testAllPostAuthorFieldsCanBeSetInFrontMatter()
         ], $page->author->toArray());
     }
 
+    public function testConfiguredPostAuthorFieldsCanBeCustomizedInFrontMatter()
+    {
+        Config::set('hyde.authors', [
+            'mr_hyde' => Author::create(
+                name: 'Mr. Hyde',
+                website: 'https://hydephp.com',
+                bio: 'The mysterious author of HydePHP',
+                avatar: 'avatar.png',
+                socials: [
+                    'twitter' => '@HydeFramework',
+                    'github' => 'hydephp',
+                ],
+            ),
+        ]);
+
+        $this->file('_posts/literal.md', <<<'MD'
+            ---
+            author: mr_hyde
+            ---
+            
+            # Using the configured author
+            MD
+        );
+
+        $this->file('_posts/changed.md', <<<'MD'
+            ---
+            author:
+                username: mr_hyde
+                name: Dr. Jekyll
+            ---
+            
+            # Modifying the configured author
+            MD
+        );
+
+        $this->artisan('rebuild _posts/literal.md')->assertExitCode(0);
+        $this->artisan('rebuild _posts/changed.md')->assertExitCode(0);
+        $this->assertFileExists(Hyde::path('_site/posts/literal.html'));
+        $this->assertFileExists(Hyde::path('_site/posts/changed.html'));
+        $this->cleanUpWhenDone('_site/posts/literal.html');
+        $this->cleanUpWhenDone('_site/posts/changed.html');
+
+        $page = MarkdownPost::get('literal');
+        $this->assertNotNull($page);
+        $this->assertNotNull($page->author);
+
+        $this->assertSame([
+            'username' => 'mr_hyde',
+            'name' => 'Mr. Hyde',
+            'website' => 'https://hydephp.com',
+            'bio' => 'The mysterious author of HydePHP',
+            'avatar' => 'avatar.png',
+            'socials' => [
+                'twitter' => '@HydeFramework',
+                'github' => 'hydephp',
+            ],
+        ], $page->author->toArray());
+
+        $page = MarkdownPost::get('changed');
+        $this->assertNotNull($page);
+        $this->assertNotNull($page->author);
+
+        $this->assertSame([
+            'username' => 'mr_hyde',
+            'name' => 'Dr. Jekyll',
+            'website' => 'https://hydephp.com',
+            'bio' => 'The mysterious author of HydePHP',
+            'avatar' => 'avatar.png',
+            'socials' => [
+                'twitter' => '@HydeFramework',
+                'github' => 'hydephp',
+            ],
+        ], $page->author->toArray());
+    }
+
     protected function createPostFile(string $title, string $author): void
     {
         (new CreatesNewMarkdownPostFile($title, '', '', $author))->save();

From b1bb99a7be8348683a94efcd3120925632d0f817 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:22:35 +0200
Subject: [PATCH 2400/2811] Fix documented discrepancy against actuality as
 changes are not merged

---
 docs/digging-deeper/customization.md                   |  2 +-
 .../tests/Feature/PostsAuthorIntegrationTest.php       | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index be9bf142863..5d066e7653b 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -171,7 +171,7 @@ But you only have to specify the username to get all the other data.
 author: mr_hyde
 ```
 
-If you want to override some of the data for a specific post, you can do so in the front matter. Additionally, the front matter method is great for guest authors or one-off posts.
+If you want to override the data for a specific post, you can do so in the front matter. Additionally, the front matter method is great for guest authors or one-off posts.
 
 ### Footer
 
diff --git a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
index d6ee4467e49..c88d2389929 100644
--- a/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
+++ b/packages/framework/tests/Feature/PostsAuthorIntegrationTest.php
@@ -132,7 +132,7 @@ public function testAllPostAuthorFieldsCanBeSetInFrontMatter()
         ], $page->author->toArray());
     }
 
-    public function testConfiguredPostAuthorFieldsCanBeCustomizedInFrontMatter()
+    public function testConfiguredPostAuthorFieldsCanBeOverriddenInFrontMatter()
     {
         Config::set('hyde.authors', [
             'mr_hyde' => Author::create(
@@ -197,13 +197,7 @@ public function testConfiguredPostAuthorFieldsCanBeCustomizedInFrontMatter()
         $this->assertSame([
             'username' => 'mr_hyde',
             'name' => 'Dr. Jekyll',
-            'website' => 'https://hydephp.com',
-            'bio' => 'The mysterious author of HydePHP',
-            'avatar' => 'avatar.png',
-            'socials' => [
-                'twitter' => '@HydeFramework',
-                'github' => 'hydephp',
-            ],
+            // The original fields are not overwritten
         ], $page->author->toArray());
     }
 

From b8a2b10f816ddbacb44cbb50ec78dbb3163be9f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:24:22 +0200
Subject: [PATCH 2401/2811] Improve documentation section wording

---
 docs/digging-deeper/customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 5d066e7653b..572aae3b5d5 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -171,7 +171,7 @@ But you only have to specify the username to get all the other data.
 author: mr_hyde
 ```
 
-If you want to override the data for a specific post, you can do so in the front matter. Additionally, the front matter method is great for guest authors or one-off posts.
+If you want to override the data for a specific post, you can do so in the [front matter](blog-posts#author) which is great for guest authors or one-off posts.
 
 ### Footer
 

From 5fda7061c0b6a7846c094cdd91d8a5937fea7ffa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:26:00 +0200
Subject: [PATCH 2402/2811] Document the optional fields better

---
 docs/digging-deeper/customization.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 572aae3b5d5..829f0b09fde 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -139,8 +139,11 @@ Authors are defined in the `config/hyde.php` file under the `authors` key. Each
 // filepath: config/hyde.php
 'authors' => [
     'mr_hyde' => Author::create(
+        // The following fields, along with the username, are used by the default blog post templates.
         name: 'Mr. Hyde',
         website: 'https://hydephp.com',
+        
+        // These fields are not currently used in the default templates, but you can use them in your custom views.
         bio: 'The mysterious author of HydePHP',
         avatar: 'avatar.png',
         socials: [

From a5fe0e05b473b47a737ed82f5071fbcc74edada8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:30:42 +0200
Subject: [PATCH 2403/2811] Document fields and notes

---
 docs/digging-deeper/customization.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 829f0b09fde..1349c01d9b4 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -176,6 +176,23 @@ author: mr_hyde
 
 If you want to override the data for a specific post, you can do so in the [front matter](blog-posts#author) which is great for guest authors or one-off posts.
 
+
+#### Available Fields
+
+- `name`: The author's display name (optional, generated from username if not provided)
+- `website`: The author's website URL (optional)
+- `bio`: A short biography (optional, not used in default templates)
+- `avatar`: Path to the author's avatar image (optional, not used in default templates)
+- `socials`: An array of social media links (optional, not used in default templates)
+
+#### Notes
+
+- Usernames are automatically normalized (converted to lowercase with spaces replaced by underscores)
+- The `PostAuthor` class includes a `getPosts()` method to retrieve all posts by an author
+- Authors can be accessed through `Hyde::authors()`
+
+For more advanced usage and customization, refer to the source code which is well documented.
+
 ### Footer
 
 Most websites have a footer with copyright details and contact information. You probably want to change the Markdown to include your information, though you are of course welcome to keep the default attribution link!

From 60b68311a08e5c117f7b6af260bc934cf6aa64d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:30:49 +0200
Subject: [PATCH 2404/2811] Link to the source code

---
 docs/digging-deeper/customization.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 1349c01d9b4..75a01280a7b 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -191,7 +191,7 @@ If you want to override the data for a specific post, you can do so in the [fron
 - The `PostAuthor` class includes a `getPosts()` method to retrieve all posts by an author
 - Authors can be accessed through `Hyde::authors()`
 
-For more advanced usage and customization, refer to the source code which is well documented.
+For more advanced usage and customization, refer to the [source code](https://github.com/hydephp/framework/blob/master/src/Framework/Features/Blogging/Models/PostAuthor.php) which is well documented.
 
 ### Footer
 

From 931f429f4f040bf395a4dac4863876640962326b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:31:28 +0200
Subject: [PATCH 2405/2811] Link to the facade

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index f7dd78593a5..79778bc4799 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -18,6 +18,8 @@
 
 /**
  * Object representation of a blog post author for the site.
+ *
+ * @see \Hyde\Facades\Author For the facade to conveniently interact with and create authors.
  */
 class PostAuthor implements Stringable, SerializableContract
 {

From d1927e503c57e317a0cf6c12bed2b188e42f061c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 10:33:41 +0200
Subject: [PATCH 2406/2811] Update blog post documentation for new author
 system

---
 docs/creating-content/blog-posts.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/creating-content/blog-posts.md b/docs/creating-content/blog-posts.md
index 182c395cdff..c0557cd468c 100644
--- a/docs/creating-content/blog-posts.md
+++ b/docs/creating-content/blog-posts.md
@@ -150,13 +150,23 @@ author: mr_hyde
 
 ```yaml
 author:
+    # These are used in the default author templates
     name: "Mr. Hyde"
     username: mr_hyde
     website: https://twitter.com/HydeFramework
+
+    # These are not used in the default author templates, but can be used in your custom views
+    bio: "The mysterious author of HydePHP"
+    avatar: avatar.png
+    socials:
+      twitter: "@HydeFramework"
+      github: "hydephp"
 ```
 
-When specifying an array you don't need all the sub-properties. The example just shows all the supported values.
-Array values here will override all the values in the `authors` config entry, if one exists.
+
+When using an array, you don't need to include all properties. Specified values will override the corresponding entries in the `authors` config.
+
+Note: Author usernames are automatically normalized (converted to lowercase with spaces replaced by underscores).
 
 ### Image
 

From 1086372b422fe0e99dcd9fb4354ecc1cc6b33dce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 9 Jul 2024 13:02:50 +0200
Subject: [PATCH 2407/2811] Migrate configuration to 2.x Authors API

[2.x] Breaking: Improve the new Authors API
---
 monorepo/gh-pages/gh-pages-config-dev-docs/config/hyde.php | 3 +--
 monorepo/gh-pages/gh-pages-config/config/hyde.php          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/monorepo/gh-pages/gh-pages-config-dev-docs/config/hyde.php b/monorepo/gh-pages/gh-pages-config-dev-docs/config/hyde.php
index 8c2fac4bd92..afe764c64fb 100644
--- a/monorepo/gh-pages/gh-pages-config-dev-docs/config/hyde.php
+++ b/monorepo/gh-pages/gh-pages-config-dev-docs/config/hyde.php
@@ -144,8 +144,7 @@
     */
 
     'authors' => [
-        Author::create(
-            username: 'mr_hyde', // Required username
+        'mr_hyde' => Author::create(
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com' // Optional website URL
         ),
diff --git a/monorepo/gh-pages/gh-pages-config/config/hyde.php b/monorepo/gh-pages/gh-pages-config/config/hyde.php
index 90c42014b33..590ab91162a 100644
--- a/monorepo/gh-pages/gh-pages-config/config/hyde.php
+++ b/monorepo/gh-pages/gh-pages-config/config/hyde.php
@@ -143,8 +143,7 @@
     */
 
     'authors' => [
-        Author::create(
-            username: 'mr_hyde', // Required username
+        'mr_hyde' => Author::create(
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com' // Optional website URL
         ),

From 9046c882eac9d6f8ea28e6d222bc7476189c843d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 12:43:07 +0200
Subject: [PATCH 2408/2811] Create NavigationFacadeTest.php

---
 .../tests/Unit/Facades/NavigationFacadeTest.php   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Facades/NavigationFacadeTest.php

diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
new file mode 100644
index 00000000000..f9474f285bc
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Facades\Navigation
+ */
+class NavigationFacadeTest extends UnitTestCase
+{
+    //
+}

From 1b4b0b494fa39ac73f3a11f6a596f624c526f9e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 12:39:10 +0200
Subject: [PATCH 2409/2811] Create Navigation.php

---
 packages/framework/src/Facades/Navigation.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Facades/Navigation.php

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
new file mode 100644
index 00000000000..a1e2286b01f
--- /dev/null
+++ b/packages/framework/src/Facades/Navigation.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Facades;
+
+class Navigation
+{
+    //
+}

From 53c29dc9fe45a67dbc55789b858e48189e35e40f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 12:44:04 +0200
Subject: [PATCH 2410/2811] Alias the Navigation facade

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

diff --git a/app/config.php b/app/config.php
index ab5db6907b0..143a4a6dda4 100644
--- a/app/config.php
+++ b/app/config.php
@@ -97,6 +97,7 @@
         'Features' => \Hyde\Facades\Features::class,
         'Config' => \Hyde\Facades\Config::class,
         'Filesystem' => \Hyde\Facades\Filesystem::class,
+        'Navigation' => \Hyde\Facades\Navigation::class,
         'Routes' => \Hyde\Foundation\Facades\Routes::class,
         'HtmlPage' => \Hyde\Pages\HtmlPage::class,
         'BladePage' => \Hyde\Pages\BladePage::class,

From c35db97b1c8b8235243182a13589c19a2d02d1c3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 12:46:51 +0200
Subject: [PATCH 2411/2811] Add facade class documentation

---
 packages/framework/src/Facades/Navigation.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index a1e2286b01f..60d4ac8360a 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Facades;
 
+/**
+ * General facade for navigation features.
+ */
 class Navigation
 {
     //

From 7638b0a9beb30caa81d9739abb4c0184402f93b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:03:52 +0200
Subject: [PATCH 2412/2811] Import used function

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

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 1b810bb19ee..c5e042742d0 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -7,6 +7,8 @@
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Illuminate\Support\Collection;
 
+use function compact;
+
 /**
  * Allows you to easily add pre-defined authors for your blog posts.
  *

From 97aea64db307fc6a234f4d32b08cac53142436d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 12:57:02 +0200
Subject: [PATCH 2413/2811] Refactor unit test to use the unit test case

---
 .../tests/Unit/Facades/AuthorTest.php         | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index b15dec9a55f..8c61b3e5993 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -4,15 +4,31 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Hyde;
 use Hyde\Facades\Author;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Testing\TestCase;
+use Hyde\Testing\UnitTestCase;
 
 /**
  * @covers \Hyde\Facades\Author
  */
-class AuthorTest extends TestCase
+class AuthorTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        static $config = null;
+
+        if ($config === null) {
+            $config = require_once Hyde::path('config/hyde.php');
+        }
+
+        self::mockConfig(['hyde' => $config]);
+    }
+
     public function testCreate()
     {
         $author = Author::create('John Doe', 'https://johndoe.com');

From 241a894d7643651dd98e38f315cbb30fccfef98c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:03:21 +0200
Subject: [PATCH 2414/2811] Simplify test

---
 packages/framework/tests/Unit/Facades/AuthorTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index 8c61b3e5993..8213f6b558b 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -20,11 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        static $config = null;
-
-        if ($config === null) {
-            $config = require_once Hyde::path('config/hyde.php');
-        }
+        $config = require_once Hyde::path('config/hyde.php');
 
         self::mockConfig(['hyde' => $config]);
     }

From a387d53b7575a73f4cd1b6126c2ec65ea27abe88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:05:07 +0200
Subject: [PATCH 2415/2811] Use require instead of require once

---
 packages/framework/tests/Unit/Facades/AuthorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index 8213f6b558b..4e295379f55 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $config = require_once Hyde::path('config/hyde.php');
+        $config = require Hyde::path('config/hyde.php');
 
         self::mockConfig(['hyde' => $config]);
     }

From fa5ad03fcabecad32aec9919ffde1272bf852a82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:07:02 +0200
Subject: [PATCH 2416/2811] Revert "Simplify test"

This reverts commit 241a894d7643651dd98e38f315cbb30fccfef98c.
---
 packages/framework/tests/Unit/Facades/AuthorTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index 4e295379f55..8c45f5637e9 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -20,7 +20,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $config = require Hyde::path('config/hyde.php');
+        static $config = null;
+
+        if ($config === null) {
+            $config = require Hyde::path('config/hyde.php');
+        }
 
         self::mockConfig(['hyde' => $config]);
     }

From b49214951f4daa5301a8eb554d15cc5e468c650c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:10:47 +0200
Subject: [PATCH 2417/2811] Rename test to make it easier to find

---
 .../tests/Unit/Facades/{AuthorTest.php => AuthorFacadeTest.php} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Unit/Facades/{AuthorTest.php => AuthorFacadeTest.php} (98%)

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorFacadeTest.php
similarity index 98%
rename from packages/framework/tests/Unit/Facades/AuthorTest.php
rename to packages/framework/tests/Unit/Facades/AuthorFacadeTest.php
index 8c45f5637e9..43bc49291e2 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorFacadeTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers \Hyde\Facades\Author
  */
-class AuthorTest extends UnitTestCase
+class AuthorFacadeTest extends UnitTestCase
 {
     protected static bool $needsKernel = true;
 

From c97c935f0d0bc65c0e468cb74488d920b4870652 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:12:14 +0200
Subject: [PATCH 2418/2811] Remove unnecessary PHPDoc annotations offering no
 new information

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 79778bc4799..8b92866f768 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -71,11 +71,6 @@ class PostAuthor implements Stringable, SerializableContract
      *
      * If your input is in the form of an array, you may rather want to use the `create` method.
      *
-     * @param  string  $username
-     * @param  string|null  $name
-     * @param  string|null  $website
-     * @param  string|null  $bio
-     * @param  string|null  $avatar
      * @param  array<string, string>  $socials
      */
     public function __construct(string $username, ?string $name = null, ?string $website = null, ?string $bio = null, ?string $avatar = null, ?array $socials = null)

From 623a8af6c10d31f14d1eeb01c3bcf1419675d320 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 13:12:59 +0200
Subject: [PATCH 2419/2811] Remove extra whitespace in comment

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 8b92866f768..e9448384f45 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -97,7 +97,7 @@ public static function create(array $data): PostAuthor
         ], $data));
     }
 
-    /**  Get a Post Author instance by username, or null if not found. */
+    /** Get a Post Author instance by username, or null if not found. */
     public static function get(string $username): ?static
     {
         return static::all()->get(static::normalizeUsername($username));

From 5e276288d2008d2d82361f07a544e505086468fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 15:55:39 +0200
Subject: [PATCH 2420/2811] Add configuration helper to the Navigation facade
 to create item array

---
 packages/framework/src/Facades/Navigation.php | 18 ++++++++++++++-
 .../Unit/Facades/NavigationFacadeTest.php     | 23 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index 60d4ac8360a..a91b41fef5a 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -4,10 +4,26 @@
 
 namespace Hyde\Facades;
 
+use function compact;
+
 /**
  * General facade for navigation features.
  */
 class Navigation
 {
-    //
+    /**
+     * Configuration helper method to define a new navigation item, with better IDE support.
+     *
+     * The returned array will then be used by the framework to create a new NavigationItem instance.
+     *
+     * @see https://hydephp.com/docs/2.x/navigation-api
+     *
+     * @param  string<\Hyde\Support\Models\RouteKey>|string  $destination  Route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     */
+    public static function item(string $destination, ?string $label = null, ?int $priority = null): array
+    {
+        return compact('destination', 'label', 'priority');
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index f9474f285bc..2c7e27e61ac 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Facades;
 
+use Hyde\Facades\Navigation;
 use Hyde\Testing\UnitTestCase;
 
 /**
@@ -11,5 +12,25 @@
  */
 class NavigationFacadeTest extends UnitTestCase
 {
-    //
+    public function testItem(): void
+    {
+        $item = Navigation::item('home', 'Home', 100);
+
+        $this->assertSame([
+            'destination' => 'home',
+            'label' => 'Home',
+            'priority' => 100,
+        ], $item);
+    }
+
+    public function testItemWithOnlyDestination(): void
+    {
+        $item = Navigation::item('home');
+
+        $this->assertSame([
+            'destination' => 'home',
+            'label' => null,
+            'priority' => null,
+        ], $item);
+    }
 }

From 7733c698ceda2d14b60708f2a4674cf9ca5badad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 15:58:32 +0200
Subject: [PATCH 2421/2811] Remove test method type annotations

---
 .../framework/tests/Unit/Facades/NavigationFacadeTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index 2c7e27e61ac..b9365eefb0d 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -12,7 +12,7 @@
  */
 class NavigationFacadeTest extends UnitTestCase
 {
-    public function testItem(): void
+    public function testItem()
     {
         $item = Navigation::item('home', 'Home', 100);
 
@@ -23,7 +23,7 @@ public function testItem(): void
         ], $item);
     }
 
-    public function testItemWithOnlyDestination(): void
+    public function testItemWithOnlyDestination()
     {
         $item = Navigation::item('home');
 

From 4c99f022e6a38703bedf837625850fdee735b395 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 15:58:18 +0200
Subject: [PATCH 2422/2811] Test item method with URL

---
 .../tests/Unit/Facades/NavigationFacadeTest.php       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index b9365eefb0d..bbc7e2d84f0 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -33,4 +33,15 @@ public function testItemWithOnlyDestination()
             'priority' => null,
         ], $item);
     }
+
+    public function testItemWithUrl()
+    {
+        $item = Navigation::item('https://example.com', 'External', 200);
+
+        $this->assertSame([
+            'destination' => 'https://example.com',
+            'label' => 'External',
+            'priority' => 200,
+        ], $item);
+    }
 }

From 598df29b13fac48d3a27ada08c45d18365dc224a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:01:38 +0200
Subject: [PATCH 2423/2811] Prepare generator for configuration type change

---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d2bd01921f8..d2dbab7d0d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -17,6 +17,7 @@
 use function collect;
 use function in_array;
 use function strtolower;
+use function trigger_deprecation;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -81,7 +82,16 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem|array $item): void {
+                // In preparation of refactor:
+                // @codeCoverageIgnoreStart
+                if (is_array($item)) {
+                    $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+                } else {
+                    trigger_deprecation('hydephp/hyde', '2.0', 'Passing a NavigationItem instance directly to the navigation menu is deprecated. Use the array format instead. (Replace with \Navigation::item(...))');
+                }
+                // @codeCoverageIgnoreEnd
+
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
             });

From ebb703828bc34064d100862e982916ee7384cd39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:03:32 +0200
Subject: [PATCH 2424/2811] Test covers the navigation facade

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8d3ee0e380d..c5763cf2e89 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -28,6 +28,7 @@
  *
  * @see \Hyde\Framework\Testing\Unit\Views\NavigationHtmlLayoutsTest
  *
+ * @covers \Hyde\Facades\Navigation
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuGenerator
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar

From 7fcd967f0784b248016288e255205fe37eaeb8e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:06:50 +0200
Subject: [PATCH 2425/2811] Remove temporary refactor code

Want to see where this fails so we can update it in the right places
---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d2dbab7d0d2..e510dcdae28 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -17,7 +17,6 @@
 use function collect;
 use function in_array;
 use function strtolower;
-use function trigger_deprecation;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -82,15 +81,8 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem|array $item): void {
-                // In preparation of refactor:
-                // @codeCoverageIgnoreStart
-                if (is_array($item)) {
-                    $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
-                } else {
-                    trigger_deprecation('hydephp/hyde', '2.0', 'Passing a NavigationItem instance directly to the navigation menu is deprecated. Use the array format instead. (Replace with \Navigation::item(...))');
-                }
-                // @codeCoverageIgnoreEnd
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
+                $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
 
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);

From ab6e659a97f4f667f1183072168f121b1aa732af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:12:33 +0200
Subject: [PATCH 2426/2811] Revert "Remove temporary refactor code"

This reverts commit 7fcd967f0784b248016288e255205fe37eaeb8e9.
---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index e510dcdae28..d2dbab7d0d2 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -17,6 +17,7 @@
 use function collect;
 use function in_array;
 use function strtolower;
+use function trigger_deprecation;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -81,8 +82,15 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
-                $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem|array $item): void {
+                // In preparation of refactor:
+                // @codeCoverageIgnoreStart
+                if (is_array($item)) {
+                    $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+                } else {
+                    trigger_deprecation('hydephp/hyde', '2.0', 'Passing a NavigationItem instance directly to the navigation menu is deprecated. Use the array format instead. (Replace with \Navigation::item(...))');
+                }
+                // @codeCoverageIgnoreEnd
 
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);

From b22c3118d502bb1b4b1bc121cd633f9908ec40fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:12:39 +0200
Subject: [PATCH 2427/2811] Revert "Prepare generator for configuration type
 change"

This reverts commit 598df29b13fac48d3a27ada08c45d18365dc224a.
---
 .../Features/Navigation/NavigationMenuGenerator.php  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d2dbab7d0d2..d2bd01921f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -17,7 +17,6 @@
 use function collect;
 use function in_array;
 use function strtolower;
-use function trigger_deprecation;
 
 /**
  * @experimental This class may change significantly before its release.
@@ -82,16 +81,7 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem|array $item): void {
-                // In preparation of refactor:
-                // @codeCoverageIgnoreStart
-                if (is_array($item)) {
-                    $item = NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
-                } else {
-                    trigger_deprecation('hydephp/hyde', '2.0', 'Passing a NavigationItem instance directly to the navigation menu is deprecated. Use the array format instead. (Replace with \Navigation::item(...))');
-                }
-                // @codeCoverageIgnoreEnd
-
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
             });

From 7188b38d998eeaa949e0e1dda367a6e1f2b0eb7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:13:37 +0200
Subject: [PATCH 2428/2811] Breaking: The custom navigation item config now
 uses array inputs

---
 .../Navigation/NavigationMenuGenerator.php    |  4 +-
 .../tests/Feature/NavigationMenuTest.php      | 45 ++++++++++++++++---
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index d2bd01921f8..c9a0ad405d6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -81,9 +81,9 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (NavigationItem $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
-                $this->items->push($item);
+                $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null));
             });
         }
     }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 7f6cb8b3ac7..3c6876935c3 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Hyde;
+use Hyde\Facades\Navigation;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationGroup;
@@ -91,9 +92,39 @@ public function testIsSortedAutomaticallyWhenUsingNavigationMenuCreate()
         $this->assertEquals($expected, $menu->getItems());
     }
 
+    public function testCanAddCustomLinksInConfig()
+    {
+        config(['hyde.navigation.custom' => [Navigation::item('foo', 'Foo')]]);
+
+        $menu = $this->createNavigationMenu();
+
+        $expected = collect([
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create('foo', 'Foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
+    }
+
+    public function testCanAddCustomLinksInConfigAsArray()
+    {
+        config(['hyde.navigation.custom' => [['destination' => 'foo', 'label' => 'Foo']]]);
+
+        $menu = $this->createNavigationMenu();
+
+        $expected = collect([
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create('foo', 'Foo'),
+        ]);
+
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
+    }
+
     public function testExternalLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::create('https://example.com', 'foo')]]);
+        config(['hyde.navigation.custom' => [Navigation::item('https://example.com', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
@@ -108,7 +139,7 @@ public function testExternalLinkCanBeAddedInConfig()
 
     public function testPathLinkCanBeAddedInConfig()
     {
-        config(['hyde.navigation.custom' => [NavigationItem::create('foo', 'foo')]]);
+        config(['hyde.navigation.custom' => [Navigation::item('foo', 'foo')]]);
 
         $menu = $this->createNavigationMenu();
 
@@ -124,8 +155,8 @@ public function testPathLinkCanBeAddedInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::create('foo', 'foo'),
-            NavigationItem::create('foo', 'foo'),
+            Navigation::item('foo', 'foo'),
+            Navigation::item('foo', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
@@ -143,8 +174,8 @@ public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     public function testDuplicatesAreNotRemovedWhenAddingInConfigRegardlessOfDestination()
     {
         config(['hyde.navigation.custom' => [
-            NavigationItem::create('foo', 'foo'),
-            NavigationItem::create('bar', 'foo'),
+            Navigation::item('foo', 'foo'),
+            Navigation::item('bar', 'foo'),
         ]]);
 
         $menu = $this->createNavigationMenu();
@@ -163,7 +194,7 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
     {
         $this->file('_pages/foo.md');
 
-        config(['hyde.navigation.custom' => [NavigationItem::create('bar', 'Foo')]]);
+        config(['hyde.navigation.custom' => [Navigation::item('bar', 'Foo')]]);
 
         $menu = $this->createNavigationMenu();
 

From 8142e7f8e28d0b1d2d3478c9282708d2a20a90f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:37:37 +0200
Subject: [PATCH 2429/2811] Update Yaml configuration loader to parse
 navigation items

---
 .../Internal/LoadYamlConfiguration.php        | 16 ++++++++
 .../Feature/YamlConfigurationFeatureTest.php  | 38 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 6a1cda350e7..8ff06c9998d 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
@@ -50,6 +51,10 @@ protected function mergeParsedConfiguration(): void
                 $data['authors'] = $this->parseAuthors($data['authors']);
             }
 
+            if ($namespace === 'hyde' && isset($data['navigation']['custom'])) {
+                $data['navigation']['custom'] = $this->parseNavigationItems($data['navigation']['custom']);
+            }
+
             $this->mergeConfiguration($namespace, Arr::undot($data ?: []));
         }
     }
@@ -76,4 +81,15 @@ protected function parseAuthors(array $authors): array
             }
         });
     }
+
+    /**
+     * @param array<array{destination: string, label: ?string, priority: ?int}> $items Where destination is a route key or an external URI.
+     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
+     */
+    protected function parseNavigationItems(array $items): array
+    {
+        return Arr::map($items, function (array $item): NavigationItem {
+            return NavigationItem::create($item['destination'], $item['label'], $item['priority']);
+        });
+    }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index efb6baeb5c6..cf9c17bf423 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
+use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
@@ -456,6 +457,43 @@ public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
         unlink('hyde.yml');
     }
 
+    public function testCanSetCustomNavigationItemsInTheYamlConfig()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'https://example.com'
+                label: 'Example'
+                priority: 100
+              - destination: 'about'
+                label: 'About Us'
+                priority: 200
+              - destination: 'contact'
+                label: 'Contact'
+                priority: 300
+        YAML);
+
+        $this->runBootstrappers();
+
+        $navigationItems = config('hyde.navigation.custom');
+
+        $this->assertCount(3, $navigationItems);
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
+
+        $this->assertSame('https://example.com', $navigationItems[0]->destination);
+        $this->assertSame('Example', $navigationItems[0]->label);
+        $this->assertSame(100, $navigationItems[0]->priority);
+
+        $this->assertSame('about', $navigationItems[1]->destination);
+        $this->assertSame('About Us', $navigationItems[1]->label);
+        $this->assertSame(200, $navigationItems[1]->priority);
+
+        $this->assertSame('contact', $navigationItems[2]->destination);
+        $this->assertSame('Contact', $navigationItems[2]->label);
+        $this->assertSame(300, $navigationItems[2]->priority);
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From af201607e83f3b98872462670a3df7f024b33e31 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:43:40 +0200
Subject: [PATCH 2430/2811] Loader must create array structures as routes are
 not available yet

This is essentially no-op now so we may not need it
---
 .../Internal/LoadYamlConfiguration.php        |  5 +-
 .../Feature/YamlConfigurationFeatureTest.php  | 47 ++++++++++++++-----
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 8ff06c9998d..8b1fa0b5dc9 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -6,6 +6,7 @@
 
 use Throwable;
 use Illuminate\Support\Arr;
+use Hyde\Facades\Navigation;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -88,8 +89,8 @@ protected function parseAuthors(array $authors): array
      */
     protected function parseNavigationItems(array $items): array
     {
-        return Arr::map($items, function (array $item): NavigationItem {
-            return NavigationItem::create($item['destination'], $item['label'], $item['priority']);
+        return Arr::map($items, function (array $item): array {
+            return Navigation::item($item['destination'], $item['label'], $item['priority']);
         });
     }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index cf9c17bf423..b9de9681679 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -8,7 +8,9 @@
 use Illuminate\Support\Env;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Exceptions\InvalidConfigurationException;
+use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
  * Test the Yaml configuration feature.
@@ -476,22 +478,45 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
 
         $this->runBootstrappers();
 
-        $navigationItems = config('hyde.navigation.custom');
+        $configItems = config('hyde.navigation.custom');
 
-        $this->assertCount(3, $navigationItems);
+        $this->assertSame([
+            [
+                'destination' => 'https://example.com',
+                'label' => 'Example',
+                'priority' => 100,
+            ], [
+                'destination' => 'about',
+                'label' => 'About Us',
+                'priority' => 200,
+            ], [
+                'destination' => 'contact',
+                'label' => 'Contact',
+                'priority' => 300,
+            ],
+        ], $configItems);
+
+        /** @var NavigationItem[] $navigationItems */
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        $this->assertCount(4, $navigationItems);
         $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
 
-        $this->assertSame('https://example.com', $navigationItems[0]->destination);
-        $this->assertSame('Example', $navigationItems[0]->label);
-        $this->assertSame(100, $navigationItems[0]->priority);
+        $this->assertSame('index.html', $navigationItems[0]->getLink());
+        $this->assertSame('Home', $navigationItems[0]->getLabel());
+        $this->assertSame(0, $navigationItems[0]->getPriority());
+
+        $this->assertSame('https://example.com', $navigationItems[1]->getLink());
+        $this->assertSame('Example', $navigationItems[1]->getLabel());
+        $this->assertSame(100, $navigationItems[1]->getPriority());
 
-        $this->assertSame('about', $navigationItems[1]->destination);
-        $this->assertSame('About Us', $navigationItems[1]->label);
-        $this->assertSame(200, $navigationItems[1]->priority);
+        $this->assertSame('about', $navigationItems[2]->getLink());
+        $this->assertSame('About Us', $navigationItems[2]->getLabel());
+        $this->assertSame(200, $navigationItems[2]->getPriority());
 
-        $this->assertSame('contact', $navigationItems[2]->destination);
-        $this->assertSame('Contact', $navigationItems[2]->label);
-        $this->assertSame(300, $navigationItems[2]->priority);
+        $this->assertSame('contact', $navigationItems[3]->getLink());
+        $this->assertSame('Contact', $navigationItems[3]->getLabel());
+        $this->assertSame(300, $navigationItems[3]->getPriority());
     }
 
     protected function runBootstrappers(?array $withMergedConfig = null): void

From 01f36306263c2661a90de67142cf7b6a7800c4f0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 16:44:05 +0200
Subject: [PATCH 2431/2811] Clean up code

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 8b1fa0b5dc9..18413688ebe 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -9,10 +9,10 @@
 use Hyde\Facades\Navigation;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
-use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
+use function tap;
 use function array_merge;
 
 /**
@@ -84,7 +84,7 @@ protected function parseAuthors(array $authors): array
     }
 
     /**
-     * @param array<array{destination: string, label: ?string, priority: ?int}> $items Where destination is a route key or an external URI.
+     * @param  array<array{destination: string, label: ?string, priority: ?int}>  $items  Where destination is a route key or an external URI.
      * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
      */
     protected function parseNavigationItems(array $items): array

From 0724ac00e49919d139026f00291e92cc16ff65d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:04:04 +0200
Subject: [PATCH 2432/2811] Test navigation items in the YAML config can be
 resolved to routes

---
 .../Feature/YamlConfigurationFeatureTest.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index b9de9681679..8457f163fb7 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -4,8 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Env;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
@@ -519,6 +521,32 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
         $this->assertSame(300, $navigationItems[3]->getPriority());
     }
 
+    public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'about'
+        YAML);
+
+        $this->runBootstrappers();
+
+        Hyde::routes()->addRoute((new MarkdownPage('about', ['title' => 'About Us', 'navigation' => ['priority' => 250]]))->getRoute());
+
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        // The route is already automatically added to the navigation menu, so we'll have two of it.
+        $this->assertCount(3, $navigationItems);
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
+
+        $this->assertEquals($navigationItems[1], $navigationItems[2]);
+
+        $this->assertSame('about.html', $navigationItems[1]->getLink());
+        $this->assertSame('About Us', $navigationItems[1]->getLabel());
+        $this->assertSame(250, $navigationItems[1]->getPriority());
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 600dfd5e325d73c0d8ebb17158561ce4eda17603 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:09:01 +0200
Subject: [PATCH 2433/2811] Add null fallbacks

---
 .../Internal/LoadYamlConfiguration.php        |  2 +-
 .../Feature/YamlConfigurationFeatureTest.php  | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 18413688ebe..d8aa49f44d8 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -90,7 +90,7 @@ protected function parseAuthors(array $authors): array
     protected function parseNavigationItems(array $items): array
     {
         return Arr::map($items, function (array $item): array {
-            return Navigation::item($item['destination'], $item['label'], $item['priority']);
+            return Navigation::item($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
         });
     }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 8457f163fb7..c7cf48962f2 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -521,6 +521,42 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
         $this->assertSame(300, $navigationItems[3]->getPriority());
     }
 
+    public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'about.html'
+        YAML);
+
+        $this->runBootstrappers();
+
+        $configItems = config('hyde.navigation.custom');
+
+        $this->assertSame([
+            [
+                'destination' => 'about.html',
+                'label' => null,
+                'priority' => null,
+            ],
+        ], $configItems);
+
+        /** @var NavigationItem[] $navigationItems */
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        $this->assertCount(2, $navigationItems);
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
+
+        $this->assertSame('index.html', $navigationItems[0]->getLink());
+        $this->assertSame('Home', $navigationItems[0]->getLabel());
+        $this->assertSame(0, $navigationItems[0]->getPriority());
+
+        $this->assertSame('about.html', $navigationItems[1]->getLink());
+        $this->assertSame('about.html', $navigationItems[1]->getLabel()); // The label is automatically set to the destination.
+        $this->assertSame(500, $navigationItems[1]->getPriority());
+    }
+
     public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
     {
         $this->file('hyde.yml', <<<'YAML'

From 9af37e1aceee37d834ee8d88dc9efdafd9f53645 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:14:32 +0200
Subject: [PATCH 2434/2811] Rethrow exceptions more helpfully

---
 .../Internal/LoadYamlConfiguration.php        |  9 ++++-
 .../Feature/YamlConfigurationFeatureTest.php  | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index d8aa49f44d8..d3872cc5e55 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -90,7 +90,14 @@ protected function parseAuthors(array $authors): array
     protected function parseNavigationItems(array $items): array
     {
         return Arr::map($items, function (array $item): array {
-            return Navigation::item($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+            try {
+                return Navigation::item($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+            } catch (Throwable $exception) {
+                throw new InvalidConfigurationException(
+                    'Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.',
+                    previous: $exception
+                );
+            }
         });
     }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index c7cf48962f2..a3ee6809eec 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -557,6 +557,42 @@ public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
         $this->assertSame(500, $navigationItems[1]->getPriority());
     }
 
+    public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
+    {
+        file_put_contents('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: false
+        YAML);
+
+        try {
+            $this->runBootstrappers();
+        } catch (InvalidConfigurationException $exception) {
+            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+        }
+
+        unlink('hyde.yml');
+    }
+
+    public function testMustAddDestinationToYamlConfiguredNavigationItems()
+    {
+        file_put_contents('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - label: 'About Us'
+        YAML);
+
+        try {
+            $this->runBootstrappers();
+        } catch (InvalidConfigurationException $exception) {
+            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+        }
+
+        unlink('hyde.yml');
+    }
+
     public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
     {
         $this->file('hyde.yml', <<<'YAML'

From 4e1fbf933b85029bd6c4d63fb62f66a426aaacd2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:14:47 +0200
Subject: [PATCH 2435/2811] Reorder tests

---
 .../Feature/YamlConfigurationFeatureTest.php  | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index a3ee6809eec..bf99165f5d7 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -557,6 +557,32 @@ public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
         $this->assertSame(500, $navigationItems[1]->getPriority());
     }
 
+    public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'about'
+        YAML);
+
+        $this->runBootstrappers();
+
+        Hyde::routes()->addRoute((new MarkdownPage('about', ['title' => 'About Us', 'navigation' => ['priority' => 250]]))->getRoute());
+
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        // The route is already automatically added to the navigation menu, so we'll have two of it.
+        $this->assertCount(3, $navigationItems);
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
+
+        $this->assertEquals($navigationItems[1], $navigationItems[2]);
+
+        $this->assertSame('about.html', $navigationItems[1]->getLink());
+        $this->assertSame('About Us', $navigationItems[1]->getLabel());
+        $this->assertSame(250, $navigationItems[1]->getPriority());
+    }
+
     public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
     {
         file_put_contents('hyde.yml', <<<'YAML'
@@ -593,32 +619,6 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
         unlink('hyde.yml');
     }
 
-    public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
-    {
-        $this->file('hyde.yml', <<<'YAML'
-        hyde:
-          navigation:
-            custom:
-              - destination: 'about'
-        YAML);
-
-        $this->runBootstrappers();
-
-        Hyde::routes()->addRoute((new MarkdownPage('about', ['title' => 'About Us', 'navigation' => ['priority' => 250]]))->getRoute());
-
-        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
-
-        // The route is already automatically added to the navigation menu, so we'll have two of it.
-        $this->assertCount(3, $navigationItems);
-        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
-
-        $this->assertEquals($navigationItems[1], $navigationItems[2]);
-
-        $this->assertSame('about.html', $navigationItems[1]->getLink());
-        $this->assertSame('About Us', $navigationItems[1]->getLabel());
-        $this->assertSame(250, $navigationItems[1]->getPriority());
-    }
-
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 44573ddb8a9ad48e2f2a2c652365b91a60e9bab7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:19:46 +0200
Subject: [PATCH 2436/2811] Mark method as experimental

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

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index d3872cc5e55..ed5cf8adef8 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -84,6 +84,8 @@ protected function parseAuthors(array $authors): array
     }
 
     /**
+     * @experimental Since the main configuration also uses arrays, the only thing this method really does is to rethrow any exceptions.
+     *
      * @param  array<array{destination: string, label: ?string, priority: ?int}>  $items  Where destination is a route key or an external URI.
      * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
      */

From 74240c061285a4893feafd2b76461644cb933813 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:20:10 +0200
Subject: [PATCH 2437/2811] Update type annotation to match actual values

---
 .../framework/src/Foundation/Internal/LoadYamlConfiguration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index ed5cf8adef8..52a80feb8a4 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -87,7 +87,7 @@ protected function parseAuthors(array $authors): array
      * @experimental Since the main configuration also uses arrays, the only thing this method really does is to rethrow any exceptions.
      *
      * @param  array<array{destination: string, label: ?string, priority: ?int}>  $items  Where destination is a route key or an external URI.
-     * @return array<\Hyde\Framework\Features\Navigation\NavigationItem>
+     * @return array<array{destination: string, label: ?string, priority: ?int}>
      */
     protected function parseNavigationItems(array $items): array
     {

From a6c5ba09893f110f3a3d2886d661a36eb8466cde Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:28:31 +0200
Subject: [PATCH 2438/2811] Test extra YAML navigation item fields are ignored

---
 .../Feature/YamlConfigurationFeatureTest.php  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index bf99165f5d7..c9cf81ffadf 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -583,6 +583,37 @@ public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
         $this->assertSame(250, $navigationItems[1]->getPriority());
     }
 
+    public function testExtraYamlNavigationItemFieldsAreIgnored()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'about'
+                extra: 'field'
+        YAML);
+
+        $this->runBootstrappers();
+
+        $configItems = config('hyde.navigation.custom');
+
+        $this->assertSame([
+            [
+                'destination' => 'about',
+                'label' => null,
+                'priority' => null,
+            ],
+        ], $configItems);
+
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        $this->assertCount(2, $navigationItems);
+
+        $this->assertSame('about', $navigationItems[1]->getLink());
+        $this->assertSame('about', $navigationItems[1]->getLabel());
+        $this->assertSame(500, $navigationItems[1]->getPriority());
+    }
+
     public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
     {
         file_put_contents('hyde.yml', <<<'YAML'

From c773393387e2515469cf60f726b2bfe54ed9f3db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:29:32 +0200
Subject: [PATCH 2439/2811] Revert "Test extra YAML navigation item fields are
 ignored"

This reverts commit a6c5ba09893f110f3a3d2886d661a36eb8466cde.
---
 .../Feature/YamlConfigurationFeatureTest.php  | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index c9cf81ffadf..bf99165f5d7 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -583,37 +583,6 @@ public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
         $this->assertSame(250, $navigationItems[1]->getPriority());
     }
 
-    public function testExtraYamlNavigationItemFieldsAreIgnored()
-    {
-        $this->file('hyde.yml', <<<'YAML'
-        hyde:
-          navigation:
-            custom:
-              - destination: 'about'
-                extra: 'field'
-        YAML);
-
-        $this->runBootstrappers();
-
-        $configItems = config('hyde.navigation.custom');
-
-        $this->assertSame([
-            [
-                'destination' => 'about',
-                'label' => null,
-                'priority' => null,
-            ],
-        ], $configItems);
-
-        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
-
-        $this->assertCount(2, $navigationItems);
-
-        $this->assertSame('about', $navigationItems[1]->getLink());
-        $this->assertSame('about', $navigationItems[1]->getLabel());
-        $this->assertSame(500, $navigationItems[1]->getPriority());
-    }
-
     public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
     {
         file_put_contents('hyde.yml', <<<'YAML'

From efea4a447d966e64289169fdff75acf040bf91ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:31:10 +0200
Subject: [PATCH 2440/2811] Test adding extra YAML navigation item fields
 throws an exception

---
 .../Feature/YamlConfigurationFeatureTest.php  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index bf99165f5d7..4d8ea7376a2 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -619,6 +619,25 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
         unlink('hyde.yml');
     }
 
+    public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
+    {
+        file_put_contents('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'about'
+                extra: 'field'
+        YAML);
+
+        try {
+            $this->runBootstrappers();
+        } catch (InvalidConfigurationException $exception) {
+            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+        }
+
+        unlink('hyde.yml');
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From acb740da8ce20b6b1731a70006071ec12753e1dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:31:43 +0200
Subject: [PATCH 2441/2811] Unpack the array directly

Reduces extra code, and adds type safety as it will throw when supplied an extra parameter
---
 .../framework/src/Foundation/Internal/LoadYamlConfiguration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 52a80feb8a4..0ac92ab01d0 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -93,7 +93,7 @@ protected function parseNavigationItems(array $items): array
     {
         return Arr::map($items, function (array $item): array {
             try {
-                return Navigation::item($item['destination'], $item['label'] ?? null, $item['priority'] ?? null);
+                return Navigation::item(...$item);
             } catch (Throwable $exception) {
                 throw new InvalidConfigurationException(
                     'Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.',

From cc0f567e1ab83f6bab06a009ad7feda6e0ef0c71 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:37:30 +0200
Subject: [PATCH 2442/2811] Clean up if a test failed to clean up after itself

---
 .../tests/Feature/YamlConfigurationFeatureTest.php     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 4d8ea7376a2..71c1d5c8d24 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -25,6 +25,16 @@
  */
 class YamlConfigurationFeatureTest extends TestCase
 {
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        if (file_exists('hyde.yml')) {
+            // Clean up if a test failed to clean up after itself.
+            unlink('hyde.yml');
+        }
+    }
+
     protected function tearDown(): void
     {
         $this->clearEnvVars();

From 709bc3541086a671eb62c20f8fa8adac2c9a7348 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:41:29 +0200
Subject: [PATCH 2443/2811] Update navigation item configuration to use the new
 facade

---
 config/hyde.php                    | 3 ++-
 packages/framework/config/hyde.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 0898d2a80f4..2cbe97e8047 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -25,6 +25,7 @@
 use Hyde\Facades\Author;
 use Hyde\Facades\Meta;
 use Hyde\Enums\Feature;
+use Hyde\Facades\Navigation;
 
 return [
 
@@ -358,7 +359,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 0898d2a80f4..2cbe97e8047 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -25,6 +25,7 @@
 use Hyde\Facades\Author;
 use Hyde\Facades\Meta;
 use Hyde\Enums\Feature;
+use Hyde\Facades\Navigation;
 
 return [
 
@@ -358,7 +359,7 @@
         // To get started quickly, you can uncomment the defaults here.
         // See the documentation link above for more information.
         'custom' => [
-            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
+            // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ],
 
         // How should pages in subdirectories be displayed in the menu?

From c06a475dfde5f8bd0ba40f781b21f3a5dc8c902b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 17:50:05 +0200
Subject: [PATCH 2444/2811] Breaking: Rename `subdirectories` option to
 `subdirectory_display`

Breaking: Renames the `hyde.navigation.subdirectories` option to `hyde.navigation.subdirectory_display` to make its usage much clearer.
---
 config/hyde.php                               |  2 +-
 docs/digging-deeper/navigation.md             |  4 ++--
 packages/framework/config/hyde.php            |  2 +-
 .../Factories/NavigationDataFactory.php       |  2 +-
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../AutomaticNavigationConfigurationsTest.php | 22 +++++++++----------
 .../framework/tests/Feature/HydePageTest.php  |  6 ++---
 .../tests/Feature/NavigationMenuTest.php      |  6 ++---
 .../NumericalPageOrderingHelperTest.php       |  2 +-
 .../Unit/NavigationDataFactoryUnitTest.php    |  4 ++--
 ...veLinksAcrossPagesRetainsIntegrityTest.php |  2 +-
 .../Unit/Views/NavigationHtmlLayoutsTest.php  |  2 +-
 .../Unit/Views/NavigationMenuViewTest.php     |  4 ++--
 13 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 2cbe97e8047..8d9c62357c5 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -364,7 +364,7 @@
 
         // How should pages in subdirectories be displayed in the menu?
         // You can choose between 'dropdown', 'flat', and 'hidden'.
-        'subdirectories' => 'hidden',
+        'subdirectory_display' => 'hidden',
     ],
 
     /*
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index efbd049babd..3ff1d9d16b9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -259,7 +259,7 @@ Within the Hyde config you can configure how subdirectories should be displayed
 ```php
 // filepath config/hyde.php
 'navigation' => [
-    'subdirectories' => 'dropdown'
+    'subdirectory_display' => 'dropdown'
 ]
 ```
 
@@ -279,7 +279,7 @@ For pages that can be in the main site menu, this feature needs to be enabled in
 // filepath config/hyde.php
 
 'navigation' => [
-    'subdirectories' => 'dropdown',
+    'subdirectory_display' => 'dropdown',
 ],
 ```
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 2cbe97e8047..8d9c62357c5 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -364,7 +364,7 @@
 
         // How should pages in subdirectories be displayed in the menu?
         // You can choose between 'dropdown', 'flat', and 'hidden'.
-        'subdirectories' => 'hidden',
+        'subdirectory_display' => 'hidden',
     ],
 
     /*
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index b7b331e6db6..61526679f33 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -274,7 +274,7 @@ private function getSubdirectoryName(): string
 
     protected function getSubdirectoryConfiguration(): string
     {
-        return Config::getString('hyde.navigation.subdirectories', 'hidden');
+        return Config::getString('hyde.navigation.subdirectory_display', 'hidden');
     }
 
     /** @param class-string<\Hyde\Pages\Concerns\HydePage> $class */
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index c9a0ad405d6..eae219d2f53 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -96,7 +96,7 @@ protected function usesGroups(): bool
 
             return $this->routes->first(fn (Route $route): bool => filled($route->getPage()->navigationMenuGroup())) !== null;
         } else {
-            return Config::getString('hyde.navigation.subdirectories', 'hidden') === 'dropdown';
+            return Config::getString('hyde.navigation.subdirectory_display', 'hidden') === 'dropdown';
         }
     }
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index c5763cf2e89..ab6939903ba 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -412,7 +412,7 @@ public function testMainNavigationDropdownLabelsCanBeSetInConfig()
 
     public function testMainNavigationAutomaticSubdirectoryDropdownLabelsCanBeSetInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
         config(['hyde.navigation.labels' => ['hello' => 'World']]);
 
         $this->assertMenuEquals(['World'], [
@@ -444,7 +444,7 @@ public function testPagesInSubdirectoriesAreNotAddedToNavigation()
 
     public function testPagesInSubdirectoriesAreAddedToNavigationWhenNavigationSubdirectoriesIsSetToFlat()
     {
-        config(['hyde.navigation.subdirectories' => 'flat']);
+        config(['hyde.navigation.subdirectory_display' => 'flat']);
 
         $this->assertMenuEquals(['Foo', 'Bar', 'Baz'], [
             new MarkdownPage('about/foo'),
@@ -455,7 +455,7 @@ public function testPagesInSubdirectoriesAreAddedToNavigationWhenNavigationSubdi
 
     public function testPagesInSubdirectoriesAreAddedAsDropdownsWhenNavigationSubdirectoriesIsSetToDropdown()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $this->assertMenuEquals([
             ['label' => 'About', 'children' => ['Foo', 'Bar', 'Baz']],
@@ -502,7 +502,7 @@ public function testMainNavigationMenuItemsWithSameLabelButDifferentGroupsAreNot
 
     public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $this->assertMenuEquals([
             ['label' => 'One', 'children' => ['Foo']],
@@ -515,7 +515,7 @@ public function testMainNavigationMenuDropdownItemsWithSameLabelButDifferentGrou
 
     public function testMainNavigationMenuAutomaticDropdownItemsWithSameLabelButDifferentGroupsAreNotFiltered()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $this->assertMenuEquals([
             ['label' => 'One', 'children' => ['Foo']],
@@ -532,7 +532,7 @@ public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGi
         // we run into a conflicting state where we don't know what the user intended. We solve this by giving
         // precedence to the subdirectory configuration. This is opinionated, but allows for good grouping.
 
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $this->assertMenuEquals([
             ['label' => 'Foo', 'children' => ['Child']],
@@ -543,7 +543,7 @@ public function testConflictingSubdirectoryAndFrontMatterDropdownConfigurationGi
 
     public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $this->assertMenuEquals([
             ['label' => 'Foo', 'children' => ['Bar', 'Baz']],
@@ -555,7 +555,7 @@ public function testCanMixSubdirectoryDropdownsWithFrontMatterDropdowns()
 
     public function testMainMenuAutomaticDropdownLabelsCanBeSetInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
         config(['hyde.navigation.labels' => ['foo' => 'Bar']]);
 
         $this->assertMenuEquals([
@@ -1110,7 +1110,7 @@ public function testSidebarCanMixSubdirectoryGroupsWithFrontMatterGroups()
 
     public function testMainNavigationDropdownPriorityCanBeSetInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
         config(['hyde.navigation.order' => ['foo' => 500]]);
 
         $this->assertMenuEquals(
@@ -1121,7 +1121,7 @@ public function testMainNavigationDropdownPriorityCanBeSetInConfig()
 
     public function testMainNavigationDropdownPriorityCanBeSetInConfigUsingDifferingCases()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
         config(['hyde.navigation.order' => ['hello-world' => 500]]);
 
         $expected = [['label' => 'Hello World', 'priority' => 500]];
@@ -1176,7 +1176,7 @@ public function testMainMenuNavigationItemCasingUsingFrontMatter()
 
     public function testMainMenuNavigationGroupCasing()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         // When using subdirectory groupings, we try to format them the same way as the page titles
 
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index c6adb02918f..d9ca0150311 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -1176,7 +1176,7 @@ public function testNavigationDataFactoryHidesPageFromNavigationWhenInASubdirect
 
     public function testNavigationDataFactoryHidesPageFromNavigationWhenInAAndConfigIsSetToHidden()
     {
-        config(['hyde.navigation.subdirectories' => 'hidden']);
+        config(['hyde.navigation.subdirectory_display' => 'hidden']);
 
         $page = MarkdownPage::make('foo/bar');
 
@@ -1186,7 +1186,7 @@ public function testNavigationDataFactoryHidesPageFromNavigationWhenInAAndConfig
 
     public function testNavigationDataFactoryDoesNotHidePageFromNavigationWhenInASubdirectoryAndAllowedInConfiguration()
     {
-        config(['hyde.navigation.subdirectories' => 'flat']);
+        config(['hyde.navigation.subdirectory_display' => 'flat']);
 
         $page = MarkdownPage::make('foo/bar');
 
@@ -1196,7 +1196,7 @@ public function testNavigationDataFactoryDoesNotHidePageFromNavigationWhenInASub
 
     public function testNavigationDataFactoryAllowsShowInNavigationAndSetsGroupWhenDropdownIsSelectedInConfig()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $page = MarkdownPage::make('foo/bar');
 
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 3c6876935c3..cd9d6f72986 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -239,7 +239,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenu()
 
     public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfigFlatSetting()
     {
-        config(['hyde.navigation.subdirectories' => 'flat']);
+        config(['hyde.navigation.subdirectory_display' => 'flat']);
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
@@ -256,7 +256,7 @@ public function testPagesInSubdirectoriesCanBeAddedToTheNavigationMenuWithConfig
 
     public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfigDropdownSetting()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
         $this->directory('_pages/foo');
         $this->file('_pages/foo/bar.md');
 
@@ -275,7 +275,7 @@ public function testPagesInSubdirectoriesAreNotAddedToTheNavigationMenuWithConfi
 
     public function testPagesInDropdownsDoNotGetAddedToTheMainNavigation()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         Routes::push((new MarkdownPage('foo'))->getRoute());
         Routes::push((new MarkdownPage('bar/baz'))->getRoute());
diff --git a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
index b5b54025ac0..82137389905 100644
--- a/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
+++ b/packages/framework/tests/Feature/NumericalPageOrderingHelperTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
 
         $this->helper = new FilenamePrefixNavigationPriorityTestingHelper($this);
 
-        Config::set('hyde.navigation.subdirectories', 'dropdown');
+        Config::set('hyde.navigation.subdirectory_display', 'dropdown');
 
         // Todo: Replace kernel with mock class
         $this->withoutDefaultPages();
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
index eccd5604465..bdbca3f172e 100644
--- a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
+++ b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -248,7 +248,7 @@ public function testMakeGroupUsesFrontMatterGroupIfSet()
 
     public function testMakeGroupUsesFrontMatterGroupIfSetRegardlessOfSubdirectoryConfiguration()
     {
-        self::mockConfig(['hyde.navigation.subdirectories' => 'hidden']);
+        self::mockConfig(['hyde.navigation.subdirectory_display' => 'hidden']);
 
         $frontMatter = new FrontMatter(['navigation.group' => 'Test Group']);
         $coreDataObject = new CoreDataObject($frontMatter, new Markdown(), MarkdownPage::class, 'test.md', '', '', '');
@@ -259,7 +259,7 @@ public function testMakeGroupUsesFrontMatterGroupIfSetRegardlessOfSubdirectoryCo
 
     public function testMakeGroupDefaultsToNullIfFrontMatterGroupNotSetAndSubdirectoriesNotUsed()
     {
-        self::mockConfig(['hyde.navigation.subdirectories' => 'hidden']);
+        self::mockConfig(['hyde.navigation.subdirectory_display' => 'hidden']);
 
         $coreDataObject = new CoreDataObject(new FrontMatter(), new Markdown(), MarkdownPage::class, 'test.md', '', '', '');
         $factory = new NavigationConfigTestClass($coreDataObject);
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index facec7a3cc6..e8f9f8c1f66 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -23,7 +23,7 @@ protected function setUp(): void
         parent::setUp();
 
         config(['hyde.enable_cache_busting' => false]);
-        config(['hyde.navigation.subdirectories' => 'flat']);
+        config(['hyde.navigation.subdirectory_display' => 'flat']);
 
         $this->needsDirectory('_pages/nested');
         $this->file('_pages/root.md');
diff --git a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
index b34f0d78af2..9935ef20e84 100644
--- a/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationHtmlLayoutsTest.php
@@ -515,7 +515,7 @@ protected function sidebar(array $withPages = []): RenderedDocumentationSidebarM
 
     protected function useSubdirectoryConfig(string $option): static
     {
-        config(['hyde.navigation.subdirectories' => $option]);
+        config(['hyde.navigation.subdirectory_display' => $option]);
 
         return $this;
     }
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index 18d9bfd7cbf..e1aa632ac05 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -78,7 +78,7 @@ public function testNavigationMenuWithRootPages()
 
     public function testNavigationMenuWithDropdownPages()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $page = new MarkdownPage('page');
         $bar = new MarkdownPage('foo/bar');
@@ -104,7 +104,7 @@ public function testNavigationMenuWithDropdownPages()
 
     public function testNavigationMenuWithDropdownPagesWithRootGroupPage()
     {
-        config(['hyde.navigation.subdirectories' => 'dropdown']);
+        config(['hyde.navigation.subdirectory_display' => 'dropdown']);
 
         $foo = new MarkdownPage('foo');
         $bar = new MarkdownPage('foo/bar');

From ba547bdd23fe4d5bff18d5e7a68ff85668c2bef3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:34:17 +0200
Subject: [PATCH 2445/2811] Test the entire component state

---
 .../tests/Unit/Views/NavigationLinkViewTest.php     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index de571ed18df..877eac0b14c 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -88,4 +88,17 @@ public function testComponentHasActiveClassWhenActive()
             ->assertHasClass('navigation-link')
             ->assertHasClass('navigation-link-active');
     }
+
+    public function testComponentState()
+    {
+        $this->mockCurrentPage('foo');
+
+        $view = $this->testView();
+
+        $expected = <<<'HTML'
+        <a href="foo.html" aria-current="page" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent">Foo</a>
+        HTML;
+
+        $this->assertSame($expected, $view->getRendered());
+    }
 }

From 5d7fb5e12f88fb3cd036196246e29dee040da681 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:22:15 +0200
Subject: [PATCH 2446/2811] Add attributes array to the navigation item class

---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 43d2cf5312b..b8cbf5b81b5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,6 +23,8 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
+    protected array $attributes = [];
+
     /**
      * Create a new navigation menu item, automatically filling in the properties from a Route instance if provided.
      *

From b07ecf56cd0bbc5b17c6fba68fb5a17454177afa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:22:29 +0200
Subject: [PATCH 2447/2811] Annotate scalar array generics

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index b8cbf5b81b5..6e5d610e010 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -23,6 +23,7 @@ class NavigationItem implements Stringable
     protected string $label;
     protected int $priority;
 
+    /** @var array<string, scalar> */
     protected array $attributes = [];
 
     /**

From 9762449f1deb9ce95192181f25453d9a97a7c91f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:22:49 +0200
Subject: [PATCH 2448/2811] Add attributes accessor

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 6e5d610e010..bdec0a01a5f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -119,4 +119,9 @@ protected static function make(Route|string $destination, ?string $label = null,
 
         return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
     }
+
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
 }

From 6c5961bd5c9f8468f6bd9c75e21dc78bb5540fad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:23:27 +0200
Subject: [PATCH 2449/2811] Return attributes as component attribute bag

---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bdec0a01a5f..e70f75fb1a3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -9,6 +9,7 @@
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Stringable;
+use Illuminate\View\ComponentAttributeBag;
 
 use function is_string;
 
@@ -120,8 +121,8 @@ protected static function make(Route|string $destination, ?string $label = null,
         return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
     }
 
-    public function getAttributes(): array
+    public function getAttributes(): ComponentAttributeBag
     {
-        return $this->attributes;
+        return new ComponentAttributeBag($this->attributes);
     }
 }

From 15b97f9db5e48a9917e72080ada9bce928ae09e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:23:30 +0200
Subject: [PATCH 2450/2811] Revert "Return attributes as component attribute
 bag"

This reverts commit 3a0c2798132f9ae7a581e38ea89369cd9c68f4fe.
---
 .../src/Framework/Features/Navigation/NavigationItem.php     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index e70f75fb1a3..bdec0a01a5f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -9,7 +9,6 @@
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
 use Stringable;
-use Illuminate\View\ComponentAttributeBag;
 
 use function is_string;
 
@@ -121,8 +120,8 @@ protected static function make(Route|string $destination, ?string $label = null,
         return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
     }
 
-    public function getAttributes(): ComponentAttributeBag
+    public function getAttributes(): array
     {
-        return new ComponentAttributeBag($this->attributes);
+        return $this->attributes;
     }
 }

From 66dc9b29dc789e1d227386412162e6ababb49620 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:23:58 +0200
Subject: [PATCH 2451/2811] Rename accessor to signify it's for extra
 attributes

Inspired by Filament
---
 .../src/Framework/Features/Navigation/NavigationItem.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index bdec0a01a5f..1254ce72a53 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -120,7 +120,7 @@ protected static function make(Route|string $destination, ?string $label = null,
         return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
     }
 
-    public function getAttributes(): array
+    public function getExtraAttributes(): array
     {
         return $this->attributes;
     }

From caae63617e14ad6ef875d16ecb9851b7cd503dda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:24:47 +0200
Subject: [PATCH 2452/2811] Annotate the scalar return array

---
 .../src/Framework/Features/Navigation/NavigationItem.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 1254ce72a53..418f029f7c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -120,6 +120,7 @@ protected static function make(Route|string $destination, ?string $label = null,
         return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
     }
 
+    /** @return array<string, scalar> */
     public function getExtraAttributes(): array
     {
         return $this->attributes;

From 283016f0b68a39c270eaaa68bf776ffc252f0523 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:25:38 +0200
Subject: [PATCH 2453/2811] Merge in the extra attributes

---
 .../views/components/navigation/navigation-link.blade.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 60ce617081d..f5fc6d7de60 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -3,4 +3,4 @@
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
 ])->merge([
     'aria-current' => $item->isActive() ? 'page' : false,
-]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+])->merge($item->getExtraAttributes()) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file

From 93cef20ee21ea8447cf1731c140b78a707b1fff6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:37:22 +0200
Subject: [PATCH 2454/2811] Change merge order to preserve output format

May want to revert this later as it makes sense for user added data to be last, but this preserves the current attribute order for now
---
 .../views/components/navigation/navigation-link.blade.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index f5fc6d7de60..5d2725b22e2 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
 <a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])->merge([
+])->merge($item->getExtraAttributes())->merge([
     'aria-current' => $item->isActive() ? 'page' : false,
-])->merge($item->getExtraAttributes()) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file

From 395dbfb849cc00ac29466300ad8f8ced9f0c5cd2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:39:44 +0200
Subject: [PATCH 2455/2811] Merge in extra attributes last in component

This reverts commit 93cef20ee21ea8447cf1731c140b78a707b1fff6.
---
 .../views/components/navigation/navigation-link.blade.php     | 4 ++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index 5d2725b22e2..f5fc6d7de60 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
 <a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])->merge($item->getExtraAttributes())->merge([
+])->merge([
     'aria-current' => $item->isActive() ? 'page' : false,
-]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+])->merge($item->getExtraAttributes()) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 877eac0b14c..7f512e5c769 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -96,7 +96,7 @@ public function testComponentState()
         $view = $this->testView();
 
         $expected = <<<'HTML'
-        <a href="foo.html" aria-current="page" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent">Foo</a>
+        <a href="foo.html" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent" aria-current="page">Foo</a>
         HTML;
 
         $this->assertSame($expected, $view->getRendered());

From b558720c6c37e424c8f8cd8ba03f19182abd2992 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:45:24 +0200
Subject: [PATCH 2456/2811] Update
 RelativeLinksAcrossPagesRetainsIntegrityTest.php

---
 .../Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index e8f9f8c1f66..30267866c34 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -73,10 +73,11 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<link rel="stylesheet" href="media/app.css">',
             '<a href="index.html"',
             '<a href="docs/index.html"',
-            '<a href="root.html" aria-current="page"',
+            '<a href="root.html"',
             '<a href="root1.html"',
             '<a href="nested/level1.html"',
             '<a href="nested/level1b.html"',
+            'aria-current="page"',
         ]);
 
         $this->assertSee('nested/level1', [
@@ -85,8 +86,9 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<a href="../docs/index.html"',
             '<a href="../root.html"',
             '<a href="../root1.html"',
-            '<a href="../nested/level1.html" aria-current="page"',
+            '<a href="../nested/level1.html"',
             '<a href="../nested/level1b.html"',
+            'aria-current="page"'
         ]);
 
         $this->assertSee('docs/index', [

From 9c60087503f8811d80afc4f9305de8685c53d890 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:47:28 +0200
Subject: [PATCH 2457/2811] Revert "Update
 RelativeLinksAcrossPagesRetainsIntegrityTest.php"

This reverts commit b558720c6c37e424c8f8cd8ba03f19182abd2992.
---
 .../Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index 30267866c34..e8f9f8c1f66 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -73,11 +73,10 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<link rel="stylesheet" href="media/app.css">',
             '<a href="index.html"',
             '<a href="docs/index.html"',
-            '<a href="root.html"',
+            '<a href="root.html" aria-current="page"',
             '<a href="root1.html"',
             '<a href="nested/level1.html"',
             '<a href="nested/level1b.html"',
-            'aria-current="page"',
         ]);
 
         $this->assertSee('nested/level1', [
@@ -86,9 +85,8 @@ public function testRelativeLinksAcrossPagesRetainsIntegrity()
             '<a href="../docs/index.html"',
             '<a href="../root.html"',
             '<a href="../root1.html"',
-            '<a href="../nested/level1.html"',
+            '<a href="../nested/level1.html" aria-current="page"',
             '<a href="../nested/level1b.html"',
-            'aria-current="page"'
         ]);
 
         $this->assertSee('docs/index', [

From c087bbf46548ae8b83da6739f83480ba1ed6820e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:47:31 +0200
Subject: [PATCH 2458/2811] Revert "Merge in extra attributes last in
 component"

This reverts commit 395dbfb849cc00ac29466300ad8f8ced9f0c5cd2.
---
 .../views/components/navigation/navigation-link.blade.php     | 4 ++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index f5fc6d7de60..5d2725b22e2 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
 <a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])->merge([
+])->merge($item->getExtraAttributes())->merge([
     'aria-current' => $item->isActive() ? 'page' : false,
-])->merge($item->getExtraAttributes()) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 7f512e5c769..877eac0b14c 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -96,7 +96,7 @@ public function testComponentState()
         $view = $this->testView();
 
         $expected = <<<'HTML'
-        <a href="foo.html" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent" aria-current="page">Foo</a>
+        <a href="foo.html" aria-current="page" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent">Foo</a>
         HTML;
 
         $this->assertSame($expected, $view->getRendered());

From 33e40d82bf8a34f5b9e33ebfcce1825fd510b853 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:17:33 +0200
Subject: [PATCH 2459/2811] Update navigation item facade to support the
 attribute parameter

---
 packages/framework/src/Facades/Navigation.php                | 5 +++--
 .../framework/tests/Feature/YamlConfigurationFeatureTest.php | 4 ++++
 .../framework/tests/Unit/Facades/NavigationFacadeTest.php    | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index a91b41fef5a..e7d12646e06 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -21,9 +21,10 @@ class Navigation
      * @param  string<\Hyde\Support\Models\RouteKey>|string  $destination  Route key, or an external URI.
      * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
      * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
      */
-    public static function item(string $destination, ?string $label = null, ?int $priority = null): array
+    public static function item(string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): array
     {
-        return compact('destination', 'label', 'priority');
+        return compact('destination', 'label', 'priority', 'attributes');
     }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 71c1d5c8d24..6f3f32db097 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -497,14 +497,17 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
                 'destination' => 'https://example.com',
                 'label' => 'Example',
                 'priority' => 100,
+                'attributes' => [],
             ], [
                 'destination' => 'about',
                 'label' => 'About Us',
                 'priority' => 200,
+                'attributes' => [],
             ], [
                 'destination' => 'contact',
                 'label' => 'Contact',
                 'priority' => 300,
+                'attributes' => [],
             ],
         ], $configItems);
 
@@ -549,6 +552,7 @@ public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
                 'destination' => 'about.html',
                 'label' => null,
                 'priority' => null,
+                'attributes' => [],
             ],
         ], $configItems);
 
diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index bbc7e2d84f0..a4b68d9f7c4 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -20,6 +20,7 @@ public function testItem()
             'destination' => 'home',
             'label' => 'Home',
             'priority' => 100,
+            'attributes' => [],
         ], $item);
     }
 
@@ -31,6 +32,7 @@ public function testItemWithOnlyDestination()
             'destination' => 'home',
             'label' => null,
             'priority' => null,
+            'attributes' => [],
         ], $item);
     }
 
@@ -42,6 +44,7 @@ public function testItemWithUrl()
             'destination' => 'https://example.com',
             'label' => 'External',
             'priority' => 200,
+            'attributes' => [],
         ], $item);
     }
 }

From 1beec7e8f343d5cb43785c40fb8df1693a3ad65b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:28:17 +0200
Subject: [PATCH 2460/2811] Update the make method to support extra attributes

---
 .../src/Framework/Features/Navigation/NavigationItem.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 418f029f7c6..d0f1c7c8868 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -103,8 +103,8 @@ public function isActive(): bool
         return Hyde::currentRoute()?->getLink() === $this->getLink();
     }
 
-    /** @return array{\Hyde\Support\Models\Route|string, string, int} */
-    protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null): array
+    /** @return array{\Hyde\Support\Models\Route|string, string, int, array<string, scalar>} */
+    protected static function make(Route|string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): array
     {
         // Automatically resolve the destination if it's a route key.
         if (is_string($destination) && Routes::has($destination)) {
@@ -117,7 +117,7 @@ protected static function make(Route|string $destination, ?string $label = null,
             $priority ??= $destination->getPage()->navigationMenuPriority();
         }
 
-        return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT];
+        return [$destination, $label ?? $destination, $priority ?? NavigationMenu::DEFAULT, $attributes];
     }
 
     /** @return array<string, scalar> */

From 8080709c578dce1ad7bd4df14500e934fb6b1908 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:30:01 +0200
Subject: [PATCH 2461/2811] Update the constructors to support extra attributes

---
 .../Framework/Features/Navigation/NavigationItem.php | 10 ++++++----
 packages/framework/tests/Unit/NavigationItemTest.php | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index d0f1c7c8868..a7fa7bb252c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -32,10 +32,11 @@ class NavigationItem implements Stringable
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
      * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
      * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
      */
-    public function __construct(Route|string $destination, ?string $label = null, ?int $priority = null)
+    public function __construct(Route|string $destination, ?string $label = null, ?int $priority = null, array $attributes = [])
     {
-        [$this->destination, $this->label, $this->priority] = self::make($destination, $label, $priority);
+        [$this->destination, $this->label, $this->priority, $this->attributes] = self::make($destination, $label, $priority, $attributes);
     }
 
     /**
@@ -44,10 +45,11 @@ public function __construct(Route|string $destination, ?string $label = null, ?i
      * @param  \Hyde\Support\Models\Route|string<\Hyde\Support\Models\RouteKey>|string  $destination  Route instance or route key, or an external URI.
      * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
      * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
      */
-    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null): static
+    public static function create(Route|string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): static
     {
-        return new static(...self::make($destination, $label, $priority));
+        return new static(...self::make($destination, $label, $priority, $attributes));
     }
 
     /**
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index e0a669adf9a..22742802644 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -325,4 +325,16 @@ public function testIsCurrentIsNullSafe()
     {
         $this->assertFalse(NavigationItem::create('foo', 'bar')->isActive());
     }
+
+    public function testConstructWithAttributes()
+    {
+        $item = new NavigationItem('foo', 'Test', 500, ['class' => 'active']);
+        $this->assertSame(['class' => 'active'], $item->getExtraAttributes());
+    }
+
+    public function testCreateWithAttributes()
+    {
+        $item = NavigationItem::create('foo', 'Test', 500, ['class' => 'active']);
+        $this->assertSame(['class' => 'active'], $item->getExtraAttributes());
+    }
 }

From 8b6d678ef44ea969855a1c87680d37bae5ddf30f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:31:39 +0200
Subject: [PATCH 2462/2811] Generate attribute accessors

---
 .../Features/Navigation/NavigationItem.php    | 47 +++++++++++++++++++
 .../tests/Unit/NavigationItemTest.php         | 29 ++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index a7fa7bb252c..9b6a498ab59 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -127,4 +127,51 @@ public function getExtraAttributes(): array
     {
         return $this->attributes;
     }
+
+    /**
+     * Set an extra attribute for the navigation item.
+     *
+     * @param string $key
+     * @param scalar $value
+     * @return $this
+     */
+    public function setAttribute(string $key, $value): self
+    {
+        $this->attributes[$key] = $value;
+        return $this;
+    }
+
+    /**
+     * Set multiple extra attributes for the navigation item.
+     *
+     * @param array<string, scalar> $attributes
+     * @return $this
+     */
+    public function setAttributes(array $attributes): self
+    {
+        $this->attributes = array_merge($this->attributes, $attributes);
+        return $this;
+    }
+
+    /**
+     * Get an extra attribute of the navigation item.
+     *
+     * @param string $key
+     * @param scalar|null $default
+     * @return scalar|null
+     */
+    public function getAttribute(string $key, $default = null)
+    {
+        return $this->attributes[$key] ?? $default;
+    }
+
+    /**
+     * Get all extra attributes of the navigation item.
+     *
+     * @return array<string, scalar>
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 22742802644..f27269745d2 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -337,4 +337,33 @@ public function testCreateWithAttributes()
         $item = NavigationItem::create('foo', 'Test', 500, ['class' => 'active']);
         $this->assertSame(['class' => 'active'], $item->getExtraAttributes());
     }
+
+    public function testSetAttribute()
+    {
+        $item = new NavigationItem('foo', 'Test');
+        $item->setAttribute('class', 'active');
+        $this->assertSame('active', $item->getAttribute('class'));
+    }
+
+    public function testSetAttributes()
+    {
+        $item = new NavigationItem('foo', 'Test');
+        $item->setAttributes(['class' => 'active', 'id' => 'nav-item']);
+        $this->assertSame(['class' => 'active', 'id' => 'nav-item'], $item->getAttributes());
+    }
+
+    public function testGetAttribute()
+    {
+        $item = new NavigationItem('foo', 'Test', 500, ['class' => 'active']);
+        $this->assertSame('active', $item->getAttribute('class'));
+        $this->assertNull($item->getAttribute('id'));
+        $this->assertSame('default', $item->getAttribute('id', 'default'));
+    }
+
+    public function testGetAttributes()
+    {
+        $attributes = ['class' => 'active', 'id' => 'nav-item'];
+        $item = new NavigationItem('foo', 'Test', 500, $attributes);
+        $this->assertSame($attributes, $item->getAttributes());
+    }
 }

From 17a33e0c56801879e30194d71b9db5e814c9c1ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:31:42 +0200
Subject: [PATCH 2463/2811] Revert "Generate attribute accessors"

This reverts commit 8b6d678ef44ea969855a1c87680d37bae5ddf30f.
---
 .../Features/Navigation/NavigationItem.php    | 47 -------------------
 .../tests/Unit/NavigationItemTest.php         | 29 ------------
 2 files changed, 76 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
index 9b6a498ab59..a7fa7bb252c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationItem.php
@@ -127,51 +127,4 @@ public function getExtraAttributes(): array
     {
         return $this->attributes;
     }
-
-    /**
-     * Set an extra attribute for the navigation item.
-     *
-     * @param string $key
-     * @param scalar $value
-     * @return $this
-     */
-    public function setAttribute(string $key, $value): self
-    {
-        $this->attributes[$key] = $value;
-        return $this;
-    }
-
-    /**
-     * Set multiple extra attributes for the navigation item.
-     *
-     * @param array<string, scalar> $attributes
-     * @return $this
-     */
-    public function setAttributes(array $attributes): self
-    {
-        $this->attributes = array_merge($this->attributes, $attributes);
-        return $this;
-    }
-
-    /**
-     * Get an extra attribute of the navigation item.
-     *
-     * @param string $key
-     * @param scalar|null $default
-     * @return scalar|null
-     */
-    public function getAttribute(string $key, $default = null)
-    {
-        return $this->attributes[$key] ?? $default;
-    }
-
-    /**
-     * Get all extra attributes of the navigation item.
-     *
-     * @return array<string, scalar>
-     */
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
 }
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index f27269745d2..22742802644 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -337,33 +337,4 @@ public function testCreateWithAttributes()
         $item = NavigationItem::create('foo', 'Test', 500, ['class' => 'active']);
         $this->assertSame(['class' => 'active'], $item->getExtraAttributes());
     }
-
-    public function testSetAttribute()
-    {
-        $item = new NavigationItem('foo', 'Test');
-        $item->setAttribute('class', 'active');
-        $this->assertSame('active', $item->getAttribute('class'));
-    }
-
-    public function testSetAttributes()
-    {
-        $item = new NavigationItem('foo', 'Test');
-        $item->setAttributes(['class' => 'active', 'id' => 'nav-item']);
-        $this->assertSame(['class' => 'active', 'id' => 'nav-item'], $item->getAttributes());
-    }
-
-    public function testGetAttribute()
-    {
-        $item = new NavigationItem('foo', 'Test', 500, ['class' => 'active']);
-        $this->assertSame('active', $item->getAttribute('class'));
-        $this->assertNull($item->getAttribute('id'));
-        $this->assertSame('default', $item->getAttribute('id', 'default'));
-    }
-
-    public function testGetAttributes()
-    {
-        $attributes = ['class' => 'active', 'id' => 'nav-item'];
-        $item = new NavigationItem('foo', 'Test', 500, $attributes);
-        $this->assertSame($attributes, $item->getAttributes());
-    }
 }

From 3f7c34b178a7535106d32db65468052522289ddd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:38:00 +0200
Subject: [PATCH 2464/2811] Test the view with extra attributes

Claude is just insanely good
---
 .../Unit/Views/NavigationLinkViewTest.php     | 53 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 877eac0b14c..274a71420e0 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -26,10 +26,10 @@ protected function setUp(): void
         $this->mockPage();
     }
 
-    protected function testView(): TestView
+    protected function testView(array $extraAttributes = []): TestView
     {
         return $this->view(view('hyde::components.navigation.navigation-link', [
-            'item' => NavigationItem::create(new Route(new InMemoryPage('foo')), 'Foo'),
+            'item' => NavigationItem::create(new Route(new InMemoryPage('foo')), 'Foo', null, $extraAttributes),
             'attributes' => new ComponentAttributeBag(),
         ]));
     }
@@ -89,6 +89,55 @@ public function testComponentHasActiveClassWhenActive()
             ->assertHasClass('navigation-link-active');
     }
 
+    public function testComponentRendersExtraAttributes()
+    {
+        $this->testView(['data-test' => 'value'])
+            ->assertHasAttribute('data-test')
+            ->assertAttributeIs('data-test="value"');
+    }
+
+    public function testComponentRendersMultipleExtraAttributes()
+    {
+        $this->testView(['data-test' => 'value', 'data-foo' => 'bar'])
+            ->assertHasAttribute('data-test')
+            ->assertAttributeIs('data-test="value"')
+            ->assertHasAttribute('data-foo')
+            ->assertAttributeIs('data-foo="bar"');
+    }
+
+    public function testComponentRendersExtraAttributesWithExistingAttributes()
+    {
+        $this->mockCurrentPage('foo');
+
+        $view = $this->testView(['data-test' => 'value']);
+
+        $expected = <<<'HTML'
+        <a href="foo.html" aria-current="page" class="navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100 navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent" data-test="value">Foo</a>
+        HTML;
+
+        $this->assertSame($expected, $view->getRendered());
+    }
+
+    public function testComponentMergesClassAttributeCorrectly()
+    {
+        $this->testView(['class' => 'custom-class'])
+            ->assertHasClass('navigation-link')
+            ->assertHasClass('custom-class');
+    }
+
+    public function testComponentOverridesDefaultAttributesWithExtraAttributes()
+    {
+        $this->testView(['href' => 'https://example.com'])
+            ->assertAttributeIs('href="https://example.com"');
+    }
+
+    public function testComponentHandlesEmptyExtraAttributes()
+    {
+        $this->testView([])
+            ->assertHasElement('<a>')
+            ->assertTextIs('Foo');
+    }
+
     public function testComponentState()
     {
         $this->mockCurrentPage('foo');

From 798d363f2b50409012da280af280a1da036054aa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:40:26 +0200
Subject: [PATCH 2465/2811] Annotate the return array shape

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

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index e7d12646e06..b2dda93d6c7 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -22,6 +22,7 @@ class Navigation
      * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
      * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
      * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
+     * @return array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}
      */
     public static function item(string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): array
     {

From ed615a7c9bef361973d8e42c6e4b99bfa6adba8b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:41:07 +0200
Subject: [PATCH 2466/2811] Update YAML parser array shapes

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 0ac92ab01d0..8a8f2afe540 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -86,8 +86,8 @@ protected function parseAuthors(array $authors): array
     /**
      * @experimental Since the main configuration also uses arrays, the only thing this method really does is to rethrow any exceptions.
      *
-     * @param  array<array{destination: string, label: ?string, priority: ?int}>  $items  Where destination is a route key or an external URI.
-     * @return array<array{destination: string, label: ?string, priority: ?int}>
+     * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $items  Where destination is a route key or an external URI.
+     * @return array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>
      */
     protected function parseNavigationItems(array $items): array
     {

From 57317389474b6d5115c3d9726886bd4bedf96aa4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:44:21 +0200
Subject: [PATCH 2467/2811] Support setting navigation items with extra
 attributes in the config

---
 .../Navigation/NavigationMenuGenerator.php    |  2 +-
 .../tests/Feature/NavigationMenuTest.php      | 15 +++++
 .../Feature/YamlConfigurationFeatureTest.php  | 61 +++++++++++++++++++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index eae219d2f53..54ed54cbf26 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -83,7 +83,7 @@ protected function generate(): void
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
-                $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null));
+                $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null, $item['attributes'] ?? []));
             });
         }
     }
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index cd9d6f72986..b07e62e13de 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -152,6 +152,21 @@ public function testPathLinkCanBeAddedInConfig()
         $this->assertEquals($expected, $menu->getItems());
     }
 
+    public function testCanAddCustomLinksInConfigWithExtraAttributes()
+    {
+        config(['hyde.navigation.custom' => [Navigation::item('foo', 'Foo', 100, ['class' => 'foo'])]]);
+
+        $menu = $this->createNavigationMenu();
+
+        $expected = collect([
+            NavigationItem::create(Routes::get('index')),
+            NavigationItem::create('foo', 'Foo', 100, ['class' => 'foo']),
+        ]);
+
+        $this->assertCount(count($expected), $menu->getItems());
+        $this->assertEquals($expected, $menu->getItems());
+    }
+
     public function testDuplicatesAreNotRemovedWhenAddingInConfig()
     {
         config(['hyde.navigation.custom' => [
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 6f3f32db097..7531bf44f94 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -534,6 +534,67 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
         $this->assertSame(300, $navigationItems[3]->getPriority());
     }
 
+    public function testCanSetAttributesInNavigationItemsInTheYamlConfig()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          navigation:
+            custom:
+              - destination: 'https://example.com'
+                label: 'Example'
+                priority: 100
+                attributes:
+                  class: 'example'
+              - destination: 'about'
+                label: 'About Us'
+                priority: 200
+                attributes:
+                  class: 'about'
+                  id: 'about'
+              - destination: 'contact'
+                label: 'Contact'
+                priority: 300
+                attributes:
+                   target: '_blank'
+                   rel: 'noopener noreferrer'
+                   foo: 'bar'
+        YAML);
+
+        $this->runBootstrappers();
+
+        $configItems = config('hyde.navigation.custom');
+
+        $this->assertSame([
+            [
+                'destination' => 'https://example.com',
+                'label' => 'Example',
+                'priority' => 100,
+                'attributes' => ['class' => 'example'],
+            ], [
+                'destination' => 'about',
+                'label' => 'About Us',
+                'priority' => 200,
+                'attributes' => ['class' => 'about', 'id' => 'about'],
+            ], [
+                'destination' => 'contact',
+                'label' => 'Contact',
+                'priority' => 300,
+                'attributes' => ['target' => '_blank', 'rel' => 'noopener noreferrer', 'foo' => 'bar'],
+            ],
+        ], $configItems);
+
+        /** @var NavigationItem[] $navigationItems */
+        $navigationItems = NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
+
+        $this->assertCount(4, $navigationItems);
+        $this->assertContainsOnlyInstancesOf(NavigationItem::class, $navigationItems);
+
+        $this->assertSame([], $navigationItems[0]->getExtraAttributes());
+        $this->assertSame(['class' => 'example'], $navigationItems[1]->getExtraAttributes());
+        $this->assertSame(['class' => 'about', 'id' => 'about'], $navigationItems[2]->getExtraAttributes());
+        $this->assertSame(['target' => '_blank', 'rel' => 'noopener noreferrer', 'foo' => 'bar'], $navigationItems[3]->getExtraAttributes());
+    }
+
     public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
     {
         $this->file('hyde.yml', <<<'YAML'

From 09db9f10e91834ddf8789d2483dd789d1b47682c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:48:24 +0200
Subject: [PATCH 2468/2811] Annotate the parameter array shape

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 54ed54cbf26..ddbe9679dd5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -81,7 +81,8 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(
+                /** @param array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */ function (array $item): void {
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null, $item['attributes'] ?? []));
             });

From c8a72a87c30ba7795cddca6f347142a901e7dff2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:49:24 +0200
Subject: [PATCH 2469/2811] Use variable annotation for cleaner looking code

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index ddbe9679dd5..b4e55a60706 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -81,8 +81,8 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(
-                /** @param array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */ function (array $item): void {
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
+                /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null, $item['attributes'] ?? []));
             });

From c6cdbab07e533afd23220133554fe281da96fc18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:53:32 +0200
Subject: [PATCH 2470/2811] Test invalid custom navigation configuration throws
 exception

---
 .../framework/tests/Feature/NavigationMenuTest.php   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b07e62e13de..7696bb6eb10 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -223,6 +223,18 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
         $this->assertEquals($expected, $menu->getItems());
     }
 
+    public function testInvalidCustomNavigationConfigurationThrowsException()
+    {
+        $this->expectException(\Error::class);
+        // $this->expectExceptionMessage('Invalid configuration for custom navigation item');
+
+        config(['hyde.navigation.custom' => [
+            ['invalid_key' => 'value'],
+        ]]);
+
+        $this->createNavigationMenu();
+    }
+
     public function testDocumentationPagesThatAreNotIndexAreNotAddedToTheMenu()
     {
         $this->file('_docs/foo.md');

From b0bbfa7a8c4aee68bbbf615b00ad1cfa07936f30 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:53:38 +0200
Subject: [PATCH 2471/2811] Unpack the array directly

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b4e55a60706..2a9d54c701e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -84,7 +84,7 @@ protected function generate(): void
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
                 /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */
                 // Since these were added explicitly by the user, we can assume they should always be shown
-                $this->items->push(NavigationItem::create($item['destination'], $item['label'] ?? null, $item['priority'] ?? null, $item['attributes'] ?? []));
+                $this->items->push(NavigationItem::create(...$item));
             });
         }
     }

From 87bb7efc8d7f36cf22b57a8231fa41f78939007b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:58:27 +0200
Subject: [PATCH 2472/2811] Introduce local variable

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 2a9d54c701e..b7d2781d908 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -83,8 +83,10 @@ protected function generate(): void
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
                 /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */
+                $item = NavigationItem::create(...$item);
+             
                 // Since these were added explicitly by the user, we can assume they should always be shown
-                $this->items->push(NavigationItem::create(...$item));
+                $this->items->push($item);
             });
         }
     }

From ca28299a2d595ac72b442f92a74fe7dc662990f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 20:59:17 +0200
Subject: [PATCH 2473/2811] Catch and rethrow error caused by bad configuration

---
 .../Features/Navigation/NavigationMenuGenerator.php | 13 +++++++++++--
 .../framework/tests/Feature/NavigationMenuTest.php  |  5 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b7d2781d908..8bcbb2c2f14 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -5,12 +5,14 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
+use Throwable;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 
 use function filled;
 use function assert;
@@ -83,8 +85,15 @@ protected function generate(): void
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
                 /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */
-                $item = NavigationItem::create(...$item);
-             
+                try {
+                    $item = NavigationItem::create(...$item);
+                } catch (Throwable $exception) {
+                    throw new InvalidConfigurationException(
+                        'Invalid navigation item configuration detected the configuration file. Please double check the syntax.',
+                        previous: $exception
+                    );
+                }
+
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
             });
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 7696bb6eb10..0b48b00c05d 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -14,6 +14,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
+use Hyde\Framework\Exceptions\InvalidConfigurationException;
 use Hyde\Framework\Features\Navigation\NavigationMenuGenerator;
 
 /**
@@ -225,8 +226,8 @@ public function testConfigItemsTakePrecedenceOverGeneratedItems()
 
     public function testInvalidCustomNavigationConfigurationThrowsException()
     {
-        $this->expectException(\Error::class);
-        // $this->expectExceptionMessage('Invalid configuration for custom navigation item');
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Invalid navigation item configuration detected the configuration file. Please double check the syntax.');
 
         config(['hyde.navigation.custom' => [
             ['invalid_key' => 'value'],

From 3f2878ae4480b619f5563fd8a0d80b8e43ecc285 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:00:18 +0200
Subject: [PATCH 2474/2811] Normalize to more generic error message

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php       | 2 +-
 .../tests/Feature/YamlConfigurationFeatureTest.php          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 8a8f2afe540..126e8296b12 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -96,7 +96,7 @@ protected function parseNavigationItems(array $items): array
                 return Navigation::item(...$item);
             } catch (Throwable $exception) {
                 throw new InvalidConfigurationException(
-                    'Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.',
+                    'Invalid navigation item configuration detected the configuration file. Please double check the syntax.',
                     previous: $exception
                 );
             }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 7531bf44f94..266e0804866 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -670,7 +670,7 @@ public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
-            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+            $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
         unlink('hyde.yml');
@@ -688,7 +688,7 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
-            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+            $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
         unlink('hyde.yml');
@@ -707,7 +707,7 @@ public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
-            $this->assertSame('Invalid navigation item configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
+            $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
         unlink('hyde.yml');

From 5ed108226e1149d85d2987e0c00235b453cddf2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:03:32 +0200
Subject: [PATCH 2475/2811] Add helpers to assert exception was thrown

---
 .../Feature/YamlConfigurationFeatureTest.php     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 266e0804866..1e6245f2170 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -456,6 +456,8 @@ public function testCanSetAuthorsInTheYamlConfig()
 
     public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
     {
+        $exceptionThrown = false;
+
         file_put_contents('hyde.yml', <<<'YAML'
         authors:
           wrong:
@@ -465,9 +467,11 @@ public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
+            $exceptionThrown = true;
             $this->assertSame('Invalid author configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
         }
 
+        $this->assertTrue($exceptionThrown);
         unlink('hyde.yml');
     }
 
@@ -660,6 +664,8 @@ public function testNavigationItemsInTheYamlConfigCanBeResolvedToRoutes()
 
     public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
     {
+        $exceptionThrown = false;
+
         file_put_contents('hyde.yml', <<<'YAML'
         hyde:
           navigation:
@@ -670,14 +676,18 @@ public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
+            $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
+        $this->assertTrue($exceptionThrown);
         unlink('hyde.yml');
     }
 
     public function testMustAddDestinationToYamlConfiguredNavigationItems()
     {
+        $exceptionThrown = false;
+
         file_put_contents('hyde.yml', <<<'YAML'
         hyde:
           navigation:
@@ -688,14 +698,18 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
+            $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
+        $this->assertTrue($exceptionThrown);
         unlink('hyde.yml');
     }
 
     public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
     {
+        $exceptionThrown = false;
+
         file_put_contents('hyde.yml', <<<'YAML'
         hyde:
           navigation:
@@ -707,9 +721,11 @@ public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
         try {
             $this->runBootstrappers();
         } catch (InvalidConfigurationException $exception) {
+            $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
+        $this->assertTrue($exceptionThrown);
         unlink('hyde.yml');
     }
 

From 138e4b9c92453c3405327359e88f8ad7a8906d82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:03:45 +0200
Subject: [PATCH 2476/2811] Add message to custom assertion

---
 .../tests/Feature/YamlConfigurationFeatureTest.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 1e6245f2170..b9f6a3fc8fe 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -471,7 +471,7 @@ public function testTypeErrorsInAuthorsYamlConfigAreRethrownMoreHelpfully()
             $this->assertSame('Invalid author configuration detected in the YAML config file. Please double check the syntax.', $exception->getMessage());
         }
 
-        $this->assertTrue($exceptionThrown);
+        $this->assertTrue($exceptionThrown, 'Failed asserting that the exception was thrown.');
         unlink('hyde.yml');
     }
 
@@ -680,7 +680,7 @@ public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
-        $this->assertTrue($exceptionThrown);
+        $this->assertTrue($exceptionThrown, 'Failed asserting that the exception was thrown.');
         unlink('hyde.yml');
     }
 
@@ -702,7 +702,7 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
-        $this->assertTrue($exceptionThrown);
+        $this->assertTrue($exceptionThrown, 'Failed asserting that the exception was thrown.');
         unlink('hyde.yml');
     }
 
@@ -725,7 +725,7 @@ public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
         }
 
-        $this->assertTrue($exceptionThrown);
+        $this->assertTrue($exceptionThrown, 'Failed asserting that the exception was thrown.');
         unlink('hyde.yml');
     }
 

From 6a076b831b3cf07341605c314f0c29bfa4c0a8da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:07:04 +0200
Subject: [PATCH 2477/2811] Let the generator parse navigation items instead of
 the loader

We "lose" out on the null defaults, but they don't offer any value anyways.
---
 .../Internal/LoadYamlConfiguration.php        | 25 -------------------
 .../Feature/YamlConfigurationFeatureTest.php  |  9 +++----
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 126e8296b12..1f1dc4963e3 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -6,7 +6,6 @@
 
 use Throwable;
 use Illuminate\Support\Arr;
-use Hyde\Facades\Navigation;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
@@ -52,10 +51,6 @@ protected function mergeParsedConfiguration(): void
                 $data['authors'] = $this->parseAuthors($data['authors']);
             }
 
-            if ($namespace === 'hyde' && isset($data['navigation']['custom'])) {
-                $data['navigation']['custom'] = $this->parseNavigationItems($data['navigation']['custom']);
-            }
-
             $this->mergeConfiguration($namespace, Arr::undot($data ?: []));
         }
     }
@@ -82,24 +77,4 @@ protected function parseAuthors(array $authors): array
             }
         });
     }
-
-    /**
-     * @experimental Since the main configuration also uses arrays, the only thing this method really does is to rethrow any exceptions.
-     *
-     * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $items  Where destination is a route key or an external URI.
-     * @return array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>
-     */
-    protected function parseNavigationItems(array $items): array
-    {
-        return Arr::map($items, function (array $item): array {
-            try {
-                return Navigation::item(...$item);
-            } catch (Throwable $exception) {
-                throw new InvalidConfigurationException(
-                    'Invalid navigation item configuration detected the configuration file. Please double check the syntax.',
-                    previous: $exception
-                );
-            }
-        });
-    }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index b9f6a3fc8fe..4bd0a733680 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -501,17 +501,14 @@ public function testCanSetCustomNavigationItemsInTheYamlConfig()
                 'destination' => 'https://example.com',
                 'label' => 'Example',
                 'priority' => 100,
-                'attributes' => [],
             ], [
                 'destination' => 'about',
                 'label' => 'About Us',
                 'priority' => 200,
-                'attributes' => [],
             ], [
                 'destination' => 'contact',
                 'label' => 'Contact',
                 'priority' => 300,
-                'attributes' => [],
             ],
         ], $configItems);
 
@@ -615,9 +612,6 @@ public function testOnlyNeedToAddDestinationToYamlConfiguredNavigationItems()
         $this->assertSame([
             [
                 'destination' => 'about.html',
-                'label' => null,
-                'priority' => null,
-                'attributes' => [],
             ],
         ], $configItems);
 
@@ -675,6 +669,7 @@ public function testTypeErrorsInNavigationYamlConfigAreRethrownMoreHelpfully()
 
         try {
             $this->runBootstrappers();
+            NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
         } catch (InvalidConfigurationException $exception) {
             $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
@@ -697,6 +692,7 @@ public function testMustAddDestinationToYamlConfiguredNavigationItems()
 
         try {
             $this->runBootstrappers();
+            NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
         } catch (InvalidConfigurationException $exception) {
             $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());
@@ -720,6 +716,7 @@ public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
 
         try {
             $this->runBootstrappers();
+            NavigationMenuGenerator::handle(MainNavigationMenu::class)->getItems()->all();
         } catch (InvalidConfigurationException $exception) {
             $exceptionThrown = true;
             $this->assertSame('Invalid navigation item configuration detected the configuration file. Please double check the syntax.', $exception->getMessage());

From 16d70f0b8090680c880d08082cd3b45e0596456a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:09:07 +0200
Subject: [PATCH 2478/2811] Add todo

---
 .../framework/src/Foundation/Internal/LoadYamlConfiguration.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 6a1cda350e7..c574d6abfe9 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -47,6 +47,7 @@ protected function mergeParsedConfiguration(): void
     {
         foreach ($this->yaml->getData() as $namespace => $data) {
             if ($namespace === 'hyde' && isset($data['authors'])) {
+                // Todo: We may not actually need this, since the parser in the kernel can handle this. See https://github.com/hydephp/develop/pull/1824/commits/6a076b831b3cf07341605c314f0c29bfa4c0a8da
                 $data['authors'] = $this->parseAuthors($data['authors']);
             }
 

From 997a6ee47025be4f5c4ebc5fffff200f07612d37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:11:00 +0200
Subject: [PATCH 2479/2811] Rename closure parameter

---
 .../Features/Navigation/NavigationMenuGenerator.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 8bcbb2c2f14..b97ecfbdf8b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -83,10 +83,10 @@ protected function generate(): void
                 $this->items->push(NavigationItem::create(DocumentationPage::home()));
             }
         } else {
-            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $item): void {
-                /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $item */
+            collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $data): void {
+                /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $data */
                 try {
-                    $item = NavigationItem::create(...$item);
+                    $item = NavigationItem::create(...$data);
                 } catch (Throwable $exception) {
                     throw new InvalidConfigurationException(
                         'Invalid navigation item configuration detected the configuration file. Please double check the syntax.',

From 912f7b2b72f2697f8df0a57e12778b445c6dacda Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 21:17:38 +0200
Subject: [PATCH 2480/2811] Extract experimental helper method to try parsing
 config values

---
 .../Internal/LoadYamlConfiguration.php        | 12 ++----
 .../InvalidConfigurationException.php         | 14 +++++++
 .../Navigation/NavigationMenuGenerator.php    | 11 +----
 .../tests/Unit/CustomExceptionsTest.php       | 41 +++++++++++++++++++
 4 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 1f1dc4963e3..9ac4af5fa5b 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation\Internal;
 
-use Throwable;
 use Illuminate\Support\Arr;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
@@ -67,14 +66,9 @@ protected function mergeConfiguration(string $namespace, array $yaml): void
     protected function parseAuthors(array $authors): array
     {
         return Arr::mapWithKeys($authors, function (array $author, string $username): array {
-            try {
-                return [$username => PostAuthor::create($author)];
-            } catch (Throwable $exception) {
-                throw new InvalidConfigurationException(
-                    'Invalid author configuration detected in the YAML config file. Please double check the syntax.',
-                    previous: $exception
-                );
-            }
+            $message = 'Invalid author configuration detected in the YAML config file. Please double check the syntax.';
+
+            return InvalidConfigurationException::try(fn () => [$username => PostAuthor::create($author)], $message);
         });
     }
 }
diff --git a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
index 694566ed717..306b6fd4a51 100644
--- a/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
+++ b/packages/framework/src/Framework/Exceptions/InvalidConfigurationException.php
@@ -45,4 +45,18 @@ protected function findConfigLine(string $namespace, string $key): array
 
         return [$file, $line + 1];
     }
+
+    /**
+     * @internal
+     *
+     * @experimental
+     */
+    public static function try(callable $callback, ?string $message = null): mixed
+    {
+        try {
+            return $callback();
+        } catch (Throwable $exception) {
+            throw new static($message ?? $exception->getMessage(), previous: $exception);
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index b97ecfbdf8b..94976bcff51 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
-use Throwable;
 use Hyde\Facades\Config;
 use Hyde\Support\Models\Route;
 use Hyde\Pages\DocumentationPage;
@@ -85,14 +84,8 @@ protected function generate(): void
         } else {
             collect(Config::getArray('hyde.navigation.custom', []))->each(function (array $data): void {
                 /** @var array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>} $data */
-                try {
-                    $item = NavigationItem::create(...$data);
-                } catch (Throwable $exception) {
-                    throw new InvalidConfigurationException(
-                        'Invalid navigation item configuration detected the configuration file. Please double check the syntax.',
-                        previous: $exception
-                    );
-                }
+                $message = 'Invalid navigation item configuration detected the configuration file. Please double check the syntax.';
+                $item = InvalidConfigurationException::try(fn () => NavigationItem::create(...$data), $message);
 
                 // Since these were added explicitly by the user, we can assume they should always be shown
                 $this->items->push($item);
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 6009a31bc4e..af058ac7390 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -210,4 +210,45 @@ public function testInvalidConfigurationExceptionWithPreviousThrowable()
         $this->assertSame('Invalid configuration.', $exception->getMessage());
         $this->assertSame($previous, $exception->getPrevious());
     }
+
+    public function testInvalidConfigurationExceptionTryMethodWithSuccessfulCallback()
+    {
+        $result = InvalidConfigurationException::try(function () {
+            return 'success';
+        });
+
+        $this->assertSame('success', $result);
+    }
+
+    public function testInvalidConfigurationExceptionTryMethodWithThrowingCallback()
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Custom error message');
+
+        InvalidConfigurationException::try(function () {
+            throw new RuntimeException('Original error');
+        }, 'Custom error message');
+    }
+
+    public function testInvalidConfigurationExceptionTryMethodWithDefaultMessage()
+    {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('Original error');
+
+        InvalidConfigurationException::try(function () {
+            throw new RuntimeException('Original error');
+        });
+    }
+
+    public function testInvalidConfigurationExceptionTryMethodPreservesPreviousException()
+    {
+        try {
+            InvalidConfigurationException::try(function () {
+                throw new RuntimeException('Original error');
+            }, 'Custom error message');
+        } catch (InvalidConfigurationException $e) {
+            $this->assertInstanceOf(RuntimeException::class, $e->getPrevious());
+            $this->assertSame('Original error', $e->getPrevious()->getMessage());
+        }
+    }
 }

From fabaf2920336f7cf5fcf3b66f741ebe76753b003 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:46:32 +0200
Subject: [PATCH 2481/2811] Draft builder method

---
 packages/framework/src/Facades/Navigation.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index b2dda93d6c7..5dbad8c0459 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -28,4 +28,9 @@ public static function item(string $destination, ?string $label = null, ?int $pr
     {
         return compact('destination', 'label', 'priority', 'attributes');
     }
+
+    public static function builder()
+    {
+        //
+    }
 }

From 7c896680e9544a1c68172bf515a53a88c8b61282 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:46:38 +0200
Subject: [PATCH 2482/2811] Draft method documentation

---
 packages/framework/src/Facades/Navigation.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index 5dbad8c0459..fcad2f4fff8 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -29,6 +29,13 @@ public static function item(string $destination, ?string $label = null, ?int $pr
         return compact('destination', 'label', 'priority', 'attributes');
     }
 
+    /**
+     * Configuration helper method to define the navigation menu configuration with better IDE support.
+     *
+     * The returned object will then be cast to an array that will be used by the framework to set the config data.
+     *
+     * @experimental This method is experimental and may change in the future.
+     */
     public static function builder()
     {
         //

From 7f395d9691df466dedf2827975deb1211b7c0907 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:47:03 +0200
Subject: [PATCH 2483/2811] Rename added builder method to define

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

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index fcad2f4fff8..7138c339722 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -36,7 +36,7 @@ public static function item(string $destination, ?string $label = null, ?int $pr
      *
      * @experimental This method is experimental and may change in the future.
      */
-    public static function builder()
+    public static function define()
     {
         //
     }

From 5415a91b4077503d41332964aed1b6eeb694bb5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:47:15 +0200
Subject: [PATCH 2484/2811] Rename added builder method to configure

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

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index 7138c339722..b43d205e52a 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -36,7 +36,7 @@ public static function item(string $destination, ?string $label = null, ?int $pr
      *
      * @experimental This method is experimental and may change in the future.
      */
-    public static function define()
+    public static function configure()
     {
         //
     }

From 2cbe18dacda323068f06fe915412eed92f66338d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:48:53 +0200
Subject: [PATCH 2485/2811] Create NavigationMenuConfigurationBuilder.php

---
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
new file mode 100644
index 00000000000..ad56ac7b08c
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+class NavigationMenuConfigurationBuilder
+{
+    //
+}

From 519ee26b2348b6ff8922ce9c9fa949ac8c4632fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:49:29 +0200
Subject: [PATCH 2486/2811] Draft the class documentation

---
 .../Navigation/NavigationMenuConfigurationBuilder.php      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index ad56ac7b08c..d854f28f3fd 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -4,6 +4,13 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+/**
+ * Configuration helper method to define the navigation menu configuration with better IDE support.
+ *
+ * The configured object will be cast to an array that will be used by the framework to set the config data.
+ *
+ * @experimental This method is experimental and may change in the future.
+ */
 class NavigationMenuConfigurationBuilder
 {
     //

From 58f9b774d4c25707f3e9a5366aa9f211310a30ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:50:01 +0200
Subject: [PATCH 2487/2811] Return new navigation menu configuration builder

---
 packages/framework/src/Facades/Navigation.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index b43d205e52a..00809edd5e1 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Facades;
 
+use Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder;
 use function compact;
 
 /**
@@ -36,8 +37,8 @@ public static function item(string $destination, ?string $label = null, ?int $pr
      *
      * @experimental This method is experimental and may change in the future.
      */
-    public static function configure()
+    public static function configure(): NavigationMenuConfigurationBuilder
     {
-        //
+        return new NavigationMenuConfigurationBuilder();
     }
 }

From 9ae9d6662d055e5473b53706e6862ab980868e74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:50:39 +0200
Subject: [PATCH 2488/2811] Add protected config array

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index d854f28f3fd..fd2577e3f71 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -13,5 +13,5 @@
  */
 class NavigationMenuConfigurationBuilder
 {
-    //
+    protected array $config = [];
 }

From 4446fd1d09705fe207df61c5f7fc76acf406d9fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:51:21 +0200
Subject: [PATCH 2489/2811] Class NavigationMenuConfigurationBuilder extends
 ArrayObject

---
 .../Navigation/NavigationMenuConfigurationBuilder.php         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index fd2577e3f71..53c6b082f60 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use ArrayObject;
+
 /**
  * Configuration helper method to define the navigation menu configuration with better IDE support.
  *
@@ -11,7 +13,7 @@
  *
  * @experimental This method is experimental and may change in the future.
  */
-class NavigationMenuConfigurationBuilder
+class NavigationMenuConfigurationBuilder extends ArrayObject
 {
     protected array $config = [];
 }

From a456ff03d4cc4ae367a4f30a06a7b954dcb343cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:51:35 +0200
Subject: [PATCH 2490/2811] Class NavigationMenuConfigurationBuilder implements
 Arrayable

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 53c6b082f60..3c0218254a0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use ArrayObject;
+use Illuminate\Contracts\Support\Arrayable;
 
 /**
  * Configuration helper method to define the navigation menu configuration with better IDE support.
@@ -13,7 +14,7 @@
  *
  * @experimental This method is experimental and may change in the future.
  */
-class NavigationMenuConfigurationBuilder extends ArrayObject
+class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
 {
     protected array $config = [];
 }

From 15abd0cb647f739b0b7d01aad73e100841616e86 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:52:01 +0200
Subject: [PATCH 2491/2811] Implement toArray() method

---
 .../Navigation/NavigationMenuConfigurationBuilder.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 3c0218254a0..5a7e3ef641c 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -17,4 +17,9 @@
 class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
 {
     protected array $config = [];
+
+    public function toArray(): array
+    {
+        return $this->config;
+    }
 }

From 01080ddf1d11c7df555ac3064fea31d28719a2e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:55:34 +0200
Subject: [PATCH 2492/2811] Draft the builder methods

---
 .../NavigationMenuConfigurationBuilder.php    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 5a7e3ef641c..1d18227d409 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -22,4 +22,29 @@ public function toArray(): array
     {
         return $this->config;
     }
+
+    public function order(array $order): static
+    {
+        // TODO: Implement order() method.
+    }
+
+    public function labels(array $labels): static
+    {
+        // TODO: Implement labels() method.
+    }
+
+    public function exclude(array $exclude): static
+    {
+        // TODO: Implement exclude() method.
+    }
+
+    public function custom(array $custom): static
+    {
+        // TODO: Implement custom() method.
+    }
+
+    public function subdirectoryDisplay(string $displayMode): static
+    {
+        // TODO: Implement subdirectoryDisplay() method.
+    }
 }

From 1487cab2d09aaf614debc6d431d2ee12522a6c36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:56:28 +0200
Subject: [PATCH 2493/2811] Add method descriptions

---
 .../NavigationMenuConfigurationBuilder.php        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 1d18227d409..806e2ef98ab 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -23,26 +23,41 @@ public function toArray(): array
         return $this->config;
     }
 
+    /**
+     * Set the order of the navigation items.
+     */
     public function order(array $order): static
     {
         // TODO: Implement order() method.
     }
 
+    /**
+     * Set the labels for the navigation items.
+     */
     public function labels(array $labels): static
     {
         // TODO: Implement labels() method.
     }
 
+    /**
+     * Exclude certain items from the navigation.
+     */
     public function exclude(array $exclude): static
     {
         // TODO: Implement exclude() method.
     }
 
+    /**
+     * Add custom items to the navigation.
+     */
     public function custom(array $custom): static
     {
         // TODO: Implement custom() method.
     }
 
+    /**
+     * Set the display mode for subdirectories.
+     */
     public function subdirectoryDisplay(string $displayMode): static
     {
         // TODO: Implement subdirectoryDisplay() method.

From 51ea211acfc98ce5760a70dd3d4a0b8383aa4e2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:56:50 +0200
Subject: [PATCH 2494/2811] Annotate fluent method return

---
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 806e2ef98ab..0408ff7b696 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -25,6 +25,8 @@ public function toArray(): array
 
     /**
      * Set the order of the navigation items.
+     *
+     * @return $this
      */
     public function order(array $order): static
     {
@@ -33,6 +35,8 @@ public function order(array $order): static
 
     /**
      * Set the labels for the navigation items.
+     *
+     * @return $this
      */
     public function labels(array $labels): static
     {
@@ -41,6 +45,8 @@ public function labels(array $labels): static
 
     /**
      * Exclude certain items from the navigation.
+     *
+     * @return $this
      */
     public function exclude(array $exclude): static
     {
@@ -49,6 +55,8 @@ public function exclude(array $exclude): static
 
     /**
      * Add custom items to the navigation.
+     *
+     * @return $this
      */
     public function custom(array $custom): static
     {
@@ -57,6 +65,8 @@ public function custom(array $custom): static
 
     /**
      * Set the display mode for subdirectories.
+     *
+     * @return $this
      */
     public function subdirectoryDisplay(string $displayMode): static
     {

From 9ddc7aeabb242547d4b5980450776a6966a7ad6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 10:57:13 +0200
Subject: [PATCH 2495/2811] Prepare parameter annotations

---
 .../Navigation/NavigationMenuConfigurationBuilder.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 0408ff7b696..48c69871088 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -26,6 +26,7 @@ public function toArray(): array
     /**
      * Set the order of the navigation items.
      *
+     * @param array $order
      * @return $this
      */
     public function order(array $order): static
@@ -36,6 +37,7 @@ public function order(array $order): static
     /**
      * Set the labels for the navigation items.
      *
+     * @param array $labels
      * @return $this
      */
     public function labels(array $labels): static
@@ -46,6 +48,7 @@ public function labels(array $labels): static
     /**
      * Exclude certain items from the navigation.
      *
+     * @param array $exclude
      * @return $this
      */
     public function exclude(array $exclude): static
@@ -56,6 +59,7 @@ public function exclude(array $exclude): static
     /**
      * Add custom items to the navigation.
      *
+     * @param array $custom
      * @return $this
      */
     public function custom(array $custom): static
@@ -66,6 +70,7 @@ public function custom(array $custom): static
     /**
      * Set the display mode for subdirectories.
      *
+     * @param string $displayMode
      * @return $this
      */
     public function subdirectoryDisplay(string $displayMode): static

From 87936dea21b42fc53ef4863b6b3c21313a937f99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:00:12 +0200
Subject: [PATCH 2496/2811] Annotate the parameter generics and enumerated
 types

---
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 48c69871088..ebd0243b5de 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -26,7 +26,7 @@ public function toArray(): array
     /**
      * Set the order of the navigation items.
      *
-     * @param array $order
+     * @param array<string, int>|array<string> $order
      * @return $this
      */
     public function order(array $order): static
@@ -37,7 +37,7 @@ public function order(array $order): static
     /**
      * Set the labels for the navigation items.
      *
-     * @param array $labels
+     * @param array<string, string> $labels
      * @return $this
      */
     public function labels(array $labels): static
@@ -48,7 +48,7 @@ public function labels(array $labels): static
     /**
      * Exclude certain items from the navigation.
      *
-     * @param array $exclude
+     * @param array<string> $exclude
      * @return $this
      */
     public function exclude(array $exclude): static
@@ -59,7 +59,7 @@ public function exclude(array $exclude): static
     /**
      * Add custom items to the navigation.
      *
-     * @param array $custom
+     * @param array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}> $custom
      * @return $this
      */
     public function custom(array $custom): static
@@ -70,7 +70,7 @@ public function custom(array $custom): static
     /**
      * Set the display mode for subdirectories.
      *
-     * @param string $displayMode
+     * @param 'dropdown'|'flat'|'hidden' $displayMode
      * @return $this
      */
     public function subdirectoryDisplay(string $displayMode): static

From 5328cf7b9db584aeb59044d8728b0be67d3672b3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:00:37 +0200
Subject: [PATCH 2497/2811] Move down the toArray method

---
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index ebd0243b5de..62f76bf0d1d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -18,11 +18,6 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
 {
     protected array $config = [];
 
-    public function toArray(): array
-    {
-        return $this->config;
-    }
-
     /**
      * Set the order of the navigation items.
      *
@@ -77,4 +72,9 @@ public function subdirectoryDisplay(string $displayMode): static
     {
         // TODO: Implement subdirectoryDisplay() method.
     }
+
+    public function toArray(): array
+    {
+        return $this->config;
+    }
 }

From 118eb177d3a5cbec8dae08e4f6828f4c4c2f9a2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:02:20 +0200
Subject: [PATCH 2498/2811] Implement the builder methods

---
 .../NavigationMenuConfigurationBuilder.php    | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 62f76bf0d1d..7fea0a56c8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -26,7 +26,9 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
      */
     public function order(array $order): static
     {
-        // TODO: Implement order() method.
+        $this->config['order'] = $order;
+
+        return $this;
     }
 
     /**
@@ -37,7 +39,9 @@ public function order(array $order): static
      */
     public function labels(array $labels): static
     {
-        // TODO: Implement labels() method.
+        $this->config['labels'] = $labels;
+
+        return $this;
     }
 
     /**
@@ -48,7 +52,9 @@ public function labels(array $labels): static
      */
     public function exclude(array $exclude): static
     {
-        // TODO: Implement exclude() method.
+        $this->config['exclude'] = $exclude;
+
+        return $this;
     }
 
     /**
@@ -59,7 +65,9 @@ public function exclude(array $exclude): static
      */
     public function custom(array $custom): static
     {
-        // TODO: Implement custom() method.
+        $this->config['custom'] = $custom;
+
+        return $this;
     }
 
     /**
@@ -70,7 +78,9 @@ public function custom(array $custom): static
      */
     public function subdirectoryDisplay(string $displayMode): static
     {
-        // TODO: Implement subdirectoryDisplay() method.
+        $this->config['subdirectory_display'] = $displayMode;
+
+        return $this;
     }
 
     public function toArray(): array

From 283852aae2541fe12c5d16cf784c96a71055387d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:02:56 +0200
Subject: [PATCH 2499/2811] Create NavigationMenuConfigurationBuilderTest.php

---
 .../NavigationMenuConfigurationBuilderTest.php   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
new file mode 100644
index 00000000000..c3e7125dece
--- /dev/null
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder
+ */
+class NavigationMenuConfigurationBuilderTest extends UnitTestCase
+{
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}

From 5a48d0a83e1721728b73142ed9c3673edf5d42b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:06:58 +0200
Subject: [PATCH 2500/2811] Generate unit test with Claude

---
 ...NavigationMenuConfigurationBuilderTest.php | 134 +++++++++++++++++-
 1 file changed, 132 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index c3e7125dece..900e44875e4 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -3,14 +3,144 @@
 declare(strict_types=1);
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder;
+use Hyde\Facades\Navigation;
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder
  */
 class NavigationMenuConfigurationBuilderTest extends UnitTestCase
 {
-    public function testExample()
+    private NavigationMenuConfigurationBuilder $builder;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->builder = new NavigationMenuConfigurationBuilder();
+    }
+
+    public function testOrder()
+    {
+        $order = ['index' => 0, 'posts' => 10, 'docs/index' => 100];
+        $result = $this->builder->order($order)->toArray();
+
+        $this->assertArrayHasKey('order', $result);
+        $this->assertEquals($order, $result['order']);
+    }
+
+    public function testLabels()
+    {
+        $labels = ['index' => 'Home', 'docs/index' => 'Docs'];
+        $result = $this->builder->labels($labels)->toArray();
+
+        $this->assertArrayHasKey('labels', $result);
+        $this->assertEquals($labels, $result['labels']);
+    }
+
+    public function testExclude()
+    {
+        $exclude = ['404', 'admin'];
+        $result = $this->builder->exclude($exclude)->toArray();
+
+        $this->assertArrayHasKey('exclude', $result);
+        $this->assertEquals($exclude, $result['exclude']);
+    }
+
+    public function testCustom()
+    {
+        $custom = [
+            Navigation::item('https://example.com', 'Example', 200),
+            Navigation::item('https://github.com', 'GitHub', 300),
+        ];
+        $result = $this->builder->custom($custom)->toArray();
+
+        $this->assertArrayHasKey('custom', $result);
+        $this->assertEquals($custom, $result['custom']);
+    }
+
+    public function testSubdirectoryDisplay()
+    {
+        $displayModes = ['dropdown', 'flat', 'hidden'];
+
+        foreach ($displayModes as $mode) {
+            $result = $this->builder->subdirectoryDisplay($mode)->toArray();
+
+            $this->assertArrayHasKey('subdirectory_display', $result);
+            $this->assertEquals($mode, $result['subdirectory_display']);
+        }
+    }
+
+    public function testChainedMethods()
+    {
+        $result = $this->builder
+            ->order(['index' => 0, 'posts' => 10])
+            ->labels(['index' => 'Home'])
+            ->exclude(['404'])
+            ->custom([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->subdirectoryDisplay('dropdown')
+            ->toArray();
+
+        $this->assertArrayHasKey('order', $result);
+        $this->assertArrayHasKey('labels', $result);
+        $this->assertArrayHasKey('exclude', $result);
+        $this->assertArrayHasKey('custom', $result);
+        $this->assertArrayHasKey('subdirectory_display', $result);
+    }
+
+    public function testEmptyConfiguration()
+    {
+        $result = $this->builder->toArray();
+
+        $this->assertEmpty($result);
+    }
+
+    public function testInvalidSubdirectoryDisplay()
+    {
+        $this->expectException(\TypeError::class);
+        $this->builder->subdirectoryDisplay('invalid');
+    }
+
+    public function testRealLifeUsageScenario()
+    {
+        $result = $this->builder
+            ->order([
+                'index' => 0,
+                'posts' => 10,
+                'docs/index' => 100,
+            ])
+            ->labels([
+                'index' => 'Home',
+                'docs/index' => 'Docs',
+            ])
+            ->exclude([
+                '404',
+            ])
+            ->custom([
+                Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
+            ])
+            ->subdirectoryDisplay('dropdown')
+            ->toArray();
+
+        $this->assertEquals([
+            'order' => ['index' => 0, 'posts' => 10, 'docs/index' => 100],
+            'labels' => ['index' => 'Home', 'docs/index' => 'Docs'],
+            'exclude' => ['404'],
+            'custom' => [
+                ['destination' => 'https://github.com/hydephp/hyde', 'label' => 'GitHub', 'priority' => 200, 'attributes' => []],
+            ],
+            'subdirectory_display' => 'dropdown',
+        ], $result);
+    }
+
+    public function testArrayableInterface()
+    {
+        $this->assertInstanceOf(\Illuminate\Contracts\Support\Arrayable::class, $this->builder);
+    }
+
+    public function testArrayObjectMethods()
     {
-        $this->assertTrue(true);
+        $this->builder->order(['index' => 0]);
+        $this->assertCount(1, $this->builder);
+        $this->assertEquals(['order' => ['index' => 0]], $this->builder->getArrayCopy());
     }
 }

From 289ef291366beebb447f770ac2d05a2c00e94a43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:28:25 +0200
Subject: [PATCH 2501/2811] Test the added facade method

---
 .../Unit/Facades/NavigationFacadeTest.php     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index a4b68d9f7c4..d16fa71c776 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Navigation;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder;
 
 /**
  * @covers \Hyde\Facades\Navigation
@@ -47,4 +48,50 @@ public function testItemWithUrl()
             'attributes' => [],
         ], $item);
     }
+
+    public function testConfigure()
+    {
+        $builder = Navigation::configure();
+
+        $this->assertInstanceOf(NavigationMenuConfigurationBuilder::class, $builder);
+    }
+
+    public function testConfigureWithChainedMethods()
+    {
+        $config = Navigation::configure()
+            ->order(['index' => 0, 'posts' => 10])
+            ->labels(['index' => 'Home'])
+            ->exclude(['404'])
+            ->custom([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->subdirectoryDisplay('dropdown')
+            ->toArray();
+
+        $this->assertIsArray($config);
+        $this->assertArrayHasKey('order', $config);
+        $this->assertArrayHasKey('labels', $config);
+        $this->assertArrayHasKey('exclude', $config);
+        $this->assertArrayHasKey('custom', $config);
+        $this->assertArrayHasKey('subdirectory_display', $config);
+
+        $this->assertEquals(['index' => 0, 'posts' => 10], $config['order']);
+        $this->assertEquals(['index' => 'Home'], $config['labels']);
+        $this->assertEquals(['404'], $config['exclude']);
+        $this->assertEquals([Navigation::item('https://github.com', 'GitHub', 200)], $config['custom']);
+        $this->assertEquals('dropdown', $config['subdirectory_display']);
+    }
+
+    public function testConfigureWithSomeChainedMethods()
+    {
+        $config = Navigation::configure()
+            ->order(['about' => 1, 'contact' => 2])
+            ->labels(['about' => 'About Us'])
+            ->subdirectoryDisplay('flat')
+            ->toArray();
+
+        $this->assertEquals(['about' => 1, 'contact' => 2], $config['order']);
+        $this->assertEquals(['about' => 'About Us'], $config['labels']);
+        $this->assertEquals('flat', $config['subdirectory_display']);
+        $this->assertArrayNotHasKey('exclude', $config);
+        $this->assertArrayNotHasKey('custom', $config);
+    }
 }

From 073faa76614ca1a2e18626d89482e0852ea78331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:10:46 +0200
Subject: [PATCH 2502/2811] Skip test for not implemented feature

---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 900e44875e4..b7c6d608220 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -96,6 +96,8 @@ public function testEmptyConfiguration()
 
     public function testInvalidSubdirectoryDisplay()
     {
+        $this->markTestSkipped('Not yet implemented');
+
         $this->expectException(\TypeError::class);
         $this->builder->subdirectoryDisplay('invalid');
     }

From 121159fb4402db3cdc2ce85540bd9f9892fe6507 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:11:11 +0200
Subject: [PATCH 2503/2811] Construct with the config property

---
 .../Navigation/NavigationMenuConfigurationBuilder.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 7fea0a56c8f..9ddb26ed3e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -18,6 +18,11 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
 {
     protected array $config = [];
 
+    public function __construct()
+    {
+        parent::__construct($this->config);
+    }
+
     /**
      * Set the order of the navigation items.
      *

From 374c5291c58e490f353806d6524c76284b05a3ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:11:19 +0200
Subject: [PATCH 2504/2811] Construct with array object flags

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 9ddb26ed3e9..e4c59ea5e49 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -20,7 +20,7 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
 
     public function __construct()
     {
-        parent::__construct($this->config);
+        parent::__construct($this->config, ArrayObject::ARRAY_AS_PROPS | ArrayObject::STD_PROP_LIST);
     }
 
     /**

From 5118abea3a92f957aea2ac9a493de500b95d28f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:11:22 +0200
Subject: [PATCH 2505/2811] Revert "Construct with array object flags"

This reverts commit 38743f97f0479b3716abcd7af674ae06559c6ffa.
---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index e4c59ea5e49..9ddb26ed3e9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -20,7 +20,7 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
 
     public function __construct()
     {
-        parent::__construct($this->config, ArrayObject::ARRAY_AS_PROPS | ArrayObject::STD_PROP_LIST);
+        parent::__construct($this->config);
     }
 
     /**

From 6c60b5d2e7793354ce7734d4c9d6dd55da752839 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:11:26 +0200
Subject: [PATCH 2506/2811] Revert "Construct with the config property"

This reverts commit 808b437352dbd22465288b965d651246e3f7a40c.
---
 .../Navigation/NavigationMenuConfigurationBuilder.php        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 9ddb26ed3e9..7fea0a56c8f 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -18,11 +18,6 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
 {
     protected array $config = [];
 
-    public function __construct()
-    {
-        parent::__construct($this->config);
-    }
-
     /**
      * Set the order of the navigation items.
      *

From ee6eac0b4b49c24a326cea5bdea40a0031c4045e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:11:53 +0200
Subject: [PATCH 2507/2811] Fix typo in description

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 7fea0a56c8f..102346a0507 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -8,7 +8,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 
 /**
- * Configuration helper method to define the navigation menu configuration with better IDE support.
+ * Configuration helper class to define the navigation menu configuration with better IDE support.
  *
  * The configured object will be cast to an array that will be used by the framework to set the config data.
  *

From 413c12c68d216e79d6f271b021c6ff28af86535f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:12:13 +0200
Subject: [PATCH 2508/2811] Fix typo in description

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 102346a0507..588d4a8599e 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -12,7 +12,7 @@
  *
  * The configured object will be cast to an array that will be used by the framework to set the config data.
  *
- * @experimental This method is experimental and may change in the future.
+ * @experimental This class is experimental and may change in the future.
  */
 class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
 {

From aff25115bee6184a99c1c79f7724ad1b0ebf8349 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:13:06 +0200
Subject: [PATCH 2509/2811] Refactor the class to property utilise the array
 object features

---
 .../NavigationMenuConfigurationBuilder.php         | 14 ++++++--------
 .../NavigationMenuConfigurationBuilderTest.php     |  7 ++++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 588d4a8599e..c85dd24173b 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -16,8 +16,6 @@
  */
 class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
 {
-    protected array $config = [];
-
     /**
      * Set the order of the navigation items.
      *
@@ -26,7 +24,7 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
      */
     public function order(array $order): static
     {
-        $this->config['order'] = $order;
+        $this['order'] = $order;
 
         return $this;
     }
@@ -39,7 +37,7 @@ public function order(array $order): static
      */
     public function labels(array $labels): static
     {
-        $this->config['labels'] = $labels;
+        $this['labels'] = $labels;
 
         return $this;
     }
@@ -52,7 +50,7 @@ public function labels(array $labels): static
      */
     public function exclude(array $exclude): static
     {
-        $this->config['exclude'] = $exclude;
+        $this['exclude'] = $exclude;
 
         return $this;
     }
@@ -65,7 +63,7 @@ public function exclude(array $exclude): static
      */
     public function custom(array $custom): static
     {
-        $this->config['custom'] = $custom;
+        $this['custom'] = $custom;
 
         return $this;
     }
@@ -78,13 +76,13 @@ public function custom(array $custom): static
      */
     public function subdirectoryDisplay(string $displayMode): static
     {
-        $this->config['subdirectory_display'] = $displayMode;
+        $this['subdirectory_display'] = $displayMode;
 
         return $this;
     }
 
     public function toArray(): array
     {
-        return $this->config;
+        return $this->getArrayCopy();
     }
 }
diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index b7c6d608220..a31ceb06bb0 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -139,10 +139,15 @@ public function testArrayableInterface()
         $this->assertInstanceOf(\Illuminate\Contracts\Support\Arrayable::class, $this->builder);
     }
 
-    public function testArrayObjectMethods()
+    public function testArrayObjectBehavior()
     {
         $this->builder->order(['index' => 0]);
+
+        // ArrayObject methods now operate on the configuration data
         $this->assertCount(1, $this->builder);
         $this->assertEquals(['order' => ['index' => 0]], $this->builder->getArrayCopy());
+
+        // toArray() method should return the same result
+        $this->assertEquals(['order' => ['index' => 0]], $this->builder->toArray());
     }
 }

From 97bb4f95f9a0053a73195c1590146943f60ea4e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:14:12 +0200
Subject: [PATCH 2510/2811] Replace qualifier with an import

---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index a31ceb06bb0..15124bc1ea9 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Hyde\Testing\UnitTestCase;
+use Illuminate\Contracts\Support\Arrayable;
 use Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder;
 use Hyde\Facades\Navigation;
 
@@ -136,7 +137,7 @@ public function testRealLifeUsageScenario()
 
     public function testArrayableInterface()
     {
-        $this->assertInstanceOf(\Illuminate\Contracts\Support\Arrayable::class, $this->builder);
+        $this->assertInstanceOf(Arrayable::class, $this->builder);
     }
 
     public function testArrayObjectBehavior()

From 599abdc3931d94280ccee0bbf72e1fd3c414d3bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:24:58 +0200
Subject: [PATCH 2511/2811] Document the array shape returns

---
 .../Navigation/NavigationMenuConfigurationBuilder.php        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index c85dd24173b..6741439fa0d 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -81,6 +81,11 @@ public function subdirectoryDisplay(string $displayMode): static
         return $this;
     }
 
+    /**
+     * Get the instance as an array.
+     *
+     * @return array{order: array<string, int>, labels: array<string, string>, exclude: array<string>, custom: array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>, subdirectory_display: string}
+     */
     public function toArray(): array
     {
         return $this->getArrayCopy();

From b5cc7ed813dbec93ce887293b0382b6c6957e0de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:29:21 +0200
Subject: [PATCH 2512/2811] Use assert same for scalar comparisons

---
 .../tests/Unit/Facades/NavigationFacadeTest.php  | 16 ++++++++--------
 .../NavigationMenuConfigurationBuilderTest.php   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index d16fa71c776..f101a28263b 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -73,11 +73,11 @@ public function testConfigureWithChainedMethods()
         $this->assertArrayHasKey('custom', $config);
         $this->assertArrayHasKey('subdirectory_display', $config);
 
-        $this->assertEquals(['index' => 0, 'posts' => 10], $config['order']);
-        $this->assertEquals(['index' => 'Home'], $config['labels']);
-        $this->assertEquals(['404'], $config['exclude']);
-        $this->assertEquals([Navigation::item('https://github.com', 'GitHub', 200)], $config['custom']);
-        $this->assertEquals('dropdown', $config['subdirectory_display']);
+        $this->assertSame(['index' => 0, 'posts' => 10], $config['order']);
+        $this->assertSame(['index' => 'Home'], $config['labels']);
+        $this->assertSame(['404'], $config['exclude']);
+        $this->assertSame([Navigation::item('https://github.com', 'GitHub', 200)], $config['custom']);
+        $this->assertSame('dropdown', $config['subdirectory_display']);
     }
 
     public function testConfigureWithSomeChainedMethods()
@@ -88,9 +88,9 @@ public function testConfigureWithSomeChainedMethods()
             ->subdirectoryDisplay('flat')
             ->toArray();
 
-        $this->assertEquals(['about' => 1, 'contact' => 2], $config['order']);
-        $this->assertEquals(['about' => 'About Us'], $config['labels']);
-        $this->assertEquals('flat', $config['subdirectory_display']);
+        $this->assertSame(['about' => 1, 'contact' => 2], $config['order']);
+        $this->assertSame(['about' => 'About Us'], $config['labels']);
+        $this->assertSame('flat', $config['subdirectory_display']);
         $this->assertArrayNotHasKey('exclude', $config);
         $this->assertArrayNotHasKey('custom', $config);
     }
diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 15124bc1ea9..199c45b634d 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -26,7 +26,7 @@ public function testOrder()
         $result = $this->builder->order($order)->toArray();
 
         $this->assertArrayHasKey('order', $result);
-        $this->assertEquals($order, $result['order']);
+        $this->assertSame($order, $result['order']);
     }
 
     public function testLabels()
@@ -35,7 +35,7 @@ public function testLabels()
         $result = $this->builder->labels($labels)->toArray();
 
         $this->assertArrayHasKey('labels', $result);
-        $this->assertEquals($labels, $result['labels']);
+        $this->assertSame($labels, $result['labels']);
     }
 
     public function testExclude()
@@ -44,7 +44,7 @@ public function testExclude()
         $result = $this->builder->exclude($exclude)->toArray();
 
         $this->assertArrayHasKey('exclude', $result);
-        $this->assertEquals($exclude, $result['exclude']);
+        $this->assertSame($exclude, $result['exclude']);
     }
 
     public function testCustom()
@@ -56,7 +56,7 @@ public function testCustom()
         $result = $this->builder->custom($custom)->toArray();
 
         $this->assertArrayHasKey('custom', $result);
-        $this->assertEquals($custom, $result['custom']);
+        $this->assertSame($custom, $result['custom']);
     }
 
     public function testSubdirectoryDisplay()
@@ -67,7 +67,7 @@ public function testSubdirectoryDisplay()
             $result = $this->builder->subdirectoryDisplay($mode)->toArray();
 
             $this->assertArrayHasKey('subdirectory_display', $result);
-            $this->assertEquals($mode, $result['subdirectory_display']);
+            $this->assertSame($mode, $result['subdirectory_display']);
         }
     }
 
@@ -124,7 +124,7 @@ public function testRealLifeUsageScenario()
             ->subdirectoryDisplay('dropdown')
             ->toArray();
 
-        $this->assertEquals([
+        $this->assertSame([
             'order' => ['index' => 0, 'posts' => 10, 'docs/index' => 100],
             'labels' => ['index' => 'Home', 'docs/index' => 'Docs'],
             'exclude' => ['404'],
@@ -146,9 +146,9 @@ public function testArrayObjectBehavior()
 
         // ArrayObject methods now operate on the configuration data
         $this->assertCount(1, $this->builder);
-        $this->assertEquals(['order' => ['index' => 0]], $this->builder->getArrayCopy());
+        $this->assertSame(['order' => ['index' => 0]], $this->builder->getArrayCopy());
 
         // toArray() method should return the same result
-        $this->assertEquals(['order' => ['index' => 0]], $this->builder->toArray());
+        $this->assertSame(['order' => ['index' => 0]], $this->builder->toArray());
     }
 }

From 1029dc1a5a88ed2d29f555dc30bb836615f85f41 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 11 Jul 2024 09:25:50 +0000
Subject: [PATCH 2513/2811] Apply fixes from StyleCI

---
 packages/framework/src/Facades/Navigation.php          |  1 +
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index 00809edd5e1..b6294e06e16 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Framework\Features\Navigation\NavigationMenuConfigurationBuilder;
+
 use function compact;
 
 /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 6741439fa0d..b28ca750daa 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -19,7 +19,7 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
     /**
      * Set the order of the navigation items.
      *
-     * @param array<string, int>|array<string> $order
+     * @param  array<string, int>|array<string>  $order
      * @return $this
      */
     public function order(array $order): static
@@ -32,7 +32,7 @@ public function order(array $order): static
     /**
      * Set the labels for the navigation items.
      *
-     * @param array<string, string> $labels
+     * @param  array<string, string>  $labels
      * @return $this
      */
     public function labels(array $labels): static
@@ -45,7 +45,7 @@ public function labels(array $labels): static
     /**
      * Exclude certain items from the navigation.
      *
-     * @param array<string> $exclude
+     * @param  array<string>  $exclude
      * @return $this
      */
     public function exclude(array $exclude): static
@@ -58,7 +58,7 @@ public function exclude(array $exclude): static
     /**
      * Add custom items to the navigation.
      *
-     * @param array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}> $custom
+     * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
      * @return $this
      */
     public function custom(array $custom): static
@@ -71,7 +71,7 @@ public function custom(array $custom): static
     /**
      * Set the display mode for subdirectories.
      *
-     * @param 'dropdown'|'flat'|'hidden' $displayMode
+     * @param  'dropdown'|'flat'|'hidden'  $displayMode
      * @return $this
      */
     public function subdirectoryDisplay(string $displayMode): static

From 7e9681e830748af23363baf183e6d2b9a5ce7c41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:30:28 +0200
Subject: [PATCH 2514/2811] Remove unnecessary comment

---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 199c45b634d..dbfaa54ee60 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -144,7 +144,6 @@ public function testArrayObjectBehavior()
     {
         $this->builder->order(['index' => 0]);
 
-        // ArrayObject methods now operate on the configuration data
         $this->assertCount(1, $this->builder);
         $this->assertSame(['order' => ['index' => 0]], $this->builder->getArrayCopy());
 

From 6432901382ecc963bd315c9bd7c8ccf7cf400830 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:31:35 +0200
Subject: [PATCH 2515/2811] Split out assertion to dedicated test method

---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index dbfaa54ee60..2419ecf1c24 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -146,8 +146,12 @@ public function testArrayObjectBehavior()
 
         $this->assertCount(1, $this->builder);
         $this->assertSame(['order' => ['index' => 0]], $this->builder->getArrayCopy());
+    }
+
+    public function testToArrayMethodReturnsSameResultAsArrayObject()
+    {
+        $this->builder->order(['index' => 0]);
 
-        // toArray() method should return the same result
         $this->assertSame(['order' => ['index' => 0]], $this->builder->toArray());
     }
 }

From 9c1afcf9508ee425df7314884cb1ce21e790bfc8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:33:00 +0200
Subject: [PATCH 2516/2811] Revert "Skip test for not implemented feature"

This reverts commit 073faa76614ca1a2e18626d89482e0852ea78331.
---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 2419ecf1c24..e93c3dd3b72 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -97,8 +97,6 @@ public function testEmptyConfiguration()
 
     public function testInvalidSubdirectoryDisplay()
     {
-        $this->markTestSkipped('Not yet implemented');
-
         $this->expectException(\TypeError::class);
         $this->builder->subdirectoryDisplay('invalid');
     }

From 2842aebf136f48bd424159bdd5b0ef02271d3f3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:33:29 +0200
Subject: [PATCH 2517/2811] Assert the enumerated string type

---
 .../Navigation/NavigationMenuConfigurationBuilder.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index b28ca750daa..1056bf016f8 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
+use TypeError;
 use ArrayObject;
 use Illuminate\Contracts\Support\Arrayable;
 
@@ -76,6 +77,8 @@ public function custom(array $custom): static
      */
     public function subdirectoryDisplay(string $displayMode): static
     {
+        self::assertType(['dropdown', 'flat', 'hidden'], $displayMode);
+
         $this['subdirectory_display'] = $displayMode;
 
         return $this;
@@ -90,4 +93,12 @@ public function toArray(): array
     {
         return $this->getArrayCopy();
     }
+
+    /** @internal */
+    protected static function assertType(array $types, string $value): void
+    {
+        if (! in_array($value, $types)) {
+            throw new TypeError('Value must be one of: '.implode(', ', $types));
+        }
+    }
 }

From bd3595470d48607b39bbab992c5c343b72bb4d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:33:57 +0200
Subject: [PATCH 2518/2811] Replace internal marker for already internal method
 with experimental

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 1056bf016f8..2d031badd16 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -94,7 +94,7 @@ public function toArray(): array
         return $this->getArrayCopy();
     }
 
-    /** @internal */
+    /** @experimental May be moved to a separate helper class in the future. */
     protected static function assertType(array $types, string $value): void
     {
         if (! in_array($value, $types)) {

From d0c9c1c9d5ed2f89f7fc04d1de58685f27e092bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 11:53:30 +0200
Subject: [PATCH 2519/2811] Improve the configuration method documentation

---
 .../Navigation/NavigationMenuConfigurationBuilder.php  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 2d031badd16..621a0a109c6 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -20,6 +20,8 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
     /**
      * Set the order of the navigation items.
      *
+     * Either define a map of route keys to priorities, or just a list of route keys and we'll try to match that order.
+     *
      * @param  array<string, int>|array<string>  $order
      * @return $this
      */
@@ -33,6 +35,8 @@ public function order(array $order): static
     /**
      * Set the labels for the navigation items.
      *
+     * Each key should be a route key, and the value should be the label to display.
+     *
      * @param  array<string, string>  $labels
      * @return $this
      */
@@ -46,6 +50,8 @@ public function labels(array $labels): static
     /**
      * Exclude certain items from the navigation.
      *
+     * Each item should be a route key for the page to exclude.
+     *
      * @param  array<string>  $exclude
      * @return $this
      */
@@ -59,6 +65,8 @@ public function exclude(array $exclude): static
     /**
      * Add custom items to the navigation.
      *
+     * @example `[Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200, ['target' => '_blank'])]`
+     *
      * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
      * @return $this
      */
@@ -72,6 +80,8 @@ public function custom(array $custom): static
     /**
      * Set the display mode for subdirectories.
      *
+     * You can choose between 'dropdown', 'flat', and 'hidden'.
+     *
      * @param  'dropdown'|'flat'|'hidden'  $displayMode
      * @return $this
      */

From 80ae091dfe97beff26a28fefb66e12bb57e833da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 13:49:21 +0200
Subject: [PATCH 2520/2811] Test can configure main menu using array settings

---
 .../AutomaticNavigationConfigurationsTest.php | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ab6939903ba..34784461c8c 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1234,6 +1234,61 @@ public function testSidebarGroupCasingUsingFrontMatter()
         $this->assertSidebarEquals(['Hello World'], [new DocumentationPage('foo', ['navigation.group' => 'hello world'])]);
     }
 
+    // Configuration tests
+
+    public function testCanConfigureMainMenuUsingArraySettings()
+    {
+        $config = [
+            'navigation' => [
+                'order' => [
+                    'foo' => 3,
+                    'bar' => 2,
+                    'baz' => 1,
+                ],
+
+                'labels' => [
+                    'foo' => 'Foo Page',
+                    'bar' => 'Bar Page',
+                    'baz' => 'Baz Page',
+                    'dropdown/item' => 'Dropdown Item Page',
+                ],
+
+                'exclude' => [
+                    'qux',
+                ],
+
+                'custom' => [
+                    [
+                        'label' => 'Custom',
+                        'destination' => 'https://example.com',
+                        'priority' => 120,
+                        'attributes' => [
+                            'target' => '_blank',
+                        ],
+                    ],
+                ],
+
+                'subdirectory_display' => 'flat',
+            ],
+        ];
+
+        config(['hyde' => $config]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Baz Page', 'priority' => 1],
+            ['label' => 'Bar Page', 'priority' => 2],
+            ['label' => 'Foo Page', 'priority' => 3],
+            ['label' => 'Custom', 'priority' => 120, 'attributes' => ['target' => '_blank']],
+            ['label' => 'Dropdown Item Page', 'priority' => 999],
+        ], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+            new MarkdownPage('qux'),
+            new MarkdownPage('dropdown/item'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): AssertableNavigationMenu

From de4e8c39958af708641c8d3a79b64ad42b4cfe9a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 13:55:52 +0200
Subject: [PATCH 2521/2811] Test can configure main menu using builder settings

---
 .../AutomaticNavigationConfigurationsTest.php | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 34784461c8c..82ba3fdb209 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\InMemoryPage;
+use Hyde\Facades\Navigation;
 use Hyde\Foundation\HydeKernel;
 use JetBrains\PhpStorm\NoReturn;
 use Hyde\Pages\Concerns\HydePage;
@@ -1289,6 +1290,56 @@ public function testCanConfigureMainMenuUsingArraySettings()
         ]);
     }
 
+    public function testCanConfigureMainMenuUsingBuilderSettings()
+    {
+        $builder = Navigation::configure()
+            ->order([
+                'foo' => 3,
+                'bar' => 2,
+                'baz' => 1,
+            ])
+            ->labels([
+                'foo' => 'Foo Page',
+                'bar' => 'Bar Page',
+                'baz' => 'Baz Page',
+                'dropdown/item' => 'Dropdown Item Page',
+            ])
+            ->exclude([
+                'qux',
+            ])
+            ->custom([
+                [
+                    'label' => 'Custom',
+                    'destination' => 'https://example.com',
+                    'priority' => 120,
+                    'attributes' => [
+                        'target' => '_blank',
+                    ],
+                ],
+            ])
+            ->subdirectoryDisplay('flat');
+
+        $config = [
+            'navigation' => $builder,
+        ];
+
+        config(['hyde' => $config]);
+
+        $this->assertMenuEquals([
+            ['label' => 'Baz Page', 'priority' => 1],
+            ['label' => 'Bar Page', 'priority' => 2],
+            ['label' => 'Foo Page', 'priority' => 3],
+            ['label' => 'Custom', 'priority' => 120, 'attributes' => ['target' => '_blank']],
+            ['label' => 'Dropdown Item Page', 'priority' => 999],
+        ], [
+            new MarkdownPage('foo'),
+            new MarkdownPage('bar'),
+            new MarkdownPage('baz'),
+            new MarkdownPage('qux'),
+            new MarkdownPage('dropdown/item'),
+        ]);
+    }
+
     // Testing helpers
 
     protected function assertSidebarEquals(array $expected, array $menuPages): AssertableNavigationMenu

From ea05a987b2775074b304c2bcce108eb2d67e821b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 13:59:41 +0200
Subject: [PATCH 2522/2811] Inline local variable

---
 .../AutomaticNavigationConfigurationsTest.php | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 82ba3fdb209..14757d9935a 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1292,35 +1292,33 @@ public function testCanConfigureMainMenuUsingArraySettings()
 
     public function testCanConfigureMainMenuUsingBuilderSettings()
     {
-        $builder = Navigation::configure()
-            ->order([
-                'foo' => 3,
-                'bar' => 2,
-                'baz' => 1,
-            ])
-            ->labels([
-                'foo' => 'Foo Page',
-                'bar' => 'Bar Page',
-                'baz' => 'Baz Page',
-                'dropdown/item' => 'Dropdown Item Page',
-            ])
-            ->exclude([
-                'qux',
-            ])
-            ->custom([
-                [
-                    'label' => 'Custom',
-                    'destination' => 'https://example.com',
-                    'priority' => 120,
-                    'attributes' => [
-                        'target' => '_blank',
-                    ],
-                ],
-            ])
-            ->subdirectoryDisplay('flat');
-
         $config = [
-            'navigation' => $builder,
+            'navigation' => Navigation::configure()
+                ->order([
+                    'foo' => 3,
+                    'bar' => 2,
+                    'baz' => 1,
+                ])
+                ->labels([
+                    'foo' => 'Foo Page',
+                    'bar' => 'Bar Page',
+                    'baz' => 'Baz Page',
+                    'dropdown/item' => 'Dropdown Item Page',
+                ])
+                ->exclude([
+                    'qux',
+                ])
+                ->custom([
+                    [
+                        'label' => 'Custom',
+                        'destination' => 'https://example.com',
+                        'priority' => 120,
+                        'attributes' => [
+                            'target' => '_blank',
+                        ],
+                    ],
+                ])
+                ->subdirectoryDisplay('flat'),
         ];
 
         config(['hyde' => $config]);

From 57b703583338d38e2f443742fbf8504cab10b109 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:08:29 +0200
Subject: [PATCH 2523/2811] Use the new Navigation configuration builder class

Updates the configuration files to use the new Navigation configuration builder
---
 config/hyde.php                    | 42 +++++++++++-------------------
 packages/framework/config/hyde.php | 42 +++++++++++-------------------
 2 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 8d9c62357c5..4b224b922ae 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -332,40 +332,28 @@
     |
     */
 
-    'navigation' => [
-        // This configuration sets the priorities used to determine the order of the menu.
-        // The default values have been added below for reference and easy editing.
-        // The array key is the page's route key, the value is the priority.
-        // Lower values show up first in the menu. The default is 999.
-        'order' => [
+    'navigation' => Navigation::configure()
+        ->order([
+            // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
-        ],
-
-        // In case you want to customize the labels for the menu items, you can do so here.
-        // Simply add the route key as the array key, and the label as the value.
-        'labels' => [
+        ])
+        ->labels([
+            // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
-        ],
-
-        // These are the route keys of pages that should not show up in the navigation menu.
-        'exclude' => [
+        ])
+        ->exclude([
+            // Exclude pages from the navigation
             '404',
-        ],
-
-        // Any extra links you want to add to the navigation menu can be added here.
-        // To get started quickly, you can uncomment the defaults here.
-        // See the documentation link above for more information.
-        'custom' => [
+        ])
+        ->custom([
+            // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
-        ],
-
-        // How should pages in subdirectories be displayed in the menu?
-        // You can choose between 'dropdown', 'flat', and 'hidden'.
-        'subdirectory_display' => 'hidden',
-    ],
+        ])
+        // Configure how subdirectories are displayed in the navigation
+        ->subdirectoryDisplay('hidden'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 8d9c62357c5..4b224b922ae 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -332,40 +332,28 @@
     |
     */
 
-    'navigation' => [
-        // This configuration sets the priorities used to determine the order of the menu.
-        // The default values have been added below for reference and easy editing.
-        // The array key is the page's route key, the value is the priority.
-        // Lower values show up first in the menu. The default is 999.
-        'order' => [
+    'navigation' => Navigation::configure()
+        ->order([
+            // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
-        ],
-
-        // In case you want to customize the labels for the menu items, you can do so here.
-        // Simply add the route key as the array key, and the label as the value.
-        'labels' => [
+        ])
+        ->labels([
+            // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
-        ],
-
-        // These are the route keys of pages that should not show up in the navigation menu.
-        'exclude' => [
+        ])
+        ->exclude([
+            // Exclude pages from the navigation
             '404',
-        ],
-
-        // Any extra links you want to add to the navigation menu can be added here.
-        // To get started quickly, you can uncomment the defaults here.
-        // See the documentation link above for more information.
-        'custom' => [
+        ])
+        ->custom([
+            // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
-        ],
-
-        // How should pages in subdirectories be displayed in the menu?
-        // You can choose between 'dropdown', 'flat', and 'hidden'.
-        'subdirectory_display' => 'hidden',
-    ],
+        ])
+        // Configure how subdirectories are displayed in the navigation
+        ->subdirectoryDisplay('hidden'),
 
     /*
     |--------------------------------------------------------------------------

From 8588cb9b12fbc64d70f0718033c43a5a7d5022f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:14:54 +0200
Subject: [PATCH 2524/2811] Rename builder methods to be self describing

---
 config/hyde.php                               | 10 ++--
 packages/framework/config/hyde.php            | 10 ++--
 .../NavigationMenuConfigurationBuilder.php    | 10 ++--
 .../AutomaticNavigationConfigurationsTest.php | 10 ++--
 .../Unit/Facades/NavigationFacadeTest.php     | 16 +++----
 ...NavigationMenuConfigurationBuilderTest.php | 46 +++++++++----------
 6 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 4b224b922ae..4458eabc7a4 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -333,27 +333,27 @@
     */
 
     'navigation' => Navigation::configure()
-        ->order([
+        ->setPagePriorities([
             // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
         ])
-        ->labels([
+        ->setPageLabels([
             // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
         ])
-        ->exclude([
+        ->excludePages([
             // Exclude pages from the navigation
             '404',
         ])
-        ->custom([
+        ->addCustomNavigationItems([
             // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
         // Configure how subdirectories are displayed in the navigation
-        ->subdirectoryDisplay('hidden'),
+        ->setSubdirectoryDisplayMode('hidden'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 4b224b922ae..4458eabc7a4 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -333,27 +333,27 @@
     */
 
     'navigation' => Navigation::configure()
-        ->order([
+        ->setPagePriorities([
             // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
         ])
-        ->labels([
+        ->setPageLabels([
             // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
         ])
-        ->exclude([
+        ->excludePages([
             // Exclude pages from the navigation
             '404',
         ])
-        ->custom([
+        ->addCustomNavigationItems([
             // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
         // Configure how subdirectories are displayed in the navigation
-        ->subdirectoryDisplay('hidden'),
+        ->setSubdirectoryDisplayMode('hidden'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 621a0a109c6..aa44c5cbbe9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -25,7 +25,7 @@ class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayabl
      * @param  array<string, int>|array<string>  $order
      * @return $this
      */
-    public function order(array $order): static
+    public function setPagePriorities(array $order): static
     {
         $this['order'] = $order;
 
@@ -40,7 +40,7 @@ public function order(array $order): static
      * @param  array<string, string>  $labels
      * @return $this
      */
-    public function labels(array $labels): static
+    public function setPageLabels(array $labels): static
     {
         $this['labels'] = $labels;
 
@@ -55,7 +55,7 @@ public function labels(array $labels): static
      * @param  array<string>  $exclude
      * @return $this
      */
-    public function exclude(array $exclude): static
+    public function excludePages(array $exclude): static
     {
         $this['exclude'] = $exclude;
 
@@ -70,7 +70,7 @@ public function exclude(array $exclude): static
      * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
      * @return $this
      */
-    public function custom(array $custom): static
+    public function addCustomNavigationItems(array $custom): static
     {
         $this['custom'] = $custom;
 
@@ -85,7 +85,7 @@ public function custom(array $custom): static
      * @param  'dropdown'|'flat'|'hidden'  $displayMode
      * @return $this
      */
-    public function subdirectoryDisplay(string $displayMode): static
+    public function setSubdirectoryDisplayMode(string $displayMode): static
     {
         self::assertType(['dropdown', 'flat', 'hidden'], $displayMode);
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 14757d9935a..ea5a8a48938 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1294,21 +1294,21 @@ public function testCanConfigureMainMenuUsingBuilderSettings()
     {
         $config = [
             'navigation' => Navigation::configure()
-                ->order([
+                ->setPagePriorities([
                     'foo' => 3,
                     'bar' => 2,
                     'baz' => 1,
                 ])
-                ->labels([
+                ->setPageLabels([
                     'foo' => 'Foo Page',
                     'bar' => 'Bar Page',
                     'baz' => 'Baz Page',
                     'dropdown/item' => 'Dropdown Item Page',
                 ])
-                ->exclude([
+                ->excludePages([
                     'qux',
                 ])
-                ->custom([
+                ->addCustomNavigationItems([
                     [
                         'label' => 'Custom',
                         'destination' => 'https://example.com',
@@ -1318,7 +1318,7 @@ public function testCanConfigureMainMenuUsingBuilderSettings()
                         ],
                     ],
                 ])
-                ->subdirectoryDisplay('flat'),
+                ->setSubdirectoryDisplayMode('flat'),
         ];
 
         config(['hyde' => $config]);
diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index f101a28263b..a81acc59297 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -59,11 +59,11 @@ public function testConfigure()
     public function testConfigureWithChainedMethods()
     {
         $config = Navigation::configure()
-            ->order(['index' => 0, 'posts' => 10])
-            ->labels(['index' => 'Home'])
-            ->exclude(['404'])
-            ->custom([Navigation::item('https://github.com', 'GitHub', 200)])
-            ->subdirectoryDisplay('dropdown')
+            ->setPagePriorities(['index' => 0, 'posts' => 10])
+            ->setPageLabels(['index' => 'Home'])
+            ->excludePages(['404'])
+            ->addCustomNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->setSubdirectoryDisplayMode('dropdown')
             ->toArray();
 
         $this->assertIsArray($config);
@@ -83,9 +83,9 @@ public function testConfigureWithChainedMethods()
     public function testConfigureWithSomeChainedMethods()
     {
         $config = Navigation::configure()
-            ->order(['about' => 1, 'contact' => 2])
-            ->labels(['about' => 'About Us'])
-            ->subdirectoryDisplay('flat')
+            ->setPagePriorities(['about' => 1, 'contact' => 2])
+            ->setPageLabels(['about' => 'About Us'])
+            ->setSubdirectoryDisplayMode('flat')
             ->toArray();
 
         $this->assertSame(['about' => 1, 'contact' => 2], $config['order']);
diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index e93c3dd3b72..0d0035c018a 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -20,51 +20,51 @@ protected function setUp(): void
         $this->builder = new NavigationMenuConfigurationBuilder();
     }
 
-    public function testOrder()
+    public function testSetPagePriorities()
     {
         $order = ['index' => 0, 'posts' => 10, 'docs/index' => 100];
-        $result = $this->builder->order($order)->toArray();
+        $result = $this->builder->setPagePriorities($order)->toArray();
 
         $this->assertArrayHasKey('order', $result);
         $this->assertSame($order, $result['order']);
     }
 
-    public function testLabels()
+    public function testSetPageLabels()
     {
         $labels = ['index' => 'Home', 'docs/index' => 'Docs'];
-        $result = $this->builder->labels($labels)->toArray();
+        $result = $this->builder->setPageLabels($labels)->toArray();
 
         $this->assertArrayHasKey('labels', $result);
         $this->assertSame($labels, $result['labels']);
     }
 
-    public function testExclude()
+    public function testExcludePages()
     {
         $exclude = ['404', 'admin'];
-        $result = $this->builder->exclude($exclude)->toArray();
+        $result = $this->builder->excludePages($exclude)->toArray();
 
         $this->assertArrayHasKey('exclude', $result);
         $this->assertSame($exclude, $result['exclude']);
     }
 
-    public function testCustom()
+    public function testAddCustomNavigationItems()
     {
         $custom = [
             Navigation::item('https://example.com', 'Example', 200),
             Navigation::item('https://github.com', 'GitHub', 300),
         ];
-        $result = $this->builder->custom($custom)->toArray();
+        $result = $this->builder->addCustomNavigationItems($custom)->toArray();
 
         $this->assertArrayHasKey('custom', $result);
         $this->assertSame($custom, $result['custom']);
     }
 
-    public function testSubdirectoryDisplay()
+    public function testSetSubdirectoryDisplayMode()
     {
         $displayModes = ['dropdown', 'flat', 'hidden'];
 
         foreach ($displayModes as $mode) {
-            $result = $this->builder->subdirectoryDisplay($mode)->toArray();
+            $result = $this->builder->setSubdirectoryDisplayMode($mode)->toArray();
 
             $this->assertArrayHasKey('subdirectory_display', $result);
             $this->assertSame($mode, $result['subdirectory_display']);
@@ -74,11 +74,11 @@ public function testSubdirectoryDisplay()
     public function testChainedMethods()
     {
         $result = $this->builder
-            ->order(['index' => 0, 'posts' => 10])
-            ->labels(['index' => 'Home'])
-            ->exclude(['404'])
-            ->custom([Navigation::item('https://github.com', 'GitHub', 200)])
-            ->subdirectoryDisplay('dropdown')
+            ->setPagePriorities(['index' => 0, 'posts' => 10])
+            ->setPageLabels(['index' => 'Home'])
+            ->excludePages(['404'])
+            ->addCustomNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->setSubdirectoryDisplayMode('dropdown')
             ->toArray();
 
         $this->assertArrayHasKey('order', $result);
@@ -98,28 +98,28 @@ public function testEmptyConfiguration()
     public function testInvalidSubdirectoryDisplay()
     {
         $this->expectException(\TypeError::class);
-        $this->builder->subdirectoryDisplay('invalid');
+        $this->builder->setSubdirectoryDisplayMode('invalid');
     }
 
     public function testRealLifeUsageScenario()
     {
         $result = $this->builder
-            ->order([
+            ->setPagePriorities([
                 'index' => 0,
                 'posts' => 10,
                 'docs/index' => 100,
             ])
-            ->labels([
+            ->setPageLabels([
                 'index' => 'Home',
                 'docs/index' => 'Docs',
             ])
-            ->exclude([
+            ->excludePages([
                 '404',
             ])
-            ->custom([
+            ->addCustomNavigationItems([
                 Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
             ])
-            ->subdirectoryDisplay('dropdown')
+            ->setSubdirectoryDisplayMode('dropdown')
             ->toArray();
 
         $this->assertSame([
@@ -140,7 +140,7 @@ public function testArrayableInterface()
 
     public function testArrayObjectBehavior()
     {
-        $this->builder->order(['index' => 0]);
+        $this->builder->setPagePriorities(['index' => 0]);
 
         $this->assertCount(1, $this->builder);
         $this->assertSame(['order' => ['index' => 0]], $this->builder->getArrayCopy());
@@ -148,7 +148,7 @@ public function testArrayObjectBehavior()
 
     public function testToArrayMethodReturnsSameResultAsArrayObject()
     {
-        $this->builder->order(['index' => 0]);
+        $this->builder->setPagePriorities(['index' => 0]);
 
         $this->assertSame(['order' => ['index' => 0]], $this->builder->toArray());
     }

From 93497a41048b2bc98dc5e94edbed429a1095c359 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:15:39 +0200
Subject: [PATCH 2525/2811] Remove now redundant code comments

---
 config/hyde.php                    | 5 -----
 packages/framework/config/hyde.php | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 4458eabc7a4..9ae31e9a627 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -334,25 +334,20 @@
 
     'navigation' => Navigation::configure()
         ->setPagePriorities([
-            // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
         ])
         ->setPageLabels([
-            // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
         ])
         ->excludePages([
-            // Exclude pages from the navigation
             '404',
         ])
         ->addCustomNavigationItems([
-            // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
-        // Configure how subdirectories are displayed in the navigation
         ->setSubdirectoryDisplayMode('hidden'),
 
     /*
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 4458eabc7a4..9ae31e9a627 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -334,25 +334,20 @@
 
     'navigation' => Navigation::configure()
         ->setPagePriorities([
-            // Override page priority order
             'index' => 0,
             'posts' => 10,
             'docs/index' => 100,
         ])
         ->setPageLabels([
-            // Override page labels
             'index' => 'Home',
             'docs/index' => 'Docs',
         ])
         ->excludePages([
-            // Exclude pages from the navigation
             '404',
         ])
         ->addCustomNavigationItems([
-            // Add custom items to the navigation menu
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
-        // Configure how subdirectories are displayed in the navigation
         ->setSubdirectoryDisplayMode('hidden'),
 
     /*

From e7b5a1ce57fb0799c1a33706491be6273e06eb04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:19:22 +0200
Subject: [PATCH 2526/2811] Remove infix from helper method name

Don't think this adds value
---
 config/hyde.php                                           | 2 +-
 packages/framework/config/hyde.php                        | 2 +-
 .../Navigation/NavigationMenuConfigurationBuilder.php     | 2 +-
 .../Feature/AutomaticNavigationConfigurationsTest.php     | 2 +-
 .../framework/tests/Unit/Facades/NavigationFacadeTest.php | 2 +-
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 9ae31e9a627..67c1da3b43b 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -345,7 +345,7 @@
         ->excludePages([
             '404',
         ])
-        ->addCustomNavigationItems([
+        ->addNavigationItems([
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
         ->setSubdirectoryDisplayMode('hidden'),
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 9ae31e9a627..67c1da3b43b 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -345,7 +345,7 @@
         ->excludePages([
             '404',
         ])
-        ->addCustomNavigationItems([
+        ->addNavigationItems([
             // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
         ])
         ->setSubdirectoryDisplayMode('hidden'),
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index aa44c5cbbe9..ef8d409f6ef 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -70,7 +70,7 @@ public function excludePages(array $exclude): static
      * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
      * @return $this
      */
-    public function addCustomNavigationItems(array $custom): static
+    public function addNavigationItems(array $custom): static
     {
         $this['custom'] = $custom;
 
diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index ea5a8a48938..8262d1acc8f 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -1308,7 +1308,7 @@ public function testCanConfigureMainMenuUsingBuilderSettings()
                 ->excludePages([
                     'qux',
                 ])
-                ->addCustomNavigationItems([
+                ->addNavigationItems([
                     [
                         'label' => 'Custom',
                         'destination' => 'https://example.com',
diff --git a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
index a81acc59297..fa2350fda8f 100644
--- a/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/NavigationFacadeTest.php
@@ -62,7 +62,7 @@ public function testConfigureWithChainedMethods()
             ->setPagePriorities(['index' => 0, 'posts' => 10])
             ->setPageLabels(['index' => 'Home'])
             ->excludePages(['404'])
-            ->addCustomNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->addNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
             ->setSubdirectoryDisplayMode('dropdown')
             ->toArray();
 
diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 0d0035c018a..bd0d9acdcf0 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -47,13 +47,13 @@ public function testExcludePages()
         $this->assertSame($exclude, $result['exclude']);
     }
 
-    public function testAddCustomNavigationItems()
+    public function testAddNavigationItems()
     {
         $custom = [
             Navigation::item('https://example.com', 'Example', 200),
             Navigation::item('https://github.com', 'GitHub', 300),
         ];
-        $result = $this->builder->addCustomNavigationItems($custom)->toArray();
+        $result = $this->builder->addNavigationItems($custom)->toArray();
 
         $this->assertArrayHasKey('custom', $result);
         $this->assertSame($custom, $result['custom']);
@@ -77,7 +77,7 @@ public function testChainedMethods()
             ->setPagePriorities(['index' => 0, 'posts' => 10])
             ->setPageLabels(['index' => 'Home'])
             ->excludePages(['404'])
-            ->addCustomNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
+            ->addNavigationItems([Navigation::item('https://github.com', 'GitHub', 200)])
             ->setSubdirectoryDisplayMode('dropdown')
             ->toArray();
 
@@ -116,7 +116,7 @@ public function testRealLifeUsageScenario()
             ->excludePages([
                 '404',
             ])
-            ->addCustomNavigationItems([
+            ->addNavigationItems([
                 Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
             ])
             ->setSubdirectoryDisplayMode('dropdown')

From 491d08e0fafceaaa60693cf89724f04bf09241fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:20:07 +0200
Subject: [PATCH 2527/2811] Clean up formatting

---
 .../tests/Unit/NavigationMenuConfigurationBuilderTest.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index bd0d9acdcf0..8e24330ef83 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -17,6 +17,7 @@ class NavigationMenuConfigurationBuilderTest extends UnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->builder = new NavigationMenuConfigurationBuilder();
     }
 
@@ -53,6 +54,7 @@ public function testAddNavigationItems()
             Navigation::item('https://example.com', 'Example', 200),
             Navigation::item('https://github.com', 'GitHub', 300),
         ];
+
         $result = $this->builder->addNavigationItems($custom)->toArray();
 
         $this->assertArrayHasKey('custom', $result);

From 7641ff9d99d4b5269b70f5a2d58e512a9db23392 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:21:37 +0200
Subject: [PATCH 2528/2811] Clarify comment

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index ef8d409f6ef..2686a6b3936 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -78,7 +78,7 @@ public function addNavigationItems(array $custom): static
     }
 
     /**
-     * Set the display mode for subdirectories.
+     * Set the display mode for pages in subdirectories.
      *
      * You can choose between 'dropdown', 'flat', and 'hidden'.
      *

From e48da59a74ec8df1e103247d1c320b062c3bcf02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:22:25 +0200
Subject: [PATCH 2529/2811] Document default value

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 2686a6b3936..78b76dd01dc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -80,7 +80,7 @@ public function addNavigationItems(array $custom): static
     /**
      * Set the display mode for pages in subdirectories.
      *
-     * You can choose between 'dropdown', 'flat', and 'hidden'.
+     * You can choose between 'dropdown', 'flat', and 'hidden'. The default is 'hidden'.
      *
      * @param  'dropdown'|'flat'|'hidden'  $displayMode
      * @return $this

From 7f9f9b776e70eed0c65f76c39b1c28e5900c1d1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:23:38 +0200
Subject: [PATCH 2530/2811] Add experimental fluent shorthand

---
 .../NavigationMenuConfigurationBuilder.php           | 12 ++++++++++++
 .../Unit/NavigationMenuConfigurationBuilderTest.php  |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 78b76dd01dc..1f27c65dbc5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -94,6 +94,18 @@ public function setSubdirectoryDisplayMode(string $displayMode): static
         return $this;
     }
 
+    /**
+     * Hide pages in subdirectories from the navigation.
+     *
+     * @experimental This method is experimental and may change or be removed before the final release.
+     *
+     * @return $this
+     */
+    public function hideSubdirectoriesFromNavigation(): static
+    {
+        return $this->setSubdirectoryDisplayMode('hidden');
+    }
+
     /**
      * Get the instance as an array.
      *
diff --git a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
index 8e24330ef83..cde1e6c4100 100644
--- a/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
+++ b/packages/framework/tests/Unit/NavigationMenuConfigurationBuilderTest.php
@@ -135,6 +135,13 @@ public function testRealLifeUsageScenario()
         ], $result);
     }
 
+    public function testHideSubdirectoriesFromNavigationShorthand()
+    {
+        $result = $this->builder->hideSubdirectoriesFromNavigation()->toArray();
+
+        $this->assertSame('hidden', $result['subdirectory_display']);
+    }
+
     public function testArrayableInterface()
     {
         $this->assertInstanceOf(Arrayable::class, $this->builder);

From a961afefae6d70028525580c2ccbcb945e93248a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:32:34 +0200
Subject: [PATCH 2531/2811] Update experimental marker

---
 .../Features/Navigation/NavigationMenuConfigurationBuilder.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 1f27c65dbc5..48bd4429489 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -13,7 +13,7 @@
  *
  * The configured object will be cast to an array that will be used by the framework to set the config data.
  *
- * @experimental This class is experimental and may change in the future.
+ * @experimental This class is experimental and may change or be removed before the final release.
  */
 class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
 {

From d5f2439dc1d13b9a9766941a009d40d8ec5c82ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 16:34:32 +0200
Subject: [PATCH 2532/2811] Link to facade method and normalize documentation

---
 packages/framework/src/Facades/Navigation.php                 | 4 ++--
 .../Navigation/NavigationMenuConfigurationBuilder.php         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index b6294e06e16..1f64d809f3c 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -34,9 +34,9 @@ public static function item(string $destination, ?string $label = null, ?int $pr
     /**
      * Configuration helper method to define the navigation menu configuration with better IDE support.
      *
-     * The returned object will then be cast to an array that will be used by the framework to set the config data.
+     * The builder is an array object that will be used by the framework to set the navigation menu configuration.
      *
-     * @experimental This method is experimental and may change in the future.
+     * @experimental This method is experimental and may change or be removed before the final release.
      */
     public static function configure(): NavigationMenuConfigurationBuilder
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
index 48bd4429489..4f5d9957628 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuConfigurationBuilder.php
@@ -11,7 +11,9 @@
 /**
  * Configuration helper class to define the navigation menu configuration with better IDE support.
  *
- * The configured object will be cast to an array that will be used by the framework to set the config data.
+ * The configured data will then be used by the framework to set the navigation menu configuration.
+ *
+ * @see \Hyde\Facades\Navigation::configure()
  *
  * @experimental This class is experimental and may change or be removed before the final release.
  */

From 210271f202ad028d80e30e5e7a500e906fd5bc95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:03:10 +0200
Subject: [PATCH 2533/2811] Remove documentation for alternate front matter
 properties

I think it's confusing to note these, it's best to document the canonical ones, but silently support alternates for fault tolerance and interoperability.
---
 docs/digging-deeper/navigation.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 3ff1d9d16b9..7c58475dccc 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -70,9 +70,9 @@ You don't need to specify all the keys, only the ones you want to customize.
 ```yaml
 navigation:
     label: string  # The text to display
-    priority: int  # Order is also supported
-    hidden: bool   # Visible is also supported (but obviously invert the value)
-    group: string  # Category is also supported
+    priority: int  # The priority of the page used for determining the order, lower means higher up/first
+    hidden: bool   # Whether the page should be hidden from the navigation menu
+    group: string  # For sidebars, this is the sidebar group, for the main menu, this is the dropdown group
 ```
 
 ### `label`
@@ -86,7 +86,7 @@ navigation:
 
 ### `priority`
 
-The `priority` option allows you to control the order in which the page appears in the navigation menu. You can also use `order` instead of `priority`.
+The `priority` option allows you to control the order in which the page appears in the navigation menu. 
 
 ```yaml
 navigation:
@@ -95,7 +95,7 @@ navigation:
 
 ### `hidden`
 
-The `hidden` option allows you to control if the page appears in the navigation menu. You can also use `visible` instead of `hidden`, but obviously invert the value.
+The `hidden` option allows you to control if the page appears in the navigation menu. 
 
 ```yaml
 navigation:
@@ -107,7 +107,6 @@ navigation:
 The `group` option has a slightly different meaning depending on the type of navigation menu.
 For the primary navigation menu, it allows you to group pages together in dropdowns.
 For the sidebar, it allows you to group pages together in the sidebar under a common heading.
-You can also use `category` instead of `group`.
 
 ```yaml
 navigation:

From a6fa2951245c2dc94795a0e336e08512445788cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:15:18 +0200
Subject: [PATCH 2534/2811] Merge long parts of introduction to a single
 section

---
 docs/digging-deeper/navigation.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 7c58475dccc..c28d9188e3a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -8,18 +8,16 @@ navigation:
 
 ## Introduction
 
-A great time-saving feature of HydePHP is the automatic navigation menu and documentation sidebar generation.
-Hyde is designed to automatically configure these menus for you based on the content you have in your project.
+HydePHP offers an automatic navigation menu and documentation sidebar generation feature, designed to take the pain out of creating navigation menus.
+While Hyde does its best to configure these menus automatically based on understanding your project files, you may want to customize them further.
+This documentation will guide you through the customization process.
 
 There are two types of navigation menus in Hyde:
 
 - **Primary Navigation Menu**: This is the main navigation menu that appears on most pages of your site.
 - **Documentation Sidebar**: This is a sidebar that appears on documentation pages and contains links to other documentation pages.
 
-HydePHP automatically generates all of these menus for you based on the content of your project,
-and does its best to automatically configure them in the way that you most likely want them to be.
 
-Of course, this won't always be perfect, so thankfully Hyde makes it a breeze to customize these menus to your liking.
 Keep on reading to learn how! To learn even more about the sidebars, visit the [Documentation Pages](documentation-pages) documentation.
 
 ### Quick primer on the internals

From f72a4f525fd7d26650e8b7c8076fab91060f39a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:15:49 +0200
Subject: [PATCH 2535/2811] Update the menu types list text

---
 docs/digging-deeper/navigation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index c28d9188e3a..baaa3c409bf 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -14,8 +14,8 @@ This documentation will guide you through the customization process.
 
 There are two types of navigation menus in Hyde:
 
-- **Primary Navigation Menu**: This is the main navigation menu that appears on most pages of your site.
-- **Documentation Sidebar**: This is a sidebar that appears on documentation pages and contains links to other documentation pages.
+1. **Primary Navigation Menu**: The main navigation menu appearing on most pages of your site. Unique features include dropdowns for subdirectories, depending on configuration.
+2. **Documentation Sidebar**: The sidebar on documentation pages with links to other documentation pages. Unique features include automatic grouping based on subdirectories.
 
 
 Keep on reading to learn how! To learn even more about the sidebars, visit the [Documentation Pages](documentation-pages) documentation.

From d98f73b4872def93deaac51a79d2c5aad6f710d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:16:39 +0200
Subject: [PATCH 2536/2811] Merge together sections in the introduction

---
 docs/digging-deeper/navigation.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index baaa3c409bf..c525f72d56c 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -10,15 +10,14 @@ navigation:
 
 HydePHP offers an automatic navigation menu and documentation sidebar generation feature, designed to take the pain out of creating navigation menus.
 While Hyde does its best to configure these menus automatically based on understanding your project files, you may want to customize them further.
-This documentation will guide you through the customization process.
 
 There are two types of navigation menus in Hyde:
 
 1. **Primary Navigation Menu**: The main navigation menu appearing on most pages of your site. Unique features include dropdowns for subdirectories, depending on configuration.
 2. **Documentation Sidebar**: The sidebar on documentation pages with links to other documentation pages. Unique features include automatic grouping based on subdirectories.
 
+This documentation will guide you through the customization process. To learn even more about sidebars, visit the [Documentation Pages](documentation-pages) documentation.
 
-Keep on reading to learn how! To learn even more about the sidebars, visit the [Documentation Pages](documentation-pages) documentation.
 
 ### Quick primer on the internals
 

From 49fb29c595a44278ef29e11784b65a3ae72a6afe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:18:12 +0200
Subject: [PATCH 2537/2811] Improve headings

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index c525f72d56c..5378ec31ed4 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -19,7 +19,7 @@ There are two types of navigation menus in Hyde:
 This documentation will guide you through the customization process. To learn even more about sidebars, visit the [Documentation Pages](documentation-pages) documentation.
 
 
-### Quick primer on the internals
+### Internal Structure Overview
 
 It may be beneficial to understand the internal workings of the navigation menus to take full advantage of the options.
 
@@ -28,13 +28,13 @@ they are configured is very similar, making the documentation here applicable to
 
 See the [Digging Deeper](#digging-deeper-into-the-internals) section of this page if you want the full scoop on the internals!
 
-### Primer on priorities
+### Understanding Priorities
 
 All navigation menu items have an internal priority value that determines their order in the navigation.
 Lower values mean that the item will be higher up in the menu. The default for pages is `999` which puts them last.
 However, some pages are autoconfigured to have a lower priority, for example, the `index` page defaults to a priority of `0`.
 
-### What to customize?
+### Customization Options
 
 Here is a quick overview of what you might want to customize in your navigation menus:
 
@@ -43,7 +43,7 @@ Here is a quick overview of what you might want to customize in your navigation
 - Navigation menu item visibility - control if pages may show up in the menus
 - Navigation menu item grouping - group pages together in dropdowns
 
-### How and where to customize?
+### Customization Methods
 
 Hyde provides a few different ways to customize the navigation menus, depending on what you prefer.
 

From 70993a54195ff910ccdc6416eaccd38ad544458a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:19:24 +0200
Subject: [PATCH 2538/2811] Merge internal structure section to be more concise
 and clear

---
 docs/digging-deeper/navigation.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 5378ec31ed4..6651cda3675 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -21,12 +21,10 @@ This documentation will guide you through the customization process. To learn ev
 
 ### Internal Structure Overview
 
-It may be beneficial to understand the internal workings of the navigation menus to take full advantage of the options.
+Internally, both navigation menu types extend the same base class, and thus share core functionality. This means the configuration process is similar for both types, making the documentation applicable to both.
 
-In short, both navigation menu types extend the same class (meaning they share the same base code), this means that the way
-they are configured is very similar, making the documentation here applicable to both types of menus.
+For a deeper understanding of the internal workings, refer to the [Digging Deeper](#digging-deeper-into-the-internals) section.
 
-See the [Digging Deeper](#digging-deeper-into-the-internals) section of this page if you want the full scoop on the internals!
 
 ### Understanding Priorities
 

From e2a6934e559142aad060cc807652255c9a3d87c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:21:08 +0200
Subject: [PATCH 2539/2811] Improve the wording of the priorities section

---
 docs/digging-deeper/navigation.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 6651cda3675..a08e650d422 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -28,9 +28,7 @@ For a deeper understanding of the internal workings, refer to the [Digging Deepe
 
 ### Understanding Priorities
 
-All navigation menu items have an internal priority value that determines their order in the navigation.
-Lower values mean that the item will be higher up in the menu. The default for pages is `999` which puts them last.
-However, some pages are autoconfigured to have a lower priority, for example, the `index` page defaults to a priority of `0`.
+All navigation menu items have an internal priority value determining their order. Lower values place items higher in the menu. The default priority for pages is `999`, placing them last unless you specify a value. Some pages, like the `index` page, are by default configured with the lowest priority of `0`.
 
 ### Customization Options
 

From 5b5692298129bda5475d4350a199e134130434d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:21:23 +0200
Subject: [PATCH 2540/2811] Reword introduction to be more concise

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a08e650d422..4cf0b9bf8ec 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -32,7 +32,7 @@ All navigation menu items have an internal priority value determining their orde
 
 ### Customization Options
 
-Here is a quick overview of what you might want to customize in your navigation menus:
+Here's an overview of what you can customize in your navigation menus:
 
 - Navigation menu item labels - the text that appears in the menu links
 - Navigation menu item priority - control the order in which the links appear

From a7abfba94423968937a75e4080f8003961fd551d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:22:16 +0200
Subject: [PATCH 2541/2811] Reword list to be more concise

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4cf0b9bf8ec..3fd008786d7 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -34,10 +34,10 @@ All navigation menu items have an internal priority value determining their orde
 
 Here's an overview of what you can customize in your navigation menus:
 
-- Navigation menu item labels - the text that appears in the menu links
-- Navigation menu item priority - control the order in which the links appear
-- Navigation menu item visibility - control if pages may show up in the menus
-- Navigation menu item grouping - group pages together in dropdowns
+- Item labels: The text displayed in menu links
+- Item priorities: Control the order of link appearance
+- Item visibility: Choose to hide or show pages in the menu
+- Item grouping: Group pages together in dropdowns or sidebar categories
 
 ### Customization Methods
 

From a9ff6f36e573bc5f468c23ff6f5fdddd18636684 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:22:37 +0200
Subject: [PATCH 2542/2811] Reword introduction to be more concise

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 3fd008786d7..eb61b4e94ca 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -41,7 +41,7 @@ Here's an overview of what you can customize in your navigation menus:
 
 ### Customization Methods
 
-Hyde provides a few different ways to customize the navigation menus, depending on what you prefer.
+Hyde provides multiple ways to customize navigation menus to suit your needs:
 
 Specifying the data in the front matter will override any dynamically inferred or config-defined priority.
 While this is useful for one-offs, it can make it harder to reorder items later on as you can't see the whole picture at once.

From cfbc1b1a2345b1ba89799cf533e5940a9e76748f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:25:23 +0200
Subject: [PATCH 2543/2811] Rewrite section to use an easier to read list

---
 docs/digging-deeper/navigation.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index eb61b4e94ca..a0d75d43172 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -43,16 +43,13 @@ Here's an overview of what you can customize in your navigation menus:
 
 Hyde provides multiple ways to customize navigation menus to suit your needs:
 
-Specifying the data in the front matter will override any dynamically inferred or config-defined priority.
-While this is useful for one-offs, it can make it harder to reorder items later on as you can't see the whole picture at once.
-It's up to you which method you prefer to use.
+1. Front matter data in Markdown and Blade page files, applicable to all menu types
+2. Configuration in the `hyde` config file for main navigation items
+3. Configuration in the `docs` config file for documentation sidebar items
 
-To customize how a page is represented in navigation, you can either set the `navigation` front matter data in the page's markdown file,
-or configure it in the config file. Main navigation items are in the `hyde` config file, while documentation sidebar items are in the `docs` config file.
-General options for the entire navigation menus are also available in the `hyde` and `docs` config files.
-
-Now that you know the basics, let's dive into the details of how to customize the navigation menus!
+Keep in mind that front matter data overrides dynamically inferred or config-defined priorities. While useful for quick one-off changes on small sites, it can make reordering items later on more challenging as you can't see the entire structure at once.
 
+Additionally, general options for the entire navigation menus are also available in the `hyde` and `docs` config files.
 
 ## Front Matter Configuration
 

From 528b4fc37487fa043c55791b81c1918e8f9ffd2e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:26:38 +0200
Subject: [PATCH 2544/2811] Remove extra newlines

---
 docs/digging-deeper/navigation.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a0d75d43172..3e23a848749 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -18,14 +18,12 @@ There are two types of navigation menus in Hyde:
 
 This documentation will guide you through the customization process. To learn even more about sidebars, visit the [Documentation Pages](documentation-pages) documentation.
 
-
 ### Internal Structure Overview
 
 Internally, both navigation menu types extend the same base class, and thus share core functionality. This means the configuration process is similar for both types, making the documentation applicable to both.
 
 For a deeper understanding of the internal workings, refer to the [Digging Deeper](#digging-deeper-into-the-internals) section.
 
-
 ### Understanding Priorities
 
 All navigation menu items have an internal priority value determining their order. Lower values place items higher in the menu. The default priority for pages is `999`, placing them last unless you specify a value. Some pages, like the `index` page, are by default configured with the lowest priority of `0`.

From 1d8953926da7a3257a9a1f40940173c57574ccdb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:40:01 +0200
Subject: [PATCH 2545/2811] Move down part not needed in introduction to bottom
 of the section

---
 docs/digging-deeper/navigation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 3e23a848749..763edae235a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -51,9 +51,7 @@ Additionally, general options for the entire navigation menus are also available
 
 ## Front Matter Configuration
 
-The front matter options allow you to customize the navigation menus on a per-page basis.
-Here is a quick reference of the available options. The full documentation of each option is below.
-You don't need to specify all the keys, only the ones you want to customize.
+Front matter options allow per-page customization of navigation menus. Here's a quick reference of available options:
 
 ```yaml
 navigation:
@@ -63,6 +61,8 @@ navigation:
     group: string  # For sidebars, this is the sidebar group, for the main menu, this is the dropdown group
 ```
 
+You only need to specify the keys you want to customize.
+
 ### `label`
 
 The `label` option allows you to customize the text that appears in the navigation menu for the page.

From a6415704d5a9f168ebb48d6767eee62908c8f9ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:42:21 +0200
Subject: [PATCH 2546/2811] Reword list to be more concise

---
 docs/digging-deeper/navigation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 763edae235a..6a0d43098f9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -55,10 +55,10 @@ Front matter options allow per-page customization of navigation menus. Here's a
 
 ```yaml
 navigation:
-    label: string  # The text to display
-    priority: int  # The priority of the page used for determining the order, lower means higher up/first
+    label: string  # The displayed text in the navigation item link
+    priority: int  # The page's priority for ordering (lower means higher up/first)
     hidden: bool   # Whether the page should be hidden from the navigation menu
-    group: string  # For sidebars, this is the sidebar group, for the main menu, this is the dropdown group
+    group: string  # Set main menu dropdown or sidebar group key
 ```
 
 You only need to specify the keys you want to customize.

From f8b56aa5ea01e06ea1e5fface2c8ee7b938e4fa4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:45:13 +0200
Subject: [PATCH 2547/2811] Remove redundant information from section
 introductions

---
 docs/digging-deeper/navigation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 6a0d43098f9..9f71319485d 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -65,7 +65,7 @@ You only need to specify the keys you want to customize.
 
 ### `label`
 
-The `label` option allows you to customize the text that appears in the navigation menu for the page.
+Customizes the text appearing in the navigation menu link for the page.
 
 ```yaml
 navigation:
@@ -74,7 +74,7 @@ navigation:
 
 ### `priority`
 
-The `priority` option allows you to control the order in which the page appears in the navigation menu. 
+Controls the order in which the page appears in the navigation menu.
 
 ```yaml
 navigation:
@@ -83,7 +83,7 @@ navigation:
 
 ### `hidden`
 
-The `hidden` option allows you to control if the page appears in the navigation menu. 
+Determines if the page appears in the navigation menu.
 
 ```yaml
 navigation:

From 0bd1377d5c0743425875abcf9233096662f2d7dc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:45:23 +0200
Subject: [PATCH 2548/2811] Document default data sources

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 9f71319485d..584f355cc19 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -65,7 +65,7 @@ You only need to specify the keys you want to customize.
 
 ### `label`
 
-Customizes the text appearing in the navigation menu link for the page.
+Customizes the text appearing in the navigation menu link for the page. If not set anywhere else, Hyde will search for a title in the page content or generate one from the filename.
 
 ```yaml
 navigation:

From 059f1c6efc9125327bb2240677d7a52f0f74c6b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:45:44 +0200
Subject: [PATCH 2549/2811] Add tip about alternate syntax

---
 docs/digging-deeper/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 584f355cc19..908e0f3f8d5 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -90,6 +90,8 @@ navigation:
     hidden: true
 ```
 
+**Tip:** You can also use `visible: false` to achieve the same effect.
+
 ### `group`
 
 The `group` option has a slightly different meaning depending on the type of navigation menu.

From f437ba286393fd855411edf3c33169bd0482e8e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:50:09 +0200
Subject: [PATCH 2550/2811] Reword section to be more concise

---
 docs/digging-deeper/navigation.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 908e0f3f8d5..63bede80181 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -94,9 +94,7 @@ navigation:
 
 ### `group`
 
-The `group` option has a slightly different meaning depending on the type of navigation menu.
-For the primary navigation menu, it allows you to group pages together in dropdowns.
-For the sidebar, it allows you to group pages together in the sidebar under a common heading.
+For the primary navigation menu, this groups pages together in dropdowns. For the sidebar, it groups pages under a common heading.
 
 ```yaml
 navigation:

From 9d6a5170ee54b70ac827628ce06a4f271f3475ff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:54:12 +0200
Subject: [PATCH 2551/2811] Add note about grouping normalization

---
 docs/digging-deeper/navigation.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 63bede80181..a5fc35ff75d 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -101,6 +101,7 @@ navigation:
     group: "My Group"
 ```
 
+**Note:** Sidebar group keys are normalized, so `My Group` and `my-group` are equivalent.
 
 ## Config File Configuration
 

From cb24a792435810e6faf8f674007e72df4232c6e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:58:59 +0200
Subject: [PATCH 2552/2811] Update introduction to allow for section to stand
 alone

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a5fc35ff75d..916069a4485 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -105,7 +105,7 @@ navigation:
 
 ## Config File Configuration
 
-Next up, let's look at how to customize the navigation menus using the config files.
+Let's explore how to customize navigation menus using config files:
 
 - To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
 - When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.

From b4541d2720ea799d4e39ad910e87f3151c83062f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 18:59:38 +0200
Subject: [PATCH 2553/2811] Expand abbreviation

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 916069a4485..bfa140ecbe7 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -105,7 +105,7 @@ navigation:
 
 ## Config File Configuration
 
-Let's explore how to customize navigation menus using config files:
+Let's explore how to customize navigation menus using configuration files:
 
 - To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
 - When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.

From f3e1195a811892006af358cf873f424509d9ec95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 19:05:27 +0200
Subject: [PATCH 2554/2811] Clean up the section to be easier and clearer to
 read

---
 docs/digging-deeper/navigation.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index bfa140ecbe7..addb37cbb61 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -107,11 +107,10 @@ navigation:
 
 Let's explore how to customize navigation menus using configuration files:
 
-- To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
-- When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.
+- For the main navigation menu, use `navigation` setting in the `hyde.php` config file.
+- For the sidebar, use `sidebar` setting in the `docs.php` config file.
 
-- To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
-- When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
+When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
 
 ### Changing the priorities
 

From d021aca8d02980cfca30f1a9410239905e9473cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 19:07:36 +0200
Subject: [PATCH 2555/2811] Update headings to be more concise

---
 docs/digging-deeper/navigation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index addb37cbb61..c1fd6bd89e2 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -112,7 +112,7 @@ Let's explore how to customize navigation menus using configuration files:
 
 When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
 
-### Changing the priorities
+### Changing Priorities
 
 The `navigation.order` and `sidebar.order` settings allow you to customize the order of the pages in the navigation menus.
 
@@ -145,7 +145,7 @@ The offset is added to make it easier to place pages earlier in the list using f
 ]
 ```
 
-#### Explicit syntax for changing the priorities
+#### Explicit Priority Syntax
 
 You can also specify explicit priorities by adding a value to the array key:
 

From a282b9cf1e38c8ba007378f334cf40829ee9d9c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:43:11 +0200
Subject: [PATCH 2556/2811] Update heading to be more concise

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index c1fd6bd89e2..b36b9f3c08a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -116,7 +116,7 @@ When customizing the main navigation menu, use the [route key](core-concepts#rou
 
 The `navigation.order` and `sidebar.order` settings allow you to customize the order of the pages in the navigation menus.
 
-#### Basic syntax for changing the priorities
+#### Basic Priority Syntax
 
 The cleanest way is to use the list-style syntax where each item will get the priority calculated according to its position in the list, plus an offset of `500`.
 The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.

From 143eb6dea46fd35c972fdbd2b351094aad78186f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:43:16 +0200
Subject: [PATCH 2557/2811] Update sentence to be more concise

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b36b9f3c08a..dfa5a6a5d41 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -114,7 +114,7 @@ When customizing the main navigation menu, use the [route key](core-concepts#rou
 
 ### Changing Priorities
 
-The `navigation.order` and `sidebar.order` settings allow you to customize the order of the pages in the navigation menus.
+The `navigation.order` and `sidebar.order` settings allow you to customize the order of pages in the navigation menus.
 
 #### Basic Priority Syntax
 

From 12c055c3fddc2d0a5e8624dd6f48f1a93c4dd70a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:45:51 +0200
Subject: [PATCH 2558/2811] Rewrite introduction to be more fluent

---
 docs/digging-deeper/navigation.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index dfa5a6a5d41..b8c011200c0 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -118,8 +118,9 @@ The `navigation.order` and `sidebar.order` settings allow you to customize the o
 
 #### Basic Priority Syntax
 
-The cleanest way is to use the list-style syntax where each item will get the priority calculated according to its position in the list, plus an offset of `500`.
-The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
+A nice and simple way to define the order of pages, is to add their route keys as a simple list array. We'll then match that array order.
+
+It may be useful to know that we internally will assign a priority calculated according to its position in the list, plus an offset of `500`. The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
 
 ```php
 // filepath: config/hyde.php

From eed07c34005c2398dd890747f49c59d2df19183d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:46:24 +0200
Subject: [PATCH 2559/2811] Remove unnecessary qualifiers from examples

---
 docs/digging-deeper/navigation.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b8c011200c0..cb61d2372f8 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -127,9 +127,9 @@ It may be useful to know that we internally will assign a priority calculated ac
 
 'navigation' => [
     'order' => [
-        'home', // Gets priority 500
-        'about', // Gets priority 501
-        'contact', // Gets priority 502
+        'home', // Priority: 500
+        'about', // Priority: 501
+        'contact', // Priority: 502
     ]
 ]
 ```
@@ -139,9 +139,9 @@ It may be useful to know that we internally will assign a priority calculated ac
 
 'sidebar' => [
     'order' => [
-        'readme', // Gets priority 500
-        'installation', // Gets priority 501
-        'getting-started', // Gets priority 502
+        'readme', // Priority: 500
+        'installation', // Priority: 501
+        'getting-started', // Priority: 502
     ]
 ]
 ```

From 58e4ed038d9d2a8ff28608314022586b0a3f5770 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:48:49 +0200
Subject: [PATCH 2560/2811] Document explicitness in introduction instead in
 the examples

---
 docs/digging-deeper/navigation.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index cb61d2372f8..f671624c2d3 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -148,16 +148,16 @@ It may be useful to know that we internally will assign a priority calculated ac
 
 #### Explicit Priority Syntax
 
-You can also specify explicit priorities by adding a value to the array key:
+You can also specify explicit priorities by adding a value to the array keys. We'll then use these exact values as the priorities.
 
 ```php
 // filepath: config/hyde.php
 
 'navigation' => [
     'order' => [
-        'home' => 10, // Gets priority 10
-        'about' => 15, // Gets priority 15
-        'contact' => 20, // Gets priority 20
+        'home' => 10,
+        'about' => 15,
+        'contact' => 20,
     ]
 ]
 ```
@@ -167,9 +167,9 @@ You can also specify explicit priorities by adding a value to the array key:
 
 'sidebar' => [
     'order' => [
-        'readme' => 10, // Gets priority 10
-        'installation' => 15, // Gets priority 15
-        'getting-started' => 20, // Gets priority 20
+        'readme' => 10,
+        'installation' => 15,
+        'getting-started' => 20,
     ]
 ]
 ```

From 6eb7084fde5b4ff3f1702998ba2d66c793c05314 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:49:16 +0200
Subject: [PATCH 2561/2811] Remove extra lines from file path labels

---
 docs/digging-deeper/navigation.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index f671624c2d3..0fceaf2c8e9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -124,7 +124,6 @@ It may be useful to know that we internally will assign a priority calculated ac
 
 ```php
 // filepath: config/hyde.php
-
 'navigation' => [
     'order' => [
         'home', // Priority: 500
@@ -136,7 +135,6 @@ It may be useful to know that we internally will assign a priority calculated ac
 
 ```php
 // filepath: config/docs.php
-
 'sidebar' => [
     'order' => [
         'readme', // Priority: 500
@@ -152,7 +150,6 @@ You can also specify explicit priorities by adding a value to the array keys. We
 
 ```php
 // filepath: config/hyde.php
-
 'navigation' => [
     'order' => [
         'home' => 10,
@@ -164,7 +161,6 @@ You can also specify explicit priorities by adding a value to the array keys. We
 
 ```php
 // filepath: config/docs.php
-
 'sidebar' => [
     'order' => [
         'readme' => 10,

From ecbbee3116bfcf03287d170797e41d85b6a7e3ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:49:37 +0200
Subject: [PATCH 2562/2811] Clean up section

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 0fceaf2c8e9..0b6e5bf62d5 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -170,14 +170,14 @@ You can also specify explicit priorities by adding a value to the array keys. We
 ]
 ```
 
-**You can of course also combine these methods if you want:**
+You could also combine these methods if desired:
 
 ```php
 // filepath: Applicable to both
 [
-    'readme' => 10, // Gets priority 10
-    'installation', // Gets priority 500
-    'getting-started', // Gets priority 501
+    'readme' => 10, // Priority: 10
+    'installation', // Priority: 500
+    'getting-started', // Priority: 501
 ]
 ```
 

From 2385ac001d25bf3cd1594c7c6eb52d6ca2378388 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:50:03 +0200
Subject: [PATCH 2563/2811] Update heading to be more concise

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 0b6e5bf62d5..3473fd75ceb 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -181,7 +181,7 @@ You could also combine these methods if desired:
 ]
 ```
 
-### Changing the menu item labels
+### Changing Menu Item Labels
 
 Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
 

From b17bfe166e3e79a0bfee8e99ef86a13134b6b8b9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:50:26 +0200
Subject: [PATCH 2564/2811] Normalize file path syntax

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 3473fd75ceb..4314b911aef 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -189,7 +189,7 @@ From the Hyde config you can override the label of navigation links using the by
 This is not yet supported for the sidebar, but will be in the future.
 
 ```php
-// filepath config/hyde.php
+// filepath: config/hyde.php
 'navigation' => [
     'labels' => [
         'index' => 'Start',
@@ -204,7 +204,7 @@ Sometimes, especially if you have a lot of pages, you may want to prevent links
 To remove items from being automatically added, simply add the page's route key to the blacklist.
 
 ```php
-// filepath config/hyde.php
+// filepath: config/hyde.php
 'navigation' => [
     'exclude' => [
         '404'
@@ -220,7 +220,7 @@ When linking to an external site, you should use the `NavigationItem::create()`
 destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
 
 ```php
-// filepath config/hyde.php
+// filepath: config/hyde.php
 use Hyde\Framework\Features\Navigation\NavigationItem;
 
 'navigation' => [
@@ -241,7 +241,7 @@ Simplified, this will then be rendered as follows:
 Within the Hyde config you can configure how subdirectories should be displayed in the menu.
 
 ```php
-// filepath config/hyde.php
+// filepath: config/hyde.php
 'navigation' => [
     'subdirectory_display' => 'dropdown'
 ]

From 1e32a89d5383fcc5ee16d6db1aba1cd2fae36f08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:53:44 +0200
Subject: [PATCH 2565/2811] Remove introductory line offering no real
 information

---
 docs/digging-deeper/navigation.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4314b911aef..8c4d98f340a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -200,8 +200,7 @@ This is not yet supported for the sidebar, but will be in the future.
 
 ### Excluding Items (Blacklist)
 
-Sometimes, especially if you have a lot of pages, you may want to prevent links from showing up in the main navigation menu.
-To remove items from being automatically added, simply add the page's route key to the blacklist.
+To prevent specific pages from showing up in the main navigation menu, simply add their route keys to the blacklist:
 
 ```php
 // filepath: config/hyde.php

From 83bccaec3f527cea8354408a77518d74692eaf5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:54:27 +0200
Subject: [PATCH 2566/2811] Revert "Remove introductory line offering no real
 information"

This reverts commit 1e32a89d5383fcc5ee16d6db1aba1cd2fae36f08.
---
 docs/digging-deeper/navigation.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 8c4d98f340a..4314b911aef 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -200,7 +200,8 @@ This is not yet supported for the sidebar, but will be in the future.
 
 ### Excluding Items (Blacklist)
 
-To prevent specific pages from showing up in the main navigation menu, simply add their route keys to the blacklist:
+Sometimes, especially if you have a lot of pages, you may want to prevent links from showing up in the main navigation menu.
+To remove items from being automatically added, simply add the page's route key to the blacklist.
 
 ```php
 // filepath: config/hyde.php

From aaeff4bd4f6fd6e2fbf4f35a4eed313d2f436cb8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:56:52 +0200
Subject: [PATCH 2567/2811] Clean up introduction

---
 docs/digging-deeper/navigation.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4314b911aef..34c7f79d62d 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -200,8 +200,9 @@ This is not yet supported for the sidebar, but will be in the future.
 
 ### Excluding Items (Blacklist)
 
-Sometimes, especially if you have a lot of pages, you may want to prevent links from showing up in the main navigation menu.
-To remove items from being automatically added, simply add the page's route key to the blacklist.
+When you have a lot of pages, it may be useful to prevent links from being added to the main navigation menu.
+
+To exclude items from being added, simply add the page's route key to the navigation blacklist in the Hyde config:
 
 ```php
 // filepath: config/hyde.php

From 984a02d9115e7bec8c1c284a2fa01074965f3609 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 20:57:36 +0200
Subject: [PATCH 2568/2811] Rewrite section to be more fluent

---
 docs/digging-deeper/navigation.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 34c7f79d62d..ef7608ef0fe 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -185,8 +185,7 @@ You could also combine these methods if desired:
 
 Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
 
-From the Hyde config you can override the label of navigation links using the by mapping the route key to the desired title.
-This is not yet supported for the sidebar, but will be in the future.
+If you're not happy with these, it's easy to override navigation link labels by mapping the route key to the desired title in the Hyde config:
 
 ```php
 // filepath: config/hyde.php
@@ -198,6 +197,8 @@ This is not yet supported for the sidebar, but will be in the future.
 ]
 ```
 
+**Note:** This feature is not yet supported for the sidebar.
+
 ### Excluding Items (Blacklist)
 
 When you have a lot of pages, it may be useful to prevent links from being added to the main navigation menu.

From 0f925e14d9dfa7c6b2c1b7358dfb07bd30cfb834 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:01:34 +0200
Subject: [PATCH 2569/2811] Simplify custom navigation link section
 introduction

---
 docs/digging-deeper/navigation.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index ef7608ef0fe..2728eaa4a87 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -216,10 +216,7 @@ To exclude items from being added, simply add the page's route key to the naviga
 
 ### Adding Custom Navigation Menu Links
 
-You can easily add custom navigation menu links similar to how we add Authors. Simply add a `NavigationItem` model to the `navigation.custom` array.
-
-When linking to an external site, you should use the `NavigationItem::create()` method facade. The first two arguments are the
-destination and label, both required. The third argument is the priority, which is optional, and defaults to `500`.
+You can easily add custom navigation menu links in the Hyde config:
 
 ```php
 // filepath: config/hyde.php

From 13c5ef478a74a4b95dfb12dab8e2acec06035eb0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:06:12 +0200
Subject: [PATCH 2570/2811] Update custom navigation links example to use new
 facade method

---
 docs/digging-deeper/navigation.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 2728eaa4a87..9f8e04ee4c5 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -220,11 +220,15 @@ You can easily add custom navigation menu links in the Hyde config:
 
 ```php
 // filepath: config/hyde.php
-use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Facades\Navigation;
 
 'navigation' => [
     'custom' => [
-        NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
+        Navigation::item(
+            destination: 'https://github.com/hydephp/hyde', // Required
+            label: 'GitHub', // Optional, defaults to the destination value
+            priority: 200 // Optional, defaults to 500
+        ),
     ]
 ]
 ```

From c186ae0b6a3b54d336ae9e77e0767d1788a9d1c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:06:32 +0200
Subject: [PATCH 2571/2811] Add tip on named arguments

---
 docs/digging-deeper/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 9f8e04ee4c5..0f3662a047e 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -233,6 +233,8 @@ use Hyde\Facades\Navigation;
 ]
 ```
 
+**Tip:** While named arguments are used in the example for clarity, they are not required.
+
 Simplified, this will then be rendered as follows:
 
 ```html

From b2f20575dc396ecf0ec56cc89e1961fb1ce3cc0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:07:01 +0200
Subject: [PATCH 2572/2811] Remove rendered HTML example

Not sure how much value this offers
---
 docs/digging-deeper/navigation.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 0f3662a047e..8735c6de583 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -235,11 +235,6 @@ use Hyde\Facades\Navigation;
 
 **Tip:** While named arguments are used in the example for clarity, they are not required.
 
-Simplified, this will then be rendered as follows:
-
-```html
-<a href="https://github.com/hydephp/hyde">GitHub</a>
-```
 
 ### Configure subdirectory handling
 

From 6ebd643e389fae46bd1e79812c5c188aee0a8c23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:07:16 +0200
Subject: [PATCH 2573/2811] Normalize heading

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 8735c6de583..c68fff88868 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -236,7 +236,7 @@ use Hyde\Facades\Navigation;
 **Tip:** While named arguments are used in the example for clarity, they are not required.
 
 
-### Configure subdirectory handling
+### Configure Subdirectory Display
 
 Within the Hyde config you can configure how subdirectories should be displayed in the menu.
 

From 7c2f90cfffcf41a25fa2c4e9ecdeeaaf4fb361c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:12:10 +0200
Subject: [PATCH 2574/2811] Improve the subdirectory display section

---
 docs/digging-deeper/navigation.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index c68fff88868..04c575f296c 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -238,7 +238,7 @@ use Hyde\Facades\Navigation;
 
 ### Configure Subdirectory Display
 
-Within the Hyde config you can configure how subdirectories should be displayed in the menu.
+You can configure how subdirectories should be displayed in the menu:
 
 ```php
 // filepath: config/hyde.php
@@ -247,9 +247,10 @@ Within the Hyde config you can configure how subdirectories should be displayed
 ]
 ```
 
-Dropdown means that pages in subdirectories will be displayed in a dropdown menu,
-while `flat` means that pages in subdirectories will be displayed as individual items in the menu.
-Hidden means that pages in subdirectories will not be displayed in the menu at all.
+**Supported Options:**
+- `dropdown`: Pages in subdirectories are displayed in a dropdown menu
+- `hidden`: Pages in subdirectories are not displayed at all the menus
+- `flat`: Pages in subdirectories are displayed as individual items
 
 ### Automatic menu groups
 

From cc01ba341b1fee40a799f3b0991636fa291b958e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:31:26 +0200
Subject: [PATCH 2575/2811] Normalize heading

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 04c575f296c..cf84a14eeb0 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -252,7 +252,7 @@ You can configure how subdirectories should be displayed in the menu:
 - `hidden`: Pages in subdirectories are not displayed at all the menus
 - `flat`: Pages in subdirectories are displayed as individual items
 
-### Automatic menu groups
+### Automatic Menu Groups
 
 HydePHP has a neat feature to automatically place pages in dropdowns based on subdirectories.
 

From 03262ef357218c21792ac7ee17efe13b18540821 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:57:28 +0200
Subject: [PATCH 2576/2811] Clean up the subdirectory grouping documentation

---
 docs/digging-deeper/navigation.md | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index cf84a14eeb0..dd55c32879c 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -254,15 +254,14 @@ You can configure how subdirectories should be displayed in the menu:
 
 ### Automatic Menu Groups
 
-HydePHP has a neat feature to automatically place pages in dropdowns based on subdirectories.
+A handy feature HydePHP has is that it can automatically place pages in dropdowns based on subdirectory structures.
 
-#### Automatic navigation menu dropdowns
+#### Automatic Navigation Menu Dropdowns
 
-For pages that can be in the main site menu, this feature needs to be enabled in the `hyde.php` config file.
+Enable this feature in the `hyde.php` config file by setting the `subdirectory_display` key to `dropdown`.
 
 ```php
-// filepath config/hyde.php
-
+// filepath: config/hyde.php
 'navigation' => [
     'subdirectory_display' => 'dropdown',
 ],
@@ -270,20 +269,18 @@ For pages that can be in the main site menu, this feature needs to be enabled in
 
 Now if you create a page called `_pages/about/contact.md` it will automatically be placed in a dropdown called "About".
 
-#### Automatic documentation sidebar grouping
+#### Automatic Documentation Sidebar Grouping
 
-This feature works similarly to the automatic navigation menu dropdowns, but instead places the sidebar items in named groups.
-This feature is enabled by default, so you only need to place your pages in subdirectories to have them grouped.
+This feature is always enabled for documentation pages. Simply place your pages in subdirectories to have them grouped in the sidebar.
 
 For example: `_docs/getting-started/installation.md` will be placed in a group called "Getting Started".
 
 >info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
 
-#### Dropdown menu notes
+#### Dropdown Menu Notes
 
-Here are some things to keep in mind when using dropdown menus, regardless of the configuration:
-- Dropdowns take priority over standard items. So if you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
-    - For example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost.
+- Dropdowns take priority over standard items. If you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
+- Example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost, so please keep this in mind when using this feature.
 
 ## Numerical Prefix Navigation Ordering
 

From 2d1b20549ec623caf4d326385a55037e074a7af2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 21:58:39 +0200
Subject: [PATCH 2577/2811] Clean up the Navigation API section to be more
 concise

---
 docs/digging-deeper/navigation.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index dd55c32879c..16cb6108e23 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -373,7 +373,6 @@ use Hyde\Framework\Features\Navigation\NavigationGroup;
 
 ## The Navigation API
 
-If you want to interact with the site navigation programmatically, or if you want to create complex custom menus, you can do so through the new Navigation API.
-For most cases you don't need this, as Hyde creates the navigation for you. But it can be useful for advanced users and package developers.
+For advanced users and package developers, Hyde offers a Navigation API for programmatic interaction with site navigation. This API consists of a set of PHP classes allowing fluent interaction with navigation menus.
 
-The Navigation API consists of a set of PHP classes, allowing you to fluently interact with the navigation menus. You can learn more about the API in the [Navigation API](navigation-api) documentation.
+For more detailed information about the API, refer to the [Navigation API](navigation-api) documentation.

From 5c1b73f7f8029b1dbe73f3b826d0c6b04d715545 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:00:56 +0200
Subject: [PATCH 2578/2811] Shorten the introduction to be more concise

---
 docs/digging-deeper/navigation.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 16cb6108e23..716e5a0a308 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -284,9 +284,7 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 ## Numerical Prefix Navigation Ordering
 
-HydePHP v2 introduces a new feature that allows navigation items to be ordered based on a numerical prefix in the filename.
-This is a great way to control the ordering of pages in both the primary navigation menu and the documentation sidebar,
-as your file structure will match the order of the pages in the navigation menus.
+HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
 
 For example, the following will have the same order in the navigation menu as in a file explorer:
 

From cfffe1d3553fcff66e31648255c73d92f7c9bd4c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:01:40 +0200
Subject: [PATCH 2579/2811] Improve information presented in example
 introduction

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 716e5a0a308..c6d52ef3aa3 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -286,7 +286,7 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
 
-For example, the following will have the same order in the navigation menu as in a file explorer:
+This has the great benefit of matching the navigation menu layout with the file structure view, and works especially great with subdirectory-based navigation grouping.
 
 ```shell
 _pages/

From f353b372410648ba0ac4b0410fc3dbaf006edb2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:03:11 +0200
Subject: [PATCH 2580/2811] Remove unnecessary information from example

---
 docs/digging-deeper/navigation.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index c6d52ef3aa3..032e3223d1b 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -290,9 +290,9 @@ This has the great benefit of matching the navigation menu layout with the file
 
 ```shell
 _pages/
-  01-home.md # Gets priority 1, putting it first (will be saved to _site/index.html)
-  02-about.md # Gets priority 2, putting it second (will be saved to _site/about.html)
-  03-contact.md # Gets priority 3, putting it third (will be saved to _site/contact.html)
+  01-home.md     # Priority: 1 (saved to _site/index.html)
+  02-about.md    # Priority: 2 (saved to _site/about.html)
+  03-contact.md  # Priority: 3 (saved to _site/contact.html)
 ```
 
 Hyde will then parse the number from the filename and use it as the priority for the page in the navigation menus.

From 2ff20cdcbda7e79708ccdcb2dd34026cfb8c8fe4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:03:24 +0200
Subject: [PATCH 2581/2811] Merge in prefix stripping information into line

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 032e3223d1b..b4b88b04ca6 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -295,7 +295,7 @@ _pages/
   03-contact.md  # Priority: 3 (saved to _site/contact.html)
 ```
 
-Hyde will then parse the number from the filename and use it as the priority for the page in the navigation menus.
+As you can seem Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
 
 ### Keep in mind
 

From 3e6b3b009a1252f337db5a7229a673fc67226ec4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:03:38 +0200
Subject: [PATCH 2582/2811] Rename heading

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b4b88b04ca6..0c83b1f73c3 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -297,7 +297,7 @@ _pages/
 
 As you can seem Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
 
-### Keep in mind
+### Important Notes
 
 Here are some things to keep in mind, especially if you mix numerical prefix ordering with other ordering methods:
 

From f7e71fd910d4eabfc3bbc020046aca171f0284f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:05:19 +0200
Subject: [PATCH 2583/2811] Remove introduction containing discouraged usage

---
 docs/digging-deeper/navigation.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 0c83b1f73c3..47608ed2385 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -299,7 +299,6 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
 
 ### Important Notes
 
-Here are some things to keep in mind, especially if you mix numerical prefix ordering with other ordering methods:
 
 1. The numerical prefix will still be part of the page identifier, but it will be stripped from the route key.
     - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.

From f18507f0db19aa250cfc83de6ff4e055afcf54c0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:06:25 +0200
Subject: [PATCH 2584/2811] Remove extra newline

---
 docs/digging-deeper/navigation.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 47608ed2385..00796c89872 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -299,7 +299,6 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
 
 ### Important Notes
 
-
 1. The numerical prefix will still be part of the page identifier, but it will be stripped from the route key.
     - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.
 2. You can delimit the numerical prefix with either a dash or an underscore.

From ee0e57f695c3651c366cecc863704d48c553b9cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:06:50 +0200
Subject: [PATCH 2585/2811] Use more concise language

---
 docs/digging-deeper/navigation.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 00796c89872..67d7c9df638 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -299,11 +299,11 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
 
 ### Important Notes
 
-1. The numerical prefix will still be part of the page identifier, but it will be stripped from the route key.
-    - For example: `_pages/01-home.md` will have the route key `home` and the page identifier `01-home`.
+1. The numerical prefix remains part of the page identifier but is stripped from the route key.
+   For example: `_pages/01-home.md` has route key `home` and page identifier `01-home`.
 2. You can delimit the numerical prefix with either a dash or an underscore.
-    - For example: `_pages/01-home.md` and `_pages/01_home.md` are both valid.
-3. The leading zeroes are optional, so `_pages/1-home.md` is also valid.
+   For example: Both `_pages/01-home.md` and `_pages/01_home.md` are valid.
+3. Leading zeros are optional. `_pages/1-home.md` is equally valid.
 
 ### Using numerical prefix ordering in subdirectories
 

From 23ff410807405bed7e5f908d631202f780b76a79 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:07:07 +0200
Subject: [PATCH 2586/2811] Normalize heading

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 67d7c9df638..1a2fd68bf90 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -305,7 +305,7 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
    For example: Both `_pages/01-home.md` and `_pages/01_home.md` are valid.
 3. Leading zeros are optional. `_pages/1-home.md` is equally valid.
 
-### Using numerical prefix ordering in subdirectories
+### Using Numerical Prefix Ordering in Subdirectories
 
 The numerical prefix ordering feature works great when using the automatic subdirectory-based grouping for navigation menu dropdowns and documentation sidebar categories.
 

From a505a0b626b2ba62e62128d9ef31a4687d98a474 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:08:05 +0200
Subject: [PATCH 2587/2811] Use more concise wording

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1a2fd68bf90..0f6cd5f7573 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -313,7 +313,7 @@ This integration has two main features to consider:
 1. You can use numerical prefixes in subdirectories to control the order of dropdowns.
 2. The ordering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
 
-Here is an example structure of how you may want to organize a documentation site:
+Here is an example structure of how could organize a documentation site:
 
 ```shell
 _docs/

From a32354c0d66607daa013a227ef9c2a1661e166a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:08:16 +0200
Subject: [PATCH 2588/2811] Use more concise wording

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 0f6cd5f7573..abed3eb3432 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -307,7 +307,7 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
 
 ### Using Numerical Prefix Ordering in Subdirectories
 
-The numerical prefix ordering feature works great when using the automatic subdirectory-based grouping for navigation menu dropdowns and documentation sidebar categories.
+This feature integrates well with automatic subdirectory-based grouping for navigation menu dropdowns and documentation sidebar categories:
 
 This integration has two main features to consider:
 1. You can use numerical prefixes in subdirectories to control the order of dropdowns.

From 995bd8148021a0141cf07f4a3fce52f91f4f5c4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:10:20 +0200
Subject: [PATCH 2589/2811] Update section to be more concise

---
 docs/digging-deeper/navigation.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index abed3eb3432..9d82c7df5fa 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -307,11 +307,10 @@ As you can seem Hyde parses the number from the filename and uses it as the prio
 
 ### Using Numerical Prefix Ordering in Subdirectories
 
-This feature integrates well with automatic subdirectory-based grouping for navigation menu dropdowns and documentation sidebar categories:
+This feature integrates well with automatic subdirectory-based navigation grouping. Here are two useful tips:
 
-This integration has two main features to consider:
-1. You can use numerical prefixes in subdirectories to control the order of dropdowns.
-2. The ordering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
+1. You can use numerical prefixes in subdirectories to control the dropdown/sidebar order.
+2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
 
 Here is an example structure of how could organize a documentation site:
 

From 23e610d104bdd95adcfa3f901ae10b573af398df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:11:28 +0200
Subject: [PATCH 2590/2811] Remove section detailing discouraged use with no
 real benefit

---
 docs/digging-deeper/navigation.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 9d82c7df5fa..7fefa32f269 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -338,7 +338,6 @@ You can disable this feature by setting the `numerical_page_ordering` setting to
 'numerical_page_ordering' => false,
 ```
 
-While it's not recommended, as you lose out on the convenience of the automatic ordering, any front matter priority settings will override the numerical prefix ordering if you for some reason need to.
 
 ## Digging Deeper into the internals
 

From e8639f487e9f7e3760a4958567e100a6979c2f64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:12:14 +0200
Subject: [PATCH 2591/2811] Reword section introduction

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 7fefa32f269..e7702c4926a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -330,7 +330,7 @@ _docs/
 
 ### Customization
 
-You can disable this feature by setting the `numerical_page_ordering` setting to `false` in the `hyde.php` config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
+If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
 
 ```php
 // filepath config/hyde.php

From f0e2ff3330d1871bd920fc7cd03df286ebcdd660 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:12:24 +0200
Subject: [PATCH 2592/2811] Normalize file path label syntax

---
 docs/digging-deeper/navigation.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index e7702c4926a..bed7f3d1488 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -333,8 +333,7 @@ _docs/
 If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
 
 ```php
-// filepath config/hyde.php
-
+// filepath: config/hyde.php
 'numerical_page_ordering' => false,
 ```
 

From 14e5c4c0d7fee93855ccc3aebbd574a3baf4103d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:12:36 +0200
Subject: [PATCH 2593/2811] Normalize heading formatting

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index bed7f3d1488..f5cf1737888 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -338,7 +338,7 @@ If you're not interested in using numerical prefix ordering, you can disable it
 ```
 
 
-## Digging Deeper into the internals
+## Digging Deeper into the Internals
 
 While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,
 but you can find more detailed information in the [Navigation API](navigation-api) documentation.

From 519002a35d91145f61ad259d0b13036402d73dfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:13:43 +0200
Subject: [PATCH 2594/2811] Remove newline

---
 docs/digging-deeper/navigation.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index f5cf1737888..e809f33d418 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -337,7 +337,6 @@ If you're not interested in using numerical prefix ordering, you can disable it
 'numerical_page_ordering' => false,
 ```
 
-
 ## Digging Deeper into the Internals
 
 While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,

From bd2f05a9b8e05df2c30c0e28a1136b674b1b3c44 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:15:11 +0200
Subject: [PATCH 2595/2811] Merge introduction sections

---
 docs/digging-deeper/navigation.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index e809f33d418..949c92cf8e8 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -339,8 +339,7 @@ If you're not interested in using numerical prefix ordering, you can disable it
 
 ## Digging Deeper into the Internals
 
-While not required to know, you may find it interesting to learn more about how the navigation is handled internally. Here is a high level overview,
-but you can find more detailed information in the [Navigation API](navigation-api) documentation.
+While not essential, understanding the internal workings of the navigation system can be as beneficial as it's interesting. Here's a quick high-level overview of the [Navigation API](navigation-api).
 
 The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class. Both extend the same base `NavigationMenu` class.
 

From 9206cf410dc7075f8c111e8a9a3f77bf4c576eec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:15:48 +0200
Subject: [PATCH 2596/2811] Add subheading

---
 docs/digging-deeper/navigation.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 949c92cf8e8..4c50dfee198 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -341,6 +341,8 @@ If you're not interested in using numerical prefix ordering, you can disable it
 
 While not essential, understanding the internal workings of the navigation system can be as beneficial as it's interesting. Here's a quick high-level overview of the [Navigation API](navigation-api).
 
+### Navigation Menu Classes
+
 The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class. Both extend the same base `NavigationMenu` class.
 
 ```php

From 17bf95fa9bbeca9c5ec33812ddf0b1fd089e3846 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:16:43 +0200
Subject: [PATCH 2597/2811] Reword and summarize parts of the internals
 overview

---
 docs/digging-deeper/navigation.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4c50dfee198..1f037908a70 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -343,7 +343,7 @@ While not essential, understanding the internal workings of the navigation syste
 
 ### Navigation Menu Classes
 
-The main navigation menu is the `MainNavigationMenu` class, and the documentation sidebar is the `DocumentationSidebar` class. Both extend the same base `NavigationMenu` class.
+The main navigation menu uses the `MainNavigationMenu` class, while the documentation sidebar uses the `DocumentationSidebar` class. Both extend the base `NavigationMenu` class:
 
 ```php
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
@@ -351,13 +351,9 @@ use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 ```
 
-Within the base `NavigationMenu` class, you will find the main logic for how the menus are generated,
-while the child implementations contain the extra logic tailored for their specific use cases.
+The base `NavigationMenu` class contains the main logic for menu generation, while child implementations contain extra logic for specific use cases.
 
-All the navigation menus store the menu items in their `$items` collection containing instances of the `NavigationItem` class.
-
-The `NavigationItem` class is a simple class that contains the label and URL of the menu item and is used to represent each item in the menu.
-Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain a collection of additional `NavigationItem` instances.
+All navigation menus store items in their `$items` collection, containing instances of the `NavigationItem` class. Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain additional `NavigationItem` instances:
 
 ```php
 use Hyde\Framework\Features\Navigation\NavigationItem;

From b47bae066476f74577915572be52a51ebdddee72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 11 Jul 2024 22:18:47 +0200
Subject: [PATCH 2598/2811] Link to the related class

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

diff --git a/packages/framework/src/Facades/Navigation.php b/packages/framework/src/Facades/Navigation.php
index 1f64d809f3c..2eb846b0613 100644
--- a/packages/framework/src/Facades/Navigation.php
+++ b/packages/framework/src/Facades/Navigation.php
@@ -16,7 +16,7 @@ class Navigation
     /**
      * Configuration helper method to define a new navigation item, with better IDE support.
      *
-     * The returned array will then be used by the framework to create a new NavigationItem instance.
+     * The returned array will then be used by the framework to create a new NavigationItem instance. {@see \Hyde\Framework\Features\Navigation\NavigationItem}
      *
      * @see https://hydephp.com/docs/2.x/navigation-api
      *

From 901b810ef1f0846b1cb4bc30780ba2a2f1d568c1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 10:42:54 +0200
Subject: [PATCH 2599/2811] Create Claude draft

---
 context.php                       | 330 ++++++++++++++++++++++++++
 docs/digging-deeper/navigation.md | 371 ++++++++----------------------
 2 files changed, 428 insertions(+), 273 deletions(-)
 create mode 100644 context.php

diff --git a/context.php b/context.php
new file mode 100644
index 00000000000..b338e14ca4d
--- /dev/null
+++ b/context.php
@@ -0,0 +1,330 @@
+
+    /*
+    |--------------------------------------------------------------------------
+    | Navigation Menu Configuration
+    |--------------------------------------------------------------------------
+    |
+    | If you are looking to customize the main navigation menu, this is the place!
+    |
+    | All these settings uses Route Keys to identify the page you want to configure.
+    | A route key is simply the URL path to the page, without the file extension.
+    | So `_site/posts/hello-world.html` has the route key 'posts/hello-world'.
+    |
+    */
+
+    // OLD
+    
+    'navigation' => [
+        // This configuration sets the priorities used to determine the order of the menu.
+        // The default values have been added below for reference and easy editing.
+        // The array key is the page's route key, the value is the priority.
+        // Lower values show up first in the menu. The default is 999.
+        'order' => [
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ],
+
+        // In case you want to customize the labels for the menu items, you can do so here.
+        // Simply add the route key as the array key, and the label as the value.
+        'labels' => [
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ],
+
+        // These are the route keys of pages that should not show up in the navigation menu.
+        'exclude' => [
+            '404',
+        ],
+
+        // Any extra links you want to add to the navigation menu can be added here.
+        // To get started quickly, you can uncomment the defaults here.
+        // See the documentation link above for more information.
+        'custom' => [
+            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
+        ],
+
+        // How should pages in subdirectories be displayed in the menu?
+        // You can choose between 'dropdown', 'flat', and 'hidden'.
+        'subdirectories' => 'hidden',
+    ],
+
+
+    // NEW (creates an array exactly like the one above, but with a more fluent API that supports better autocomplete)
+
+    'navigation' => Navigation::configure()
+        ->setPagePriorities([
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ])
+        ->setPageLabels([
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ])
+        ->excludePages([
+            '404',
+        ])
+        ->addNavigationItems([
+            // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
+        ])
+        ->setSubdirectoryDisplayMode('hidden'),
+
+    // All of these options work in the yaml config (this is just an example, please use the same example data as above in the docs)
+    hyde:
+        navigation:
+            custom:
+                - destination: 'https://example.com'
+                label: 'Example'
+                priority: 100
+                attributes:
+                    class: 'example'
+                - destination: 'about'
+                label: 'About Us'
+                priority: 200
+                attributes:
+                    class: 'about'
+                    id: 'about'
+                - destination: 'contact'
+                label: 'Contact'
+                priority: 300
+                attributes:
+                    target: '_blank'
+                    rel: 'noopener noreferrer'
+                    foo: 'bar'
+
+
+// relevant code snippets
+
+<?php
+
+/**
+ * General facade for navigation features.
+ */
+class Navigation
+{
+    /**
+     * Configuration helper method to define a new navigation item, with better IDE support.
+     *
+     * The returned array will then be used by the framework to create a new NavigationItem instance. {@see \Hyde\Framework\Features\Navigation\NavigationItem}
+     *
+     * @see https://hydephp.com/docs/2.x/navigation-api
+     *
+     * @param  string<\Hyde\Support\Models\RouteKey>|string  $destination  Route key, or an external URI.
+     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
+     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
+     * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
+     * @return array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}
+     */
+    public static function item(string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): array
+    {
+        return compact('destination', 'label', 'priority', 'attributes');
+    }
+
+    /**
+     * Configuration helper method to define the navigation menu configuration with better IDE support.
+     *
+     * The builder is an array object that will be used by the framework to set the navigation menu configuration.
+     *
+     * @experimental This method is experimental and may change or be removed before the final release.
+     */
+    public static function configure(): NavigationMenuConfigurationBuilder
+    {
+        return new NavigationMenuConfigurationBuilder();
+    }
+}
+
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Navigation;
+
+use TypeError;
+use ArrayObject;
+use Illuminate\Contracts\Support\Arrayable;
+
+/**
+ * Configuration helper class to define the navigation menu configuration with better IDE support.
+ *
+ * The configured data will then be used by the framework to set the navigation menu configuration.
+ *
+ * @see \Hyde\Facades\Navigation::configure()
+ *
+ * @experimental This class is experimental and may change or be removed before the final release.
+ */
+class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
+{
+    /**
+     * Set the order of the navigation items.
+     *
+     * Either define a map of route keys to priorities, or just a list of route keys and we'll try to match that order.
+     *
+     * @param  array<string, int>|array<string>  $order
+     * @return $this
+     */
+    public function setPagePriorities(array $order): static
+    {
+        $this['order'] = $order;
+
+        return $this;
+    }
+
+    /**
+     * Set the labels for the navigation items.
+     *
+     * Each key should be a route key, and the value should be the label to display.
+     *
+     * @param  array<string, string>  $labels
+     * @return $this
+     */
+    public function setPageLabels(array $labels): static
+    {
+        $this['labels'] = $labels;
+
+        return $this;
+    }
+
+    /**
+     * Exclude certain items from the navigation.
+     *
+     * Each item should be a route key for the page to exclude.
+     *
+     * @param  array<string>  $exclude
+     * @return $this
+     */
+    public function excludePages(array $exclude): static
+    {
+        $this['exclude'] = $exclude;
+
+        return $this;
+    }
+
+    /**
+     * Add custom items to the navigation.
+     *
+     * @example `[Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200, ['target' => '_blank'])]`
+     *
+     * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
+     * @return $this
+     */
+    public function addNavigationItems(array $custom): static
+    {
+        $this['custom'] = $custom;
+
+        return $this;
+    }
+
+    /**
+     * Set the display mode for pages in subdirectories.
+     *
+     * You can choose between 'dropdown', 'flat', and 'hidden'. The default is 'hidden'.
+     *
+     * @param  'dropdown'|'flat'|'hidden'  $displayMode
+     * @return $this
+     */
+    public function setSubdirectoryDisplayMode(string $displayMode): static
+    {
+        self::assertType(['dropdown', 'flat', 'hidden'], $displayMode);
+
+        $this['subdirectory_display'] = $displayMode;
+
+        return $this;
+    }
+
+    /**
+     * Hide pages in subdirectories from the navigation.
+     *
+     * @experimental This method is experimental and may change or be removed before the final release.
+     *
+     * @return $this
+     */
+    public function hideSubdirectoriesFromNavigation(): static
+    {
+        return $this->setSubdirectoryDisplayMode('hidden');
+    }
+
+    /**
+     * Get the instance as an array.
+     *
+     * @return array{order: array<string, int>, labels: array<string, string>, exclude: array<string>, custom: array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>, subdirectory_display: string}
+     */
+    public function toArray(): array
+    {
+        return $this->getArrayCopy();
+    }
+
+    /** @experimental May be moved to a separate helper class in the future. */
+    protected static function assertType(array $types, string $value): void
+    {
+        if (! in_array($value, $types)) {
+            throw new TypeError('Value must be one of: '.implode(', ', $types));
+        }
+    }
+}
+
+
+// The docs config has not been updated to use the builder api
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sidebar Settings
+    |--------------------------------------------------------------------------
+    |
+    | The Hyde Documentation Module comes with a fancy Sidebar that is
+    | automatically populated with links to your documentation pages.
+    | Here, you can configure its behavior, content, look and feel.
+    |
+    */
+
+    'sidebar' => [
+        // The title in the sidebar header
+        'header' => env('SITE_NAME', 'HydePHP').' Docs',
+
+        // When using a grouped sidebar, should the groups be collapsible?
+        'collapsible' => true,
+
+        // A string of Markdown to show in the footer. Set to `false` to disable.
+        'footer' => '[Back to home page](../)',
+
+        /*
+        |--------------------------------------------------------------------------
+        | Sidebar Page Order
+        |--------------------------------------------------------------------------
+        |
+        | In the generated Documentation pages the navigation links in the sidebar
+        | default to sort alphabetically. You can reorder the page identifiers
+        | in the list below, and the links will get sorted in that order.
+        |
+        | The items will get a priority of 500 plus the order its found in the list.
+        | Pages without a priority will fall back to the default priority of 999.
+        |
+        | You can also set explicit priorities in front matter or by specifying
+        | a value to the array key in the list to override the inferred value.
+        |
+        */
+
+        'order' => [
+            'readme',
+            'installation',
+            'getting-started',
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Table of Contents Settings
+        |--------------------------------------------------------------------------
+        |
+        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
+        | has a Table of Contents included. Here, you can configure its behavior,
+        | content, look and feel. You can also disable the feature completely.
+        |
+        */
+
+        'table_of_contents' => [
+            'enabled' => true,
+            'min_heading_level' => 2,
+            'max_heading_level' => 4,
+        ],
+
+    ],
\ No newline at end of file
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1f037908a70..36482372801 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -37,331 +37,156 @@ Here's an overview of what you can customize in your navigation menus:
 - Item visibility: Choose to hide or show pages in the menu
 - Item grouping: Group pages together in dropdowns or sidebar categories
 
-### Customization Methods
+## Configuration Methods
 
 Hyde provides multiple ways to customize navigation menus to suit your needs:
 
 1. Front matter data in Markdown and Blade page files, applicable to all menu types
-2. Configuration in the `hyde` config file for main navigation items
-3. Configuration in the `docs` config file for documentation sidebar items
+2. Configuration in the `hyde.php` or `hyde.yml` config file for main navigation items
+3. Configuration in the `docs.php` config file for documentation sidebar items
 
-Keep in mind that front matter data overrides dynamically inferred or config-defined priorities. While useful for quick one-off changes on small sites, it can make reordering items later on more challenging as you can't see the entire structure at once.
+The new builder pattern in the configuration allows for a more fluent and IDE-friendly way to customize navigation. However, the old array-based method still works, as the navigation builder is an `ArrayObject` and can be used as an array.
 
-Additionally, general options for the entire navigation menus are also available in the `hyde` and `docs` config files.
+### Using the Navigation Builder
 
-## Front Matter Configuration
-
-Front matter options allow per-page customization of navigation menus. Here's a quick reference of available options:
-
-```yaml
-navigation:
-    label: string  # The displayed text in the navigation item link
-    priority: int  # The page's priority for ordering (lower means higher up/first)
-    hidden: bool   # Whether the page should be hidden from the navigation menu
-    group: string  # Set main menu dropdown or sidebar group key
-```
-
-You only need to specify the keys you want to customize.
-
-### `label`
-
-Customizes the text appearing in the navigation menu link for the page. If not set anywhere else, Hyde will search for a title in the page content or generate one from the filename.
-
-```yaml
-navigation:
-    label: "My Custom Label"
-```
-
-### `priority`
-
-Controls the order in which the page appears in the navigation menu.
-
-```yaml
-navigation:
-    priority: 10
-```
-
-### `hidden`
-
-Determines if the page appears in the navigation menu.
-
-```yaml
-navigation:
-    hidden: true
-```
-
-**Tip:** You can also use `visible: false` to achieve the same effect.
-
-### `group`
-
-For the primary navigation menu, this groups pages together in dropdowns. For the sidebar, it groups pages under a common heading.
-
-```yaml
-navigation:
-    group: "My Group"
-```
-
-**Note:** Sidebar group keys are normalized, so `My Group` and `my-group` are equivalent.
-
-## Config File Configuration
-
-Let's explore how to customize navigation menus using configuration files:
-
-- For the main navigation menu, use `navigation` setting in the `hyde.php` config file.
-- For the sidebar, use `sidebar` setting in the `docs.php` config file.
-
-When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
-
-### Changing Priorities
-
-The `navigation.order` and `sidebar.order` settings allow you to customize the order of pages in the navigation menus.
-
-#### Basic Priority Syntax
-
-A nice and simple way to define the order of pages, is to add their route keys as a simple list array. We'll then match that array order.
-
-It may be useful to know that we internally will assign a priority calculated according to its position in the list, plus an offset of `500`. The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
+To use the new builder pattern, you can configure your navigation in the `hyde.php` file like this:
 
 ```php
-// filepath: config/hyde.php
-'navigation' => [
-    'order' => [
-        'home', // Priority: 500
-        'about', // Priority: 501
-        'contact', // Priority: 502
-    ]
-]
-```
+use Hyde\Facades\Navigation;
 
-```php
-// filepath: config/docs.php
-'sidebar' => [
-    'order' => [
-        'readme', // Priority: 500
-        'installation', // Priority: 501
-        'getting-started', // Priority: 502
-    ]
-]
-```
+return [
+    // ...
+
+    'navigation' => Navigation::configure()
+        ->setPagePriorities([
+            'index' => 0,
+            'posts' => 10,
+            'docs/index' => 100,
+        ])
+        ->setPageLabels([
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ])
+        ->excludePages([
+            '404',
+        ])
+        ->addNavigationItems([
+            Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
+        ])
+        ->setSubdirectoryDisplayMode('hidden'),
+];
+```
+
+### Using YAML Configuration
+
+You can also set the navigation configuration in the `hyde.yml` file. The structure remains the same as the array-based method:
 
-#### Explicit Priority Syntax
+```yaml
+hyde:
+  navigation:
+    order:
+      index: 0
+      posts: 10
+      docs/index: 100
+    labels:
+      index: Home
+      docs/index: Docs
+    exclude:
+      - 404
+    custom:
+      - destination: 'https://github.com/hydephp/hyde'
+        label: 'GitHub'
+        priority: 200
+    subdirectory_display: hidden
+```
+
+## Customization Options
 
-You can also specify explicit priorities by adding a value to the array keys. We'll then use these exact values as the priorities.
+Here's an overview of what you can customize in your navigation menus:
 
-```php
-// filepath: config/hyde.php
-'navigation' => [
-    'order' => [
-        'home' => 10,
-        'about' => 15,
-        'contact' => 20,
-    ]
-]
-```
+- Item labels: The text displayed in menu links
+- Item priorities: Control the order of link appearance
+- Item visibility: Choose to hide or show pages in the menu
+- Item grouping: Group pages together in dropdowns or sidebar categories
 
-```php
-// filepath: config/docs.php
-'sidebar' => [
-    'order' => [
-        'readme' => 10,
-        'installation' => 15,
-        'getting-started' => 20,
-    ]
-]
-```
+### Setting Page Priorities
 
-You could also combine these methods if desired:
+Use the `setPagePriorities` method to define the order of pages in the navigation menu:
 
 ```php
-// filepath: Applicable to both
-[
-    'readme' => 10, // Priority: 10
-    'installation', // Priority: 500
-    'getting-started', // Priority: 501
-]
+->setPagePriorities([
+    'index' => 0,
+    'posts' => 10,
+    'docs/index' => 100,
+])
 ```
 
 ### Changing Menu Item Labels
 
-Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
-
-If you're not happy with these, it's easy to override navigation link labels by mapping the route key to the desired title in the Hyde config:
+Override navigation link labels using the `setPageLabels` method:
 
 ```php
-// filepath: config/hyde.php
-'navigation' => [
-    'labels' => [
-        'index' => 'Start',
-        'docs/index' => 'Documentation',
-    ]
-]
+->setPageLabels([
+    'index' => 'Home',
+    'docs/index' => 'Documentation',
+])
 ```
 
-**Note:** This feature is not yet supported for the sidebar.
-
-### Excluding Items (Blacklist)
+### Excluding Items
 
-When you have a lot of pages, it may be useful to prevent links from being added to the main navigation menu.
-
-To exclude items from being added, simply add the page's route key to the navigation blacklist in the Hyde config:
+Prevent links from being added to the main navigation menu using the `excludePages` method:
 
 ```php
-// filepath: config/hyde.php
-'navigation' => [
-    'exclude' => [
-        '404'
-    ]
-]
+->excludePages([
+    '404',
+])
 ```
 
 ### Adding Custom Navigation Menu Links
 
-You can easily add custom navigation menu links in the Hyde config:
+Add custom navigation menu links using the `addNavigationItems` method:
 
 ```php
-// filepath: config/hyde.php
-use Hyde\Facades\Navigation;
-
-'navigation' => [
-    'custom' => [
-        Navigation::item(
-            destination: 'https://github.com/hydephp/hyde', // Required
-            label: 'GitHub', // Optional, defaults to the destination value
-            priority: 200 // Optional, defaults to 500
-        ),
-    ]
-]
+->addNavigationItems([
+    Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
+])
 ```
 
-**Tip:** While named arguments are used in the example for clarity, they are not required.
-
-
 ### Configure Subdirectory Display
 
-You can configure how subdirectories should be displayed in the menu:
+Set how subdirectories should be displayed in the menu using the `setSubdirectoryDisplayMode` method:
 
 ```php
-// filepath: config/hyde.php
-'navigation' => [
-    'subdirectory_display' => 'dropdown'
-]
+->setSubdirectoryDisplayMode('dropdown')
 ```
 
-**Supported Options:**
-- `dropdown`: Pages in subdirectories are displayed in a dropdown menu
-- `hidden`: Pages in subdirectories are not displayed at all the menus
-- `flat`: Pages in subdirectories are displayed as individual items
-
-### Automatic Menu Groups
+Supported options are 'dropdown', 'hidden', and 'flat'.
 
-A handy feature HydePHP has is that it can automatically place pages in dropdowns based on subdirectory structures.
-
-#### Automatic Navigation Menu Dropdowns
+## Front Matter Configuration
 
-Enable this feature in the `hyde.php` config file by setting the `subdirectory_display` key to `dropdown`.
+Front matter options allow per-page customization of navigation menus. These options remain unchanged:
 
-```php
-// filepath: config/hyde.php
-'navigation' => [
-    'subdirectory_display' => 'dropdown',
-],
+```yaml
+navigation:
+  label: string  # The displayed text in the navigation item link
+  priority: int  # The page's priority for ordering (lower means higher up/first)
+  hidden: bool   # Whether the page should be hidden from the navigation menu
+  group: string  # Set main menu dropdown or sidebar group key
 ```
 
-Now if you create a page called `_pages/about/contact.md` it will automatically be placed in a dropdown called "About".
-
-#### Automatic Documentation Sidebar Grouping
-
-This feature is always enabled for documentation pages. Simply place your pages in subdirectories to have them grouped in the sidebar.
-
-For example: `_docs/getting-started/installation.md` will be placed in a group called "Getting Started".
-
->info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
-
-#### Dropdown Menu Notes
-
-- Dropdowns take priority over standard items. If you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
-- Example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost, so please keep this in mind when using this feature.
-
 ## Numerical Prefix Navigation Ordering
 
-HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
+The numerical prefix navigation ordering feature remains unchanged. You can still use numerical prefixes in filenames to control the order of navigation items.
 
-This has the great benefit of matching the navigation menu layout with the file structure view, and works especially great with subdirectory-based navigation grouping.
-
-```shell
-_pages/
-  01-home.md     # Priority: 1 (saved to _site/index.html)
-  02-about.md    # Priority: 2 (saved to _site/about.html)
-  03-contact.md  # Priority: 3 (saved to _site/contact.html)
-```
-
-As you can seem Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
-
-### Important Notes
-
-1. The numerical prefix remains part of the page identifier but is stripped from the route key.
-   For example: `_pages/01-home.md` has route key `home` and page identifier `01-home`.
-2. You can delimit the numerical prefix with either a dash or an underscore.
-   For example: Both `_pages/01-home.md` and `_pages/01_home.md` are valid.
-3. Leading zeros are optional. `_pages/1-home.md` is equally valid.
-
-### Using Numerical Prefix Ordering in Subdirectories
-
-This feature integrates well with automatic subdirectory-based navigation grouping. Here are two useful tips:
-
-1. You can use numerical prefixes in subdirectories to control the dropdown/sidebar order.
-2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
-
-Here is an example structure of how could organize a documentation site:
-
-```shell
-_docs/
-  01-getting-started/
-    01-installation.md
-    02-requirements.md
-    03-configuration.md
-  02-usage/
-    01-quick-start.md
-    02-advanced-usage.md
-  03-features/
-    01-feature-1.md
-    02-feature-2.md
-```
-
-### Customization
-
-If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
+To disable this feature, you can use the following configuration:
 
 ```php
-// filepath: config/hyde.php
-'numerical_page_ordering' => false,
+return [
+    // ...
+    'numerical_page_ordering' => false,
+];
 ```
 
-## Digging Deeper into the Internals
-
-While not essential, understanding the internal workings of the navigation system can be as beneficial as it's interesting. Here's a quick high-level overview of the [Navigation API](navigation-api).
-
-### Navigation Menu Classes
-
-The main navigation menu uses the `MainNavigationMenu` class, while the documentation sidebar uses the `DocumentationSidebar` class. Both extend the base `NavigationMenu` class:
-
-```php
-use Hyde\Framework\Features\Navigation\MainNavigationMenu;
-use Hyde\Framework\Features\Navigation\DocumentationSidebar;
-use Hyde\Framework\Features\Navigation\NavigationMenu;
-```
-
-The base `NavigationMenu` class contains the main logic for menu generation, while child implementations contain extra logic for specific use cases.
-
-All navigation menus store items in their `$items` collection, containing instances of the `NavigationItem` class. Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain additional `NavigationItem` instances:
-
-```php
-use Hyde\Framework\Features\Navigation\NavigationItem;
-use Hyde\Framework\Features\Navigation\NavigationGroup;
-```
-
-## The Navigation API
-
-For advanced users and package developers, Hyde offers a Navigation API for programmatic interaction with site navigation. This API consists of a set of PHP classes allowing fluent interaction with navigation menus.
+## Conclusion
 
-For more detailed information about the API, refer to the [Navigation API](navigation-api) documentation.
+The new builder pattern provides a more fluent and IDE-friendly way to configure navigation in HydePHP. However, the old array-based method and YAML configuration are still supported, giving you flexibility in how you choose to customize your site's navigation.
\ No newline at end of file

From d51c4af5e4cc2810b9616769c1d4178f81ce6f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 12:54:18 +0200
Subject: [PATCH 2600/2811] Revert "Create Claude draft"

This reverts commit 901b810ef1f0846b1cb4bc30780ba2a2f1d568c1.
---
 context.php                       | 330 --------------------------
 docs/digging-deeper/navigation.md | 371 ++++++++++++++++++++++--------
 2 files changed, 273 insertions(+), 428 deletions(-)
 delete mode 100644 context.php

diff --git a/context.php b/context.php
deleted file mode 100644
index b338e14ca4d..00000000000
--- a/context.php
+++ /dev/null
@@ -1,330 +0,0 @@
-
-    /*
-    |--------------------------------------------------------------------------
-    | Navigation Menu Configuration
-    |--------------------------------------------------------------------------
-    |
-    | If you are looking to customize the main navigation menu, this is the place!
-    |
-    | All these settings uses Route Keys to identify the page you want to configure.
-    | A route key is simply the URL path to the page, without the file extension.
-    | So `_site/posts/hello-world.html` has the route key 'posts/hello-world'.
-    |
-    */
-
-    // OLD
-    
-    'navigation' => [
-        // This configuration sets the priorities used to determine the order of the menu.
-        // The default values have been added below for reference and easy editing.
-        // The array key is the page's route key, the value is the priority.
-        // Lower values show up first in the menu. The default is 999.
-        'order' => [
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ],
-
-        // In case you want to customize the labels for the menu items, you can do so here.
-        // Simply add the route key as the array key, and the label as the value.
-        'labels' => [
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ],
-
-        // These are the route keys of pages that should not show up in the navigation menu.
-        'exclude' => [
-            '404',
-        ],
-
-        // Any extra links you want to add to the navigation menu can be added here.
-        // To get started quickly, you can uncomment the defaults here.
-        // See the documentation link above for more information.
-        'custom' => [
-            // NavigationItem::create('https://github.com/hydephp/hyde', 'GitHub', 200),
-        ],
-
-        // How should pages in subdirectories be displayed in the menu?
-        // You can choose between 'dropdown', 'flat', and 'hidden'.
-        'subdirectories' => 'hidden',
-    ],
-
-
-    // NEW (creates an array exactly like the one above, but with a more fluent API that supports better autocomplete)
-
-    'navigation' => Navigation::configure()
-        ->setPagePriorities([
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ])
-        ->setPageLabels([
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ])
-        ->excludePages([
-            '404',
-        ])
-        ->addNavigationItems([
-            // Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
-        ])
-        ->setSubdirectoryDisplayMode('hidden'),
-
-    // All of these options work in the yaml config (this is just an example, please use the same example data as above in the docs)
-    hyde:
-        navigation:
-            custom:
-                - destination: 'https://example.com'
-                label: 'Example'
-                priority: 100
-                attributes:
-                    class: 'example'
-                - destination: 'about'
-                label: 'About Us'
-                priority: 200
-                attributes:
-                    class: 'about'
-                    id: 'about'
-                - destination: 'contact'
-                label: 'Contact'
-                priority: 300
-                attributes:
-                    target: '_blank'
-                    rel: 'noopener noreferrer'
-                    foo: 'bar'
-
-
-// relevant code snippets
-
-<?php
-
-/**
- * General facade for navigation features.
- */
-class Navigation
-{
-    /**
-     * Configuration helper method to define a new navigation item, with better IDE support.
-     *
-     * The returned array will then be used by the framework to create a new NavigationItem instance. {@see \Hyde\Framework\Features\Navigation\NavigationItem}
-     *
-     * @see https://hydephp.com/docs/2.x/navigation-api
-     *
-     * @param  string<\Hyde\Support\Models\RouteKey>|string  $destination  Route key, or an external URI.
-     * @param  string|null  $label  If not provided, Hyde will try to get it from the route's connected page, or from the URL.
-     * @param  int|null  $priority  If not provided, Hyde will try to get it from the route or the default priority of 500.
-     * @param  array<string, scalar>  $attributes  Additional attributes for the navigation item.
-     * @return array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}
-     */
-    public static function item(string $destination, ?string $label = null, ?int $priority = null, array $attributes = []): array
-    {
-        return compact('destination', 'label', 'priority', 'attributes');
-    }
-
-    /**
-     * Configuration helper method to define the navigation menu configuration with better IDE support.
-     *
-     * The builder is an array object that will be used by the framework to set the navigation menu configuration.
-     *
-     * @experimental This method is experimental and may change or be removed before the final release.
-     */
-    public static function configure(): NavigationMenuConfigurationBuilder
-    {
-        return new NavigationMenuConfigurationBuilder();
-    }
-}
-
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Navigation;
-
-use TypeError;
-use ArrayObject;
-use Illuminate\Contracts\Support\Arrayable;
-
-/**
- * Configuration helper class to define the navigation menu configuration with better IDE support.
- *
- * The configured data will then be used by the framework to set the navigation menu configuration.
- *
- * @see \Hyde\Facades\Navigation::configure()
- *
- * @experimental This class is experimental and may change or be removed before the final release.
- */
-class NavigationMenuConfigurationBuilder extends ArrayObject implements Arrayable
-{
-    /**
-     * Set the order of the navigation items.
-     *
-     * Either define a map of route keys to priorities, or just a list of route keys and we'll try to match that order.
-     *
-     * @param  array<string, int>|array<string>  $order
-     * @return $this
-     */
-    public function setPagePriorities(array $order): static
-    {
-        $this['order'] = $order;
-
-        return $this;
-    }
-
-    /**
-     * Set the labels for the navigation items.
-     *
-     * Each key should be a route key, and the value should be the label to display.
-     *
-     * @param  array<string, string>  $labels
-     * @return $this
-     */
-    public function setPageLabels(array $labels): static
-    {
-        $this['labels'] = $labels;
-
-        return $this;
-    }
-
-    /**
-     * Exclude certain items from the navigation.
-     *
-     * Each item should be a route key for the page to exclude.
-     *
-     * @param  array<string>  $exclude
-     * @return $this
-     */
-    public function excludePages(array $exclude): static
-    {
-        $this['exclude'] = $exclude;
-
-        return $this;
-    }
-
-    /**
-     * Add custom items to the navigation.
-     *
-     * @example `[Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200, ['target' => '_blank'])]`
-     *
-     * @param  array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>  $custom
-     * @return $this
-     */
-    public function addNavigationItems(array $custom): static
-    {
-        $this['custom'] = $custom;
-
-        return $this;
-    }
-
-    /**
-     * Set the display mode for pages in subdirectories.
-     *
-     * You can choose between 'dropdown', 'flat', and 'hidden'. The default is 'hidden'.
-     *
-     * @param  'dropdown'|'flat'|'hidden'  $displayMode
-     * @return $this
-     */
-    public function setSubdirectoryDisplayMode(string $displayMode): static
-    {
-        self::assertType(['dropdown', 'flat', 'hidden'], $displayMode);
-
-        $this['subdirectory_display'] = $displayMode;
-
-        return $this;
-    }
-
-    /**
-     * Hide pages in subdirectories from the navigation.
-     *
-     * @experimental This method is experimental and may change or be removed before the final release.
-     *
-     * @return $this
-     */
-    public function hideSubdirectoriesFromNavigation(): static
-    {
-        return $this->setSubdirectoryDisplayMode('hidden');
-    }
-
-    /**
-     * Get the instance as an array.
-     *
-     * @return array{order: array<string, int>, labels: array<string, string>, exclude: array<string>, custom: array<array{destination: string, label: ?string, priority: ?int, attributes: array<string, scalar>}>, subdirectory_display: string}
-     */
-    public function toArray(): array
-    {
-        return $this->getArrayCopy();
-    }
-
-    /** @experimental May be moved to a separate helper class in the future. */
-    protected static function assertType(array $types, string $value): void
-    {
-        if (! in_array($value, $types)) {
-            throw new TypeError('Value must be one of: '.implode(', ', $types));
-        }
-    }
-}
-
-
-// The docs config has not been updated to use the builder api
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sidebar Settings
-    |--------------------------------------------------------------------------
-    |
-    | The Hyde Documentation Module comes with a fancy Sidebar that is
-    | automatically populated with links to your documentation pages.
-    | Here, you can configure its behavior, content, look and feel.
-    |
-    */
-
-    'sidebar' => [
-        // The title in the sidebar header
-        'header' => env('SITE_NAME', 'HydePHP').' Docs',
-
-        // When using a grouped sidebar, should the groups be collapsible?
-        'collapsible' => true,
-
-        // A string of Markdown to show in the footer. Set to `false` to disable.
-        'footer' => '[Back to home page](../)',
-
-        /*
-        |--------------------------------------------------------------------------
-        | Sidebar Page Order
-        |--------------------------------------------------------------------------
-        |
-        | In the generated Documentation pages the navigation links in the sidebar
-        | default to sort alphabetically. You can reorder the page identifiers
-        | in the list below, and the links will get sorted in that order.
-        |
-        | The items will get a priority of 500 plus the order its found in the list.
-        | Pages without a priority will fall back to the default priority of 999.
-        |
-        | You can also set explicit priorities in front matter or by specifying
-        | a value to the array key in the list to override the inferred value.
-        |
-        */
-
-        'order' => [
-            'readme',
-            'installation',
-            'getting-started',
-        ],
-
-        /*
-        |--------------------------------------------------------------------------
-        | Table of Contents Settings
-        |--------------------------------------------------------------------------
-        |
-        | The Hyde Documentation Module comes with a fancy Sidebar that, by default,
-        | has a Table of Contents included. Here, you can configure its behavior,
-        | content, look and feel. You can also disable the feature completely.
-        |
-        */
-
-        'table_of_contents' => [
-            'enabled' => true,
-            'min_heading_level' => 2,
-            'max_heading_level' => 4,
-        ],
-
-    ],
\ No newline at end of file
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 36482372801..1f037908a70 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -37,156 +37,331 @@ Here's an overview of what you can customize in your navigation menus:
 - Item visibility: Choose to hide or show pages in the menu
 - Item grouping: Group pages together in dropdowns or sidebar categories
 
-## Configuration Methods
+### Customization Methods
 
 Hyde provides multiple ways to customize navigation menus to suit your needs:
 
 1. Front matter data in Markdown and Blade page files, applicable to all menu types
-2. Configuration in the `hyde.php` or `hyde.yml` config file for main navigation items
-3. Configuration in the `docs.php` config file for documentation sidebar items
+2. Configuration in the `hyde` config file for main navigation items
+3. Configuration in the `docs` config file for documentation sidebar items
 
-The new builder pattern in the configuration allows for a more fluent and IDE-friendly way to customize navigation. However, the old array-based method still works, as the navigation builder is an `ArrayObject` and can be used as an array.
+Keep in mind that front matter data overrides dynamically inferred or config-defined priorities. While useful for quick one-off changes on small sites, it can make reordering items later on more challenging as you can't see the entire structure at once.
 
-### Using the Navigation Builder
+Additionally, general options for the entire navigation menus are also available in the `hyde` and `docs` config files.
 
-To use the new builder pattern, you can configure your navigation in the `hyde.php` file like this:
+## Front Matter Configuration
 
-```php
-use Hyde\Facades\Navigation;
+Front matter options allow per-page customization of navigation menus. Here's a quick reference of available options:
+
+```yaml
+navigation:
+    label: string  # The displayed text in the navigation item link
+    priority: int  # The page's priority for ordering (lower means higher up/first)
+    hidden: bool   # Whether the page should be hidden from the navigation menu
+    group: string  # Set main menu dropdown or sidebar group key
+```
 
-return [
-    // ...
-
-    'navigation' => Navigation::configure()
-        ->setPagePriorities([
-            'index' => 0,
-            'posts' => 10,
-            'docs/index' => 100,
-        ])
-        ->setPageLabels([
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ])
-        ->excludePages([
-            '404',
-        ])
-        ->addNavigationItems([
-            Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
-        ])
-        ->setSubdirectoryDisplayMode('hidden'),
-];
-```
-
-### Using YAML Configuration
-
-You can also set the navigation configuration in the `hyde.yml` file. The structure remains the same as the array-based method:
+You only need to specify the keys you want to customize.
+
+### `label`
+
+Customizes the text appearing in the navigation menu link for the page. If not set anywhere else, Hyde will search for a title in the page content or generate one from the filename.
 
 ```yaml
-hyde:
-  navigation:
-    order:
-      index: 0
-      posts: 10
-      docs/index: 100
-    labels:
-      index: Home
-      docs/index: Docs
-    exclude:
-      - 404
-    custom:
-      - destination: 'https://github.com/hydephp/hyde'
-        label: 'GitHub'
-        priority: 200
-    subdirectory_display: hidden
-```
-
-## Customization Options
+navigation:
+    label: "My Custom Label"
+```
 
-Here's an overview of what you can customize in your navigation menus:
+### `priority`
 
-- Item labels: The text displayed in menu links
-- Item priorities: Control the order of link appearance
-- Item visibility: Choose to hide or show pages in the menu
-- Item grouping: Group pages together in dropdowns or sidebar categories
+Controls the order in which the page appears in the navigation menu.
+
+```yaml
+navigation:
+    priority: 10
+```
+
+### `hidden`
+
+Determines if the page appears in the navigation menu.
+
+```yaml
+navigation:
+    hidden: true
+```
+
+**Tip:** You can also use `visible: false` to achieve the same effect.
+
+### `group`
+
+For the primary navigation menu, this groups pages together in dropdowns. For the sidebar, it groups pages under a common heading.
+
+```yaml
+navigation:
+    group: "My Group"
+```
+
+**Note:** Sidebar group keys are normalized, so `My Group` and `my-group` are equivalent.
+
+## Config File Configuration
+
+Let's explore how to customize navigation menus using configuration files:
+
+- For the main navigation menu, use `navigation` setting in the `hyde.php` config file.
+- For the sidebar, use `sidebar` setting in the `docs.php` config file.
+
+When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
+
+### Changing Priorities
+
+The `navigation.order` and `sidebar.order` settings allow you to customize the order of pages in the navigation menus.
+
+#### Basic Priority Syntax
+
+A nice and simple way to define the order of pages, is to add their route keys as a simple list array. We'll then match that array order.
+
+It may be useful to know that we internally will assign a priority calculated according to its position in the list, plus an offset of `500`. The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
+
+```php
+// filepath: config/hyde.php
+'navigation' => [
+    'order' => [
+        'home', // Priority: 500
+        'about', // Priority: 501
+        'contact', // Priority: 502
+    ]
+]
+```
+
+```php
+// filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme', // Priority: 500
+        'installation', // Priority: 501
+        'getting-started', // Priority: 502
+    ]
+]
+```
+
+#### Explicit Priority Syntax
+
+You can also specify explicit priorities by adding a value to the array keys. We'll then use these exact values as the priorities.
 
-### Setting Page Priorities
+```php
+// filepath: config/hyde.php
+'navigation' => [
+    'order' => [
+        'home' => 10,
+        'about' => 15,
+        'contact' => 20,
+    ]
+]
+```
 
-Use the `setPagePriorities` method to define the order of pages in the navigation menu:
+```php
+// filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme' => 10,
+        'installation' => 15,
+        'getting-started' => 20,
+    ]
+]
+```
+
+You could also combine these methods if desired:
 
 ```php
-->setPagePriorities([
-    'index' => 0,
-    'posts' => 10,
-    'docs/index' => 100,
-])
+// filepath: Applicable to both
+[
+    'readme' => 10, // Priority: 10
+    'installation', // Priority: 500
+    'getting-started', // Priority: 501
+]
 ```
 
 ### Changing Menu Item Labels
 
-Override navigation link labels using the `setPageLabels` method:
+Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
+
+If you're not happy with these, it's easy to override navigation link labels by mapping the route key to the desired title in the Hyde config:
 
 ```php
-->setPageLabels([
-    'index' => 'Home',
-    'docs/index' => 'Documentation',
-])
+// filepath: config/hyde.php
+'navigation' => [
+    'labels' => [
+        'index' => 'Start',
+        'docs/index' => 'Documentation',
+    ]
+]
 ```
 
-### Excluding Items
+**Note:** This feature is not yet supported for the sidebar.
+
+### Excluding Items (Blacklist)
 
-Prevent links from being added to the main navigation menu using the `excludePages` method:
+When you have a lot of pages, it may be useful to prevent links from being added to the main navigation menu.
+
+To exclude items from being added, simply add the page's route key to the navigation blacklist in the Hyde config:
 
 ```php
-->excludePages([
-    '404',
-])
+// filepath: config/hyde.php
+'navigation' => [
+    'exclude' => [
+        '404'
+    ]
+]
 ```
 
 ### Adding Custom Navigation Menu Links
 
-Add custom navigation menu links using the `addNavigationItems` method:
+You can easily add custom navigation menu links in the Hyde config:
 
 ```php
-->addNavigationItems([
-    Navigation::item('https://github.com/hydephp/hyde', 'GitHub', 200),
-])
+// filepath: config/hyde.php
+use Hyde\Facades\Navigation;
+
+'navigation' => [
+    'custom' => [
+        Navigation::item(
+            destination: 'https://github.com/hydephp/hyde', // Required
+            label: 'GitHub', // Optional, defaults to the destination value
+            priority: 200 // Optional, defaults to 500
+        ),
+    ]
+]
 ```
 
+**Tip:** While named arguments are used in the example for clarity, they are not required.
+
+
 ### Configure Subdirectory Display
 
-Set how subdirectories should be displayed in the menu using the `setSubdirectoryDisplayMode` method:
+You can configure how subdirectories should be displayed in the menu:
 
 ```php
-->setSubdirectoryDisplayMode('dropdown')
+// filepath: config/hyde.php
+'navigation' => [
+    'subdirectory_display' => 'dropdown'
+]
 ```
 
-Supported options are 'dropdown', 'hidden', and 'flat'.
+**Supported Options:**
+- `dropdown`: Pages in subdirectories are displayed in a dropdown menu
+- `hidden`: Pages in subdirectories are not displayed at all the menus
+- `flat`: Pages in subdirectories are displayed as individual items
 
-## Front Matter Configuration
+### Automatic Menu Groups
 
-Front matter options allow per-page customization of navigation menus. These options remain unchanged:
+A handy feature HydePHP has is that it can automatically place pages in dropdowns based on subdirectory structures.
 
-```yaml
-navigation:
-  label: string  # The displayed text in the navigation item link
-  priority: int  # The page's priority for ordering (lower means higher up/first)
-  hidden: bool   # Whether the page should be hidden from the navigation menu
-  group: string  # Set main menu dropdown or sidebar group key
+#### Automatic Navigation Menu Dropdowns
+
+Enable this feature in the `hyde.php` config file by setting the `subdirectory_display` key to `dropdown`.
+
+```php
+// filepath: config/hyde.php
+'navigation' => [
+    'subdirectory_display' => 'dropdown',
+],
 ```
 
+Now if you create a page called `_pages/about/contact.md` it will automatically be placed in a dropdown called "About".
+
+#### Automatic Documentation Sidebar Grouping
+
+This feature is always enabled for documentation pages. Simply place your pages in subdirectories to have them grouped in the sidebar.
+
+For example: `_docs/getting-started/installation.md` will be placed in a group called "Getting Started".
+
+>info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
+
+#### Dropdown Menu Notes
+
+- Dropdowns take priority over standard items. If you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
+- Example: With this file structure: `_pages/foo.md`, `_pages/foo/bar.md`, `_pages/foo/baz.md`, the link to `foo` will be lost, so please keep this in mind when using this feature.
+
 ## Numerical Prefix Navigation Ordering
 
-The numerical prefix navigation ordering feature remains unchanged. You can still use numerical prefixes in filenames to control the order of navigation items.
+HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
 
-To disable this feature, you can use the following configuration:
+This has the great benefit of matching the navigation menu layout with the file structure view, and works especially great with subdirectory-based navigation grouping.
+
+```shell
+_pages/
+  01-home.md     # Priority: 1 (saved to _site/index.html)
+  02-about.md    # Priority: 2 (saved to _site/about.html)
+  03-contact.md  # Priority: 3 (saved to _site/contact.html)
+```
+
+As you can seem Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
+
+### Important Notes
+
+1. The numerical prefix remains part of the page identifier but is stripped from the route key.
+   For example: `_pages/01-home.md` has route key `home` and page identifier `01-home`.
+2. You can delimit the numerical prefix with either a dash or an underscore.
+   For example: Both `_pages/01-home.md` and `_pages/01_home.md` are valid.
+3. Leading zeros are optional. `_pages/1-home.md` is equally valid.
+
+### Using Numerical Prefix Ordering in Subdirectories
+
+This feature integrates well with automatic subdirectory-based navigation grouping. Here are two useful tips:
+
+1. You can use numerical prefixes in subdirectories to control the dropdown/sidebar order.
+2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
+
+Here is an example structure of how could organize a documentation site:
+
+```shell
+_docs/
+  01-getting-started/
+    01-installation.md
+    02-requirements.md
+    03-configuration.md
+  02-usage/
+    01-quick-start.md
+    02-advanced-usage.md
+  03-features/
+    01-feature-1.md
+    02-feature-2.md
+```
+
+### Customization
+
+If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
 
 ```php
-return [
-    // ...
-    'numerical_page_ordering' => false,
-];
+// filepath: config/hyde.php
+'numerical_page_ordering' => false,
 ```
 
-## Conclusion
+## Digging Deeper into the Internals
+
+While not essential, understanding the internal workings of the navigation system can be as beneficial as it's interesting. Here's a quick high-level overview of the [Navigation API](navigation-api).
+
+### Navigation Menu Classes
+
+The main navigation menu uses the `MainNavigationMenu` class, while the documentation sidebar uses the `DocumentationSidebar` class. Both extend the base `NavigationMenu` class:
+
+```php
+use Hyde\Framework\Features\Navigation\MainNavigationMenu;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+```
+
+The base `NavigationMenu` class contains the main logic for menu generation, while child implementations contain extra logic for specific use cases.
+
+All navigation menus store items in their `$items` collection, containing instances of the `NavigationItem` class. Dropdowns are represented by `NavigationGroup` instances, which extend the `NavigationMenu` class and contain additional `NavigationItem` instances:
+
+```php
+use Hyde\Framework\Features\Navigation\NavigationItem;
+use Hyde\Framework\Features\Navigation\NavigationGroup;
+```
+
+## The Navigation API
+
+For advanced users and package developers, Hyde offers a Navigation API for programmatic interaction with site navigation. This API consists of a set of PHP classes allowing fluent interaction with navigation menus.
 
-The new builder pattern provides a more fluent and IDE-friendly way to configure navigation in HydePHP. However, the old array-based method and YAML configuration are still supported, giving you flexibility in how you choose to customize your site's navigation.
\ No newline at end of file
+For more detailed information about the API, refer to the [Navigation API](navigation-api) documentation.

From 3f9f9f8cfff988e7a8980a5447efce7e9127cd36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:06:37 +0200
Subject: [PATCH 2601/2811] Remove hard line breaks from sections

---
 docs/creating-content/documentation-pages.md | 90 +++++++-------------
 1 file changed, 29 insertions(+), 61 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index aed6f445be6..689e8bebdcf 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -8,23 +8,17 @@ navigation:
 
 ## Introduction to Hyde Documentation Pages
 
-Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier.
-Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
+Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier. Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
 
-Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a
-responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order,
-labels, and even groups, of the sidebar items to suit your needs.
+Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and even groups, of the sidebar items to suit your needs.
 
-Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated
-"Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
+Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
 
-If you have a Torchlight API token in your .env file, Hyde will even enable syntax highlighting automatically,
-saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
+If you have a Torchlight API token in your .env file, Hyde will even enable syntax highlighting automatically, saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
 
 ### Best Practices and Hyde Expectations
 
-Since Hyde does a lot of things automatically, there are some things you may need
-to keep in mind when creating blog posts so that you don't get unexpected results.
+Since Hyde does a lot of things automatically, there are some things you may need to keep in mind when creating blog posts so that you don't get unexpected results.
 
 #### Filenames
 
@@ -78,13 +72,11 @@ navigation:
 
 ## Dynamic Content Generation
 
-Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title.
-If you are not happy with the results you can customize them in the config or with front matter.
+Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title. If you are not happy with the results you can customize them in the config or with front matter.
 
 ### Front Matter reference
 
-Before we look at how to override things, here is an overview of the relevant content Hyde generates,
-and where the data is from as well as where it can be overridden.
+Before we look at how to override things, here is an overview of the relevant content Hyde generates, and where the data is from as well as where it can be overridden.
 
 | Property                        | Description                                            | Dynamic Data Source                 | Override in          |
 |---------------------------------|--------------------------------------------------------|-------------------------------------|----------------------|
@@ -97,29 +89,26 @@ and where the data is from as well as where it can be overridden.
 
 ## Sidebar
 
-The sidebar is automatically generated from the files in the `_docs` directory. You will probably want to change the order
-of these items. You can do this in two ways, either in the config or with front matter using the navigation array settings.
+The sidebar is automatically generated from the files in the `_docs` directory. You will probably want to change the order of these items. You can do this in two ways, either in the config or with front matter using the navigation array settings.
 
-Since this feature shares a lot of similarities and implementation details with the navigation menu,
-I recommend you read the [navigation menu documentation](navigation) page as well to learn more about the fundamentals and terminology.
+Since this feature shares a lot of similarities and implementation details with the navigation menu, I recommend you read the [navigation menu documentation](navigation) page as well to learn more about the fundamentals and terminology.
 
 ### Sidebar ordering
 
-The sidebar is sorted/ordered by the `priority` property. The higher the priority the further down in the sidebar it will be.
-The default priority is 999. You can override the priority using the following front matter:
+The sidebar is sorted/ordered by the `priority` property. The higher the priority the further down in the sidebar it will be. The default priority is 999. You can override the priority using the following front matter:
 
 ```yaml
 navigation:
     priority: 5
 ```
 
-You can also change the order in the Docs configuration file.
-See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
+You can also change the order in the Docs configuration file. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
 _I personally think the config route is easier as it gives an instant overview, however the first way is nice as well._
 
 ### Sidebar labels
 
 The sidebar items are labelled with the `label` property. The default label is the filename of the file.
+
 You can change it with the following front matter:
 
 ```yaml
@@ -129,12 +118,9 @@ navigation:
 
 ### Sidebar grouping
 
-Sidebar grouping allows you to group items in the sidebar into categories. This is useful for creating a sidebar with a lot of items.
-The Hyde docs for instance use this.
+Sidebar grouping allows you to group items in the sidebar into categories. This is useful for creating a sidebar with a lot of items. The Hyde docs for instance use this.
 
-The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set
-in the front matter, or when subdirectories are used. This will then switch to a slightly more compact sidebar layout with pages sorted into categories.
-Any pages without the group front matter will get put in the "Other" group.
+The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set in the front matter, or when subdirectories are used. This will then switch to a slightly more compact sidebar layout with pages sorted into categories. Any pages without the group front matter will get put in the "Other" group.
 
 ### Sidebar footer customization
 
@@ -185,13 +171,12 @@ This can be useful to create redirects or other items that should not be shown i
 
 ## Customization
 
-Please see the [customization page](customization) for in-depth information on how to customize Hyde,
-including the documentation pages. Here is a high level overview for quick reference though.
+Please see the [customization page](customization) for in-depth information on how to customize Hyde, including the documentation pages. Here is a high level overview for quick reference though.
 
 ### Output directory
 
-If you want to store the compiled documentation pages in a different directory than the default 'docs' directory,
-for example to specify a version like the Hyde docs does, you can specify the output directory in the Hyde configuration file.
+If you want to store the compiled documentation pages in a different directory than the default 'docs' directory, for example to specify a version like the Hyde docs does, you can specify the output directory in the Hyde configuration file.
+
 The path is relative to the site output, typically `_site`.
 
 ```php
@@ -210,8 +195,7 @@ By default, a link to the documentation page is added to the navigation menu whe
 
 ### Sidebar header name
 
-By default, the site title shown in the sidebar header is generated from the configured site name suffixed with "docs".
-You can change this in the Docs configuration file. Tip: The header will link to the docs/index page, if it exists.
+By default, the site title shown in the sidebar header is generated from the configured site name suffixed with "docs". You can change this in the Docs configuration file. Tip: The header will link to the docs/index page, if it exists.
 
 ```php
 'title' => 'API Documentation',
@@ -219,8 +203,7 @@ You can change this in the Docs configuration file. Tip: The header will link to
 
 ### Sidebar page order
 
-To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order.
-Link items without an entry here will fall back to the default priority of 999, putting them last.
+To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order. Link items without an entry here will fall back to the default priority of 999, putting them last.
 
 ```php
 'sidebar' => [
@@ -236,9 +219,7 @@ See [the chapter in the customization page](customization#navigation-menu--sideb
 
 ### Automatic sidebar group labels
 
-When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names.
-If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file.
-The array key is the directory name, and the value is the label.
+When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names. If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file. The array key is the directory name, and the value is the label.
 
 Please note that this option is not added to the config file by default, as it's not a super common use case. No worries though, just add the following yourself!
 
@@ -254,8 +235,7 @@ Please note that this option is not added to the config file by default, as it's
 
 Hyde automatically generates a table of contents for the page and adds it to the sidebar.
 
-In the `config/docs.php` file you can configure the behaviour, content, and the look and feel of the sidebar table of contents.
-You can also disable the feature completely.
+In the `config/docs.php` file you can configure the behaviour, content, and the look and feel of the sidebar table of contents. You can also disable the feature completely.
 
 ```php
 'sidebar' => [
@@ -269,9 +249,7 @@ You can also disable the feature completely.
 
 ### Using flattened output paths
 
-If this setting is set to true, Hyde will output all documentation pages into the same configured documentation output directory.
-This means that you can use the automatic directory-based grouping feature, but still have a "flat" output structure.
-Note that this means that you can't have two documentation pages with the same filename or navigation menu label as they will overwrite each other.
+If this setting is set to true, Hyde will output all documentation pages into the same configured documentation output directory. This means that you can use the automatic directory-based grouping feature, but still have a "flat" output structure. Note that this means that you can't have two documentation pages with the same filename or navigation menu label as they will overwrite each other.
 
 If you set this to false, Hyde will match the directory structure of the source files (just like all other pages).
 
@@ -285,8 +263,7 @@ If you set this to false, Hyde will match the directory structure of the source
 
 ### Introduction
 
-The HydeSearch plugin adds a search feature to documentation pages. It consists of two parts, a search index generator
-that runs during the build command, and a frontend JavaScript plugin that adds the actual search widget.
+The HydeSearch plugin adds a search feature to documentation pages. It consists of two parts, a search index generator that runs during the build command, and a frontend JavaScript plugin that adds the actual search widget.
 
 >info Tip: The HydeSearch plugin is what powers the search feature on this site! Why not [try it out](search)?
 
@@ -305,16 +282,13 @@ The search works by generating a JSON search index which the JavaScript plugin l
 
 Two ways to access the search are added, one is a full page search screen that will be saved to `docs/search.html`.
 
-The second method is a button added to the documentation pages, similar to how Algolia DocSearch works.
-Opening it will open a modal with an integrated search screen. You can also open the dialogue using the keyboard shortcut `/`.
+The second method is a button added to the documentation pages, similar to how Algolia DocSearch works. Opening it will open a modal with an integrated search screen. You can also open the dialogue using the keyboard shortcut `/`.
 
 >info The full page can be disabled by setting `create_search_page` to `false` in the `docs` config.
 
 ### Hiding pages from indexing
 
-If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index.
-You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how
-navigation menu items are hidden. The page will still be accessible as normal but will be added to the search index JSON file.
+If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index. You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how navigation menu items are hidden. The page will still be accessible as normal but will be added to the search index JSON file.
 
 ```php
 // filepath: config/docs.php
@@ -332,13 +306,9 @@ The Realtime Compiler that powers the `php hyde serve` command will automaticall
 
 ### Introduction
 
-Hyde can automatically add links to documentation pages that take the user
-to a GitHub page (or similar) to edit the page. This makes it great for open-source projects
-looking to allow others to contribute to the documentation in a quick and easy manner.
+Hyde can automatically add links to documentation pages that take the user to a GitHub page (or similar) to edit the page. This makes it great for open-source projects looking to allow others to contribute to the documentation in a quick and easy manner.
 
-The feature is automatically enabled when you specify a base URL in the Docs configuration file.
-Hyde expects this to be a GitHub path, but it will probably work with other methods as well,
-if not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
+The feature is automatically enabled when you specify a base URL in the Docs configuration file. Hyde expects this to be a GitHub path, but it will probably work with other methods as well, if not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
 
 >info Tip: This documentation site uses this feature, scroll down to the bottom of this page and try it out!
 
@@ -363,8 +333,7 @@ Changing the label is easy, just change the following config setting:
 
 #### Changing the position
 
-By default, the button will be shown in both the documentation page footer.
-You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
+By default, the button will be shown in both the documentation page footer. You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
 
 ```php
 // Filepath: config/docs.php
@@ -373,8 +342,7 @@ You can change this by setting the following config setting to `'header'`, `'foo
 
 #### Adding a button icon
 
-This is not included out of the box, but is easy to add with some CSS!
-Just target the `.edit-page-link` class.
+This is not included out of the box, but is easy to add with some CSS! Just target the `.edit-page-link` class.
 
 ```css
 // filepath e.g. app.css

From 7a85697a90b4c4fc066a5ba0ea4975fc3694234c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:07:26 +0200
Subject: [PATCH 2602/2811] Remove extra newlines

---
 docs/creating-content/documentation-pages.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 689e8bebdcf..68bf8361e8a 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -34,7 +34,6 @@ Since Hyde does a lot of things automatically, there are some things you may nee
 Like most of HydePHP, the Hyde Documentation module is highly customizable. Much of the frontend is composed using Blade templates and components, which you can customize to your heart's content.
 Since there are so many components, it's hard to list them all here in the documentation, so I encourage you to check out the [source code](https://github.com/hydephp/framework/tree/master/resources/views/components/docs) to see how it's all put together and find the customizations you are looking for.
 
-
 ## Creating Documentation Pages
 
 You can create a Documentation page by adding a file to the `_docs` directory where the filename ends in `.md`.
@@ -69,7 +68,6 @@ navigation:
 ---
 ```
 
-
 ## Dynamic Content Generation
 
 Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title. If you are not happy with the results you can customize them in the config or with front matter.
@@ -168,7 +166,6 @@ This can be useful to create redirects or other items that should not be shown i
 
 >info The index page is by default not shown as a sidebar item, but instead is linked in the sidebar header. <br>
 
-
 ## Customization
 
 Please see the [customization page](customization) for in-depth information on how to customize Hyde, including the documentation pages. Here is a high level overview for quick reference though.
@@ -258,7 +255,6 @@ If you set this to false, Hyde will match the directory structure of the source
 'flattened_output_paths' => true,
 ```
 
-
 ## Search Feature
 
 ### Introduction
@@ -301,7 +297,6 @@ If you have a large page on your documentation site, like a changelog, you may w
 
 The Realtime Compiler that powers the `php hyde serve` command will automatically generate a fresh search index each time the browser requests it.
 
-
 ## Automatic "Edit Page" Button
 
 ### Introduction

From 467b99191848153bf7ec4af1c1024ca7d12ec72f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:08:37 +0200
Subject: [PATCH 2603/2811] Cleanup line

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 68bf8361e8a..ce0daea81e7 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -10,7 +10,7 @@ navigation:
 
 Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier. Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
 
-Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and even groups, of the sidebar items to suit your needs.
+Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and groups of the sidebar items to suit your needs.
 
 Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
 

From ac511dbb872f148b676a86c2f6d5eb521c1bab2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:09:55 +0200
Subject: [PATCH 2604/2811] Shorten line

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index ce0daea81e7..65f708c2c8e 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -309,7 +309,7 @@ The feature is automatically enabled when you specify a base URL in the Docs con
 
 ### Configuration
 
-As an example configuration, let's take a practical example of how HydePHP.com uses this feature.
+Here's an example configuration from the official HydePHP.com documentation:
 
 ```php
 // Filepath: config/docs.php

From 4ec275f69aee9e55a9abdb21cb3702872be1f692 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:58:15 +0200
Subject: [PATCH 2605/2811] Reformat Markdown

---
 docs/advanced-features/navigation-api.md | 10 ++--------
 docs/creating-content/blog-posts.md      |  1 -
 docs/digging-deeper/customization.md     |  5 ++---
 docs/digging-deeper/navigation.md        |  2 --
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/docs/advanced-features/navigation-api.md b/docs/advanced-features/navigation-api.md
index 9c5fcad14d2..7facfe0b7bd 100644
--- a/docs/advanced-features/navigation-api.md
+++ b/docs/advanced-features/navigation-api.md
@@ -7,7 +7,6 @@ navigation:
 
 >warning This article covers advanced information that is only relevant if you want to create custom navigation menus. Instead, you may want to read the [Navigation](navigation) article for a general overview.
 
-
 ## Abstract
 
 This article describes the Navigation API introduced in HydePHP v2. Both the main navigation menu and the documentation sidebar bundled with HydePHP are built with this API.
@@ -17,7 +16,6 @@ This article is intended for advanced users, as most users will not need to crea
 For this reason, the documentation is very code-driven due to the technical nature of the API.
 We'll also be mixing in some practical examples of Blade and PHP code to illustrate how you can use the API in your own projects.
 
-
 ## Overview
 
 The Navigation API consists of a set of classes within the `Hyde\Framework\Features\Navigation` namespace.
@@ -74,7 +72,6 @@ $sidebar = DocumentationSidebar::get();
 
 >info Developer tip: The menus are only generated *after* the Hyde Kernel is booted. If you are getting BindingResolutionExceptions, ensure that you are not trying to access the menus too early in the application lifecycle. (Consider using the `booted` event.)
 
-
 ## Creating Custom Menus
 
 ### Introduction Overview
@@ -148,12 +145,10 @@ Here are some general tips to keep in mind when working with the Navigation API:
 - You can also construct NavigationItem instances directly, but the `create` method is a convenient shorthand, and can fill in data from routes, if you use them.
 - It's also possible to set an item's priority as the third parameter, but here we don't need it, as they default to the order they are added.
 
-
 ## Class Reference
 
 Below is a reference of the classes and methods available in the Navigation API.
 
-
 ## NavigationMenu
 
 The `NavigationMenu` class represents a navigation menu. It contains a collection of items, which can be either `NavigationItem` or `NavigationGroup` instances.
@@ -251,7 +246,7 @@ $item->getLabel(): string;
 $item->getPriority(): int;
 
 // Check if the item is active. (Only works when the destination is a route)
-$item->isActive(): bool; 
+$item->isActive(): bool;
 ```
 
 ### Blade Example
@@ -330,7 +325,7 @@ If the destination is a route, the link will be resolved to the correct URL, usi
 
 ```php
 $item = new NavigationItem(Routes::get('index'));
-$item->getLink(); // Outputs 'index.html' 
+$item->getLink(); // Outputs 'index.html'
 
 $item = new NavigationItem('https://example.com');
 $item->getLink(); // Outputs 'https://example.com'
@@ -388,7 +383,6 @@ $item->isActive(fn($item) => $item->getLink() === 'index.html');
 This is useful if you want to check for a specific query parameter, or if you want to check if the item is active based on a more complex condition.
 -->
 
-
 ## NavigationGroup
 
 The `NavigationGroup` class represents a group of items in a navigation menu. It contains a label, priority, and a collection of navigation items.
diff --git a/docs/creating-content/blog-posts.md b/docs/creating-content/blog-posts.md
index 39351b88f6d..ae5eaef27fa 100644
--- a/docs/creating-content/blog-posts.md
+++ b/docs/creating-content/blog-posts.md
@@ -160,7 +160,6 @@ author:
       github: "hydephp"
 ```
 
-
 When using an array, you don't need to include all properties. Specified values will override the corresponding entries in the `authors` config.
 
 Note: Author usernames are automatically normalized (converted to lowercase with spaces replaced by underscores).
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 4d211cb41f1..8b42ca38b7c 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -122,7 +122,7 @@ Here are the default settings:
 ### Authors
 
 Hyde supports adding authors to blog posts, allowing you to automatically include information like display names and website links.
-We even support fields for avatars, biographies, and social media profiles, which you can use in your custom Blade templates. 
+We even support fields for avatars, biographies, and social media profiles, which you can use in your custom Blade templates.
 
 While you can set all this data directly in the [front matter](blog-posts#author), that quickly becomes tedious and hard to maintain.
 Instead, you can predefine authors in the Hyde config. When writing posts, just specify the username in the front matter,
@@ -139,7 +139,7 @@ Authors are defined in the `config/hyde.php` file under the `authors` key. Each
         // The following fields, along with the username, are used by the default blog post templates.
         name: 'Mr. Hyde',
         website: 'https://hydephp.com',
-        
+
         // These fields are not currently used in the default templates, but you can use them in your custom views.
         bio: 'The mysterious author of HydePHP',
         avatar: 'avatar.png',
@@ -173,7 +173,6 @@ author: mr_hyde
 
 If you want to override the data for a specific post, you can do so in the [front matter](blog-posts#author) which is great for guest authors or one-off posts.
 
-
 #### Available Fields
 
 - `name`: The author's display name (optional, generated from username if not provided)
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4f0fe9c350e..9faf3d250d8 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -60,7 +60,6 @@ General options for the entire navigation menus are also available in the `hyde`
 
 Now that you know the basics, let's dive into the details of how to customize the navigation menus!
 
-
 ## Front Matter Configuration
 
 The front matter options allow you to customize the navigation menus on a per-page basis.
@@ -114,7 +113,6 @@ navigation:
     group: "My Group"
 ```
 
-
 ## Config File Configuration
 
 Next up, let's look at how to customize the navigation menus using the config files.

From 51dc2ed0d77780924a4aa3b1bee81b76dbe22768 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 13:06:37 +0200
Subject: [PATCH 2606/2811] Remove hard line breaks from sections

---
 docs/creating-content/documentation-pages.md | 90 +++++++-------------
 1 file changed, 29 insertions(+), 61 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 309fc0cd7f7..f2e86881ab3 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -8,23 +8,17 @@ navigation:
 
 ## Introduction to Hyde Documentation Pages
 
-Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier.
-Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
+Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier. Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
 
-Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a
-responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order,
-labels, and even groups, of the sidebar items to suit your needs.
+Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and even groups, of the sidebar items to suit your needs.
 
-Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated
-"Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
+Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
 
-If you have a Torchlight API token in your .env file, Hyde will even enable syntax highlighting automatically,
-saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
+If you have a Torchlight API token in your .env file, Hyde will even enable syntax highlighting automatically, saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
 
 ### Best Practices and Hyde Expectations
 
-Since Hyde does a lot of things automatically, there are some things you may need
-to keep in mind when creating blog posts so that you don't get unexpected results.
+Since Hyde does a lot of things automatically, there are some things you may need to keep in mind when creating blog posts so that you don't get unexpected results.
 
 #### Filenames
 
@@ -77,13 +71,11 @@ navigation:
 
 ## Dynamic Content Generation
 
-Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title.
-If you are not happy with the results you can customize them in the config or with front matter.
+Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title. If you are not happy with the results you can customize them in the config or with front matter.
 
 ### Front Matter reference
 
-Before we look at how to override things, here is an overview of the relevant content Hyde generates,
-and where the data is from as well as where it can be overridden.
+Before we look at how to override things, here is an overview of the relevant content Hyde generates, and where the data is from as well as where it can be overridden.
 
 | Property                        | Description                                            | Dynamic Data Source                 | Override in          |
 |---------------------------------|--------------------------------------------------------|-------------------------------------|----------------------|
@@ -95,29 +87,26 @@ and where the data is from as well as where it can be overridden.
 
 ## Sidebar
 
-The sidebar is automatically generated from the files in the `_docs` directory. You will probably want to change the order
-of these items. You can do this in two ways, either in the config or with front matter using the navigation array settings.
+The sidebar is automatically generated from the files in the `_docs` directory. You will probably want to change the order of these items. You can do this in two ways, either in the config or with front matter using the navigation array settings.
 
-Since this feature shares a lot of similarities and implementation details with the navigation menu,
-I recommend you read the [navigation menu documentation](navigation) page as well to learn more about the fundamentals and terminology.
+Since this feature shares a lot of similarities and implementation details with the navigation menu, I recommend you read the [navigation menu documentation](navigation) page as well to learn more about the fundamentals and terminology.
 
 ### Sidebar ordering
 
-The sidebar is sorted/ordered by the `priority` property. The higher the priority the further down in the sidebar it will be.
-The default priority is 999. You can override the priority using the following front matter:
+The sidebar is sorted/ordered by the `priority` property. The higher the priority the further down in the sidebar it will be. The default priority is 999. You can override the priority using the following front matter:
 
 ```yaml
 navigation:
     priority: 5
 ```
 
-You can also change the order in the Docs configuration file.
-See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
+You can also change the order in the Docs configuration file. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
 _I personally think the config route is easier as it gives an instant overview, however the first way is nice as well._
 
 ### Sidebar labels
 
 The sidebar items are labelled with the `label` property. The default label is the filename of the file.
+
 You can change it with the following front matter:
 
 ```yaml
@@ -127,12 +116,9 @@ navigation:
 
 ### Sidebar grouping
 
-Sidebar grouping allows you to group items in the sidebar into categories. This is useful for creating a sidebar with a lot of items.
-The Hyde docs for instance use this.
+Sidebar grouping allows you to group items in the sidebar into categories. This is useful for creating a sidebar with a lot of items. The Hyde docs for instance use this.
 
-The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set
-in the front matter, or when subdirectories are used. This will then switch to a slightly more compact sidebar layout with pages sorted into categories.
-Any pages without the group front matter will get put in the "Other" group.
+The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set in the front matter, or when subdirectories are used. This will then switch to a slightly more compact sidebar layout with pages sorted into categories. Any pages without the group front matter will get put in the "Other" group.
 
 ### Sidebar footer customization
 
@@ -182,13 +168,12 @@ This can be useful to create redirects or other items that should not be shown i
 
 ## Customization
 
-Please see the [customization page](customization) for in-depth information on how to customize Hyde,
-including the documentation pages. Here is a high level overview for quick reference though.
+Please see the [customization page](customization) for in-depth information on how to customize Hyde, including the documentation pages. Here is a high level overview for quick reference though.
 
 ### Output directory
 
-If you want to store the compiled documentation pages in a different directory than the default 'docs' directory,
-for example to specify a version like the Hyde docs does, you can specify the output directory in the Hyde configuration file.
+If you want to store the compiled documentation pages in a different directory than the default 'docs' directory, for example to specify a version like the Hyde docs does, you can specify the output directory in the Hyde configuration file.
+
 The path is relative to the site output, typically `_site`.
 
 ```php
@@ -207,8 +192,7 @@ By default, a link to the documentation page is added to the navigation menu whe
 
 ### Sidebar header name
 
-By default, the site title shown in the sidebar header is generated from the configured site name suffixed with "docs".
-You can change this in the Docs configuration file. Tip: The header will link to the docs/index page, if it exists.
+By default, the site title shown in the sidebar header is generated from the configured site name suffixed with "docs". You can change this in the Docs configuration file. Tip: The header will link to the docs/index page, if it exists.
 
 ```php
 'title' => 'API Documentation',
@@ -216,8 +200,7 @@ You can change this in the Docs configuration file. Tip: The header will link to
 
 ### Sidebar page order
 
-To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order.
-Link items without an entry here will fall back to the default priority of 999, putting them last.
+To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order. Link items without an entry here will fall back to the default priority of 999, putting them last.
 
 ```php
 'sidebar' => [
@@ -233,9 +216,7 @@ See [the chapter in the customization page](customization#navigation-menu--sideb
 
 ### Automatic sidebar group labels
 
-When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names.
-If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file.
-The array key is the directory name, and the value is the label.
+When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names. If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file. The array key is the directory name, and the value is the label.
 
 Please note that this option is not added to the config file by default, as it's not a super common use case. No worries though, just add the following yourself!
 
@@ -251,8 +232,7 @@ Please note that this option is not added to the config file by default, as it's
 
 Hyde automatically generates a table of contents for the page and adds it to the sidebar.
 
-In the `config/docs.php` file you can configure the behaviour, content, and the look and feel of the sidebar table of contents.
-You can also disable the feature completely.
+In the `config/docs.php` file you can configure the behaviour, content, and the look and feel of the sidebar table of contents. You can also disable the feature completely.
 
 ```php
 'sidebar' => [
@@ -266,9 +246,7 @@ You can also disable the feature completely.
 
 ### Using flattened output paths
 
-If this setting is set to true, Hyde will output all documentation pages into the same configured documentation output directory.
-This means that you can use the automatic directory-based grouping feature, but still have a "flat" output structure.
-Note that this means that you can't have two documentation pages with the same filename or navigation menu label as they will overwrite each other.
+If this setting is set to true, Hyde will output all documentation pages into the same configured documentation output directory. This means that you can use the automatic directory-based grouping feature, but still have a "flat" output structure. Note that this means that you can't have two documentation pages with the same filename or navigation menu label as they will overwrite each other.
 
 If you set this to false, Hyde will match the directory structure of the source files (just like all other pages).
 
@@ -281,8 +259,7 @@ If you set this to false, Hyde will match the directory structure of the source
 
 ### Introduction
 
-The HydeSearch plugin adds a search feature to documentation pages. It consists of two parts, a search index generator
-that runs during the build command, and a frontend JavaScript plugin that adds the actual search widget.
+The HydeSearch plugin adds a search feature to documentation pages. It consists of two parts, a search index generator that runs during the build command, and a frontend JavaScript plugin that adds the actual search widget.
 
 >info Tip: The HydeSearch plugin is what powers the search feature on this site! Why not [try it out](search)?
 
@@ -301,16 +278,13 @@ The search works by generating a JSON search index which the JavaScript plugin l
 
 Two ways to access the search are added, one is a full page search screen that will be saved to `docs/search.html`.
 
-The second method is a button added to the documentation pages, similar to how Algolia DocSearch works.
-Opening it will open a modal with an integrated search screen. You can also open the dialogue using the keyboard shortcut `/`.
+The second method is a button added to the documentation pages, similar to how Algolia DocSearch works. Opening it will open a modal with an integrated search screen. You can also open the dialogue using the keyboard shortcut `/`.
 
 >info The full page can be disabled by setting `create_search_page` to `false` in the `docs` config.
 
 ### Hiding pages from indexing
 
-If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index.
-You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how
-navigation menu items are hidden. The page will still be accessible as normal but will be added to the search index JSON file.
+If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index. You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how navigation menu items are hidden. The page will still be accessible as normal but will be added to the search index JSON file.
 
 ```php
 // filepath: config/docs.php
@@ -327,13 +301,9 @@ The Realtime Compiler that powers the `php hyde serve` command will automaticall
 
 ### Introduction
 
-Hyde can automatically add links to documentation pages that take the user
-to a GitHub page (or similar) to edit the page. This makes it great for open-source projects
-looking to allow others to contribute to the documentation in a quick and easy manner.
+Hyde can automatically add links to documentation pages that take the user to a GitHub page (or similar) to edit the page. This makes it great for open-source projects looking to allow others to contribute to the documentation in a quick and easy manner.
 
-The feature is automatically enabled when you specify a base URL in the Docs configuration file.
-Hyde expects this to be a GitHub path, but it will probably work with other methods as well,
-if not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
+The feature is automatically enabled when you specify a base URL in the Docs configuration file. Hyde expects this to be a GitHub path, but it will probably work with other methods as well, if not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
 
 >info Tip: This documentation site uses this feature, scroll down to the bottom of this page and try it out!
 
@@ -358,8 +328,7 @@ Changing the label is easy, just change the following config setting:
 
 #### Changing the position
 
-By default, the button will be shown in both the documentation page footer.
-You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
+By default, the button will be shown in both the documentation page footer. You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
 
 ```php
 // Filepath: config/docs.php
@@ -368,8 +337,7 @@ You can change this by setting the following config setting to `'header'`, `'foo
 
 #### Adding a button icon
 
-This is not included out of the box, but is easy to add with some CSS!
-Just target the `.edit-page-link` class.
+This is not included out of the box, but is easy to add with some CSS! Just target the `.edit-page-link` class.
 
 ```css
 // filepath e.g. app.css

From accc2f7c36a0783424083ae0b877d08bea2d4da6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:31:23 +0200
Subject: [PATCH 2607/2811] Clarify that lower priority values result in higher
 placement in the sidebar

Matches writing style, and is more intuitive
---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index ed64817e624..d9c498e01a9 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -93,7 +93,7 @@ Since this feature shares a lot of similarities and implementation details with
 
 ### Sidebar ordering
 
-The sidebar is sorted/ordered by the `priority` property. The higher the priority the further down in the sidebar it will be. The default priority is 999. You can override the priority using the following front matter:
+The sidebar is sorted/ordered by the `priority` property. The lower the priority value, the higher up in the sidebar it will be. The default priority is 999. You can override the priority using the following front matter:
 
 ```yaml
 navigation:

From cc0d2e3ef0eedf94a02e448d665eec1a8dce9f01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:32:57 +0200
Subject: [PATCH 2608/2811] Clean up section

---
 docs/creating-content/documentation-pages.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index d9c498e01a9..c3aa6d2f3d3 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -100,8 +100,7 @@ navigation:
     priority: 5
 ```
 
-You can also change the order in the Docs configuration file. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
-_I personally think the config route is easier as it gives an instant overview, however the first way is nice as well._
+You can also change the order in the `config/docs.php` configuration file, which may be easier to manage for larger sites. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details.
 
 ### Sidebar labels
 

From 0df917bd7eed259c1797cd1f9960bdfaf68e54a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:34:50 +0200
Subject: [PATCH 2609/2811] Reformat table

---
 docs/creating-content/documentation-pages.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index c3aa6d2f3d3..8e98b4722ce 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -77,13 +77,13 @@ Hyde makes documentation pages easy to create by automatically generating dynami
 
 Before we look at how to override things, here is an overview of the relevant content Hyde generates, and where the data is from as well as where it can be overridden.
 
-| Property                        | Description                                            | Dynamic Data Source                 | Override in          |
-|---------------------------------|--------------------------------------------------------|-------------------------------------|----------------------|
-| `title` (string)                | The title of the page used in the HTML `<title>` tag   | The first H1 heading (`# Foo`)      | Front matter         |
-| `navigation.label` (string)     | The label for the page shown in the sidebar            | The page basename | Front matter, config |
-| `navigation.priority` (integer) | The priority of the page used for ordering the sidebar | Defaults to 999                     | Front matter, config |
-| `navigation.hidden` (boolean)   | Hides the page from the sidebar                        | _none_                              | Front matter, config |
-| `navigation.group` (string)     | The group the page belongs to in the sidebar           | Subdirectory, if nested             | Front matter         |
+| Property                        | Description                                            | Dynamic Data Source            | Override in          |
+|---------------------------------|--------------------------------------------------------|--------------------------------|----------------------|
+| `title` (string)                | The title of the page used in the HTML `<title>` tag   | The first H1 heading (`# Foo`) | Front matter         |
+| `navigation.label` (string)     | The label for the page shown in the sidebar            | The page basename              | Front matter, config |
+| `navigation.priority` (integer) | The priority of the page used for ordering the sidebar | Defaults to 999                | Front matter, config |
+| `navigation.hidden` (boolean)   | Hides the page from the sidebar                        | _none_                         | Front matter, config |
+| `navigation.group` (string)     | The group the page belongs to in the sidebar           | Subdirectory, if nested        | Front matter         |
 
 ## Sidebar
 

From ab46ba42448864011e1a540aca972f13178f7891 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:35:16 +0200
Subject: [PATCH 2610/2811] Clarify that label is generated not literal

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 8e98b4722ce..6c1844014cb 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -104,7 +104,7 @@ You can also change the order in the `config/docs.php` configuration file, which
 
 ### Sidebar labels
 
-The sidebar items are labelled with the `label` property. The default label is the filename of the file.
+The sidebar items are labelled with the `label` property. The default label is generated from the filename of the file.
 
 You can change it with the following front matter:
 

From ad504acffba78e30e05e835eb5e9153274c66176 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:39:41 +0200
Subject: [PATCH 2611/2811] Improve grouping documentation wording

---
 docs/creating-content/documentation-pages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 6c1844014cb..b1e75ad3bf2 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -115,9 +115,8 @@ navigation:
 
 ### Sidebar grouping
 
-Sidebar grouping allows you to group items in the sidebar into categories. This is useful for creating a sidebar with a lot of items. The Hyde docs for instance use this.
+Sidebar grouping allows you to group items in the sidebar under category headings. This is useful for creating a sidebar with a lot of items. The official HydePHP.com docs, for instance, use this feature.
 
-The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set in the front matter, or when subdirectories are used. This will then switch to a slightly more compact sidebar layout with pages sorted into categories. Any pages without the group front matter will get put in the "Other" group.
 
 ### Sidebar footer customization
 
@@ -132,6 +131,7 @@ The sidebar footer contains, by default, a link to your site homepage. You can c
 ```
 
 You can also set the option to `false` to disable it entirely.
+The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set in the front matter, or when documentation pages are organized in subdirectories. Once activated, Hyde will switch to a slightly more compact sidebar layout with pages sorted into labeled groups. Any pages without the group information will be put in the "Other" group.
 
 #### Using Front Matter
 

From 5aa2fa59a06fbf9f6f2ed0fd29475d02aa449550 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:40:44 +0200
Subject: [PATCH 2612/2811] Fix wrong term used for sidebars

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index b1e75ad3bf2..2b9d87d78db 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -150,7 +150,7 @@ For example, putting a Markdown file in `_docs/getting-started/`, is equivalent
 
 >info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they overwrite each other.
 
->info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
+>info Tip: When using subdirectory-based grouping, you can set their priority using the directory name as the array key.
 
 ### Hiding items
 

From cff03ac0513db462bf7ce087b44d2455e0996c25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:41:07 +0200
Subject: [PATCH 2613/2811] Improve wording to be clearer

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 2b9d87d78db..bb6b10d5af6 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -150,7 +150,7 @@ For example, putting a Markdown file in `_docs/getting-started/`, is equivalent
 
 >info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they overwrite each other.
 
->info Tip: When using subdirectory-based grouping, you can set their priority using the directory name as the array key.
+>info Tip: When using subdirectory-based grouping, you can set the priority of the groups using the directory name as the array key in the config file.
 
 ### Hiding items
 

From c3fe8fb30ec3490acaa9bc820ab119c2c24ad1f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:41:40 +0200
Subject: [PATCH 2614/2811] Remove unnecessary line break

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index bb6b10d5af6..6d94081a09c 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -163,7 +163,7 @@ navigation:
 
 This can be useful to create redirects or other items that should not be shown in the sidebar.
 
->info The index page is by default not shown as a sidebar item, but instead is linked in the sidebar header. <br>
+>info The index page is by default not shown as a sidebar item, but instead is linked in the sidebar header.
 
 ## Customization
 

From 9a2b2ef92c0a75327f0b3a218f8f0fa8799e7223 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:43:13 +0200
Subject: [PATCH 2615/2811] Fix punctuation

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 6d94081a09c..429c52fdf02 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -146,7 +146,7 @@ navigation:
 
 You can also automatically group your documentation pages by placing source files in sub-directories.
 
-For example, putting a Markdown file in `_docs/getting-started/`, is equivalent to adding the same front matter seen above.
+For example, putting a Markdown file in `_docs/getting-started/` is equivalent to adding the same front matter seen above.
 
 >info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they overwrite each other.
 

From a7c6f8fd872a714df24de5fd084b57fbef99f2fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:43:23 +0200
Subject: [PATCH 2616/2811] Clarify wording

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 429c52fdf02..a41b0051a9d 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -148,7 +148,7 @@ You can also automatically group your documentation pages by placing source file
 
 For example, putting a Markdown file in `_docs/getting-started/` is equivalent to adding the same front matter seen above.
 
->info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they overwrite each other.
+>info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they would overwrite each other.
 
 >info Tip: When using subdirectory-based grouping, you can set the priority of the groups using the directory name as the array key in the config file.
 

From 87eec33dc43d08702dc59e04fe7e7159e7dcc04e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:43:59 +0200
Subject: [PATCH 2617/2811] Fix section order

---
 docs/creating-content/documentation-pages.md | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index a41b0051a9d..9781b605969 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -117,20 +117,6 @@ navigation:
 
 Sidebar grouping allows you to group items in the sidebar under category headings. This is useful for creating a sidebar with a lot of items. The official HydePHP.com docs, for instance, use this feature.
 
-
-### Sidebar footer customization
-
-The sidebar footer contains, by default, a link to your site homepage. You can change this in the `config/docs.php` file.
-
-```php
-// filepath: config/docs.php
-
-'sidebar' => [
-    'footer' => 'My **Markdown** Footer Text',
-],
-```
-
-You can also set the option to `false` to disable it entirely.
 The feature is enabled automatically when one or more of your documentation pages have the `navigation.group` property set in the front matter, or when documentation pages are organized in subdirectories. Once activated, Hyde will switch to a slightly more compact sidebar layout with pages sorted into labeled groups. Any pages without the group information will be put in the "Other" group.
 
 #### Using Front Matter
@@ -197,6 +183,20 @@ By default, the site title shown in the sidebar header is generated from the con
 'title' => 'API Documentation',
 ```
 
+### Sidebar footer customization
+
+The sidebar footer contains, by default, a link to your site homepage. You can change this in the `config/docs.php` file.
+
+```php
+// filepath: config/docs.php
+
+'sidebar' => [
+    'footer' => 'My **Markdown** Footer Text',
+],
+```
+
+You can also set the option to `false` to disable it entirely.
+
 ### Sidebar page order
 
 To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order. Link items without an entry here will fall back to the default priority of 999, putting them last.

From 3fb32ab31fec7aaa72f81059d121613ef121de99 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:50:30 +0200
Subject: [PATCH 2618/2811] Fix inline code formatting

---
 docs/creating-content/documentation-pages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 9781b605969..4e93ca87311 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -8,13 +8,13 @@ navigation:
 
 ## Introduction to Hyde Documentation Pages
 
-Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier. Using the Hyde Documentation module, all you need to do is place standard Markdown files in the _docs/ directory, and Hyde takes care of the rest.
+Welcome to the Hyde Documentation Pages, where creating professional-looking documentation sites has never been easier. Using the Hyde Documentation module, all you need to do is place standard Markdown files in the `_docs/` directory, and Hyde takes care of the rest.
 
 Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and groups of the sidebar items to suit your needs.
 
 Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
 
-If you have a Torchlight API token in your .env file, Hyde will even enable syntax highlighting automatically, saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
+If you have a Torchlight API token in your `.env` file, Hyde will even enable syntax highlighting automatically, saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
 
 ### Best Practices and Hyde Expectations
 

From 79ef5b2c65fc3a83f592089c20d03dd29852bb94 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:50:42 +0200
Subject: [PATCH 2619/2811] Fix wrong page type name

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 4e93ca87311..d346b4b5356 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -18,7 +18,7 @@ If you have a Torchlight API token in your `.env` file, Hyde will even enable sy
 
 ### Best Practices and Hyde Expectations
 
-Since Hyde does a lot of things automatically, there are some things you may need to keep in mind when creating blog posts so that you don't get unexpected results.
+Since Hyde does a lot of things automatically, there are some things you may need to keep in mind when creating documentation pages so that you don't get unexpected results.
 
 #### Filenames
 

From 591ae52148af9ef461f228b86f721a44a1308eea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 14:57:29 +0200
Subject: [PATCH 2620/2811] Fix grammar

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index d346b4b5356..14b6931f2dd 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -12,7 +12,7 @@ Welcome to the Hyde Documentation Pages, where creating professional-looking doc
 
 Hyde compiles your Markdown content into beautiful static HTML pages using a TailwindCSS frontend, complete with a responsive sidebar that is automatically generated based on your Markdown files. You can even customize the order, labels, and groups of the sidebar items to suit your needs.
 
-Additionally, if you have a `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
+Additionally, if you have an `_docs/index.md` file, the sidebar header will link to it, and an automatically generated "Docs" link will be added to your site's main navigation menu, pointing to your documentation page.
 
 If you have a Torchlight API token in your `.env` file, Hyde will even enable syntax highlighting automatically, saving you time and effort. For more information about this feature, see the [extensions page](extensions#torchlight).
 

From 3d3932d004744b8e94a1ba1de43c2323f2839331 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:26:48 +0200
Subject: [PATCH 2621/2811] Remove word that isn't to be there

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 3b32dec349a..708ed7e3d42 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -327,7 +327,7 @@ Changing the label is easy, just change the following config setting:
 
 #### Changing the position
 
-By default, the button will be shown in both the documentation page footer. You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
+By default, the button will be shown in the documentation page footer. You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
 
 ```php
 // Filepath: config/docs.php

From 3f5a4dd3a74aceb80955a32fa83db4a153268afb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:27:07 +0200
Subject: [PATCH 2622/2811] Add missing important word

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 708ed7e3d42..362dce28406 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -283,7 +283,7 @@ The second method is a button added to the documentation pages, similar to how A
 
 ### Hiding pages from indexing
 
-If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index. You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how navigation menu items are hidden. The page will still be accessible as normal but will be added to the search index JSON file.
+If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index. You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how navigation menu items are hidden. The page will still be accessible as normal but will not be added to the search index JSON file.
 
 ```php
 // filepath: config/docs.php

From 4b5c86de32cb0b79fb52b4491545a71f3224b443 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:27:13 +0200
Subject: [PATCH 2623/2811] Use American English

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 362dce28406..7c809614f51 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -277,7 +277,7 @@ The search works by generating a JSON search index which the JavaScript plugin l
 
 Two ways to access the search are added, one is a full page search screen that will be saved to `docs/search.html`.
 
-The second method is a button added to the documentation pages, similar to how Algolia DocSearch works. Opening it will open a modal with an integrated search screen. You can also open the dialogue using the keyboard shortcut `/`.
+The second method is a button added to the documentation pages, similar to how Algolia DocSearch works. Opening it will open a modal with an integrated search screen. You can also open the dialog using the keyboard shortcut `/`.
 
 >info The full page can be disabled by setting `create_search_page` to `false` in the `docs` config.
 

From f3c494e0a92818506fefb3e6c777f00a69485a74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:27:36 +0200
Subject: [PATCH 2624/2811] Split out subordinate clause to separate sentence

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 7c809614f51..1c566e85cd0 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -302,7 +302,7 @@ The Realtime Compiler that powers the `php hyde serve` command will automaticall
 
 Hyde can automatically add links to documentation pages that take the user to a GitHub page (or similar) to edit the page. This makes it great for open-source projects looking to allow others to contribute to the documentation in a quick and easy manner.
 
-The feature is automatically enabled when you specify a base URL in the Docs configuration file. Hyde expects this to be a GitHub path, but it will probably work with other methods as well, if not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
+The feature is automatically enabled when you specify a base URL in the Docs configuration file. Hyde expects this to be a GitHub path, but it will probably work with other methods as well. If not, please send a PR and/or create an issue on the [GitHub repository](https://github.com/hydephp/framework)!
 
 >info Tip: This documentation site uses this feature, scroll down to the bottom of this page and try it out!
 

From dc69f6ab6b58df53a9dd2af7469139d0499c6b3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:28:00 +0200
Subject: [PATCH 2625/2811] Use APA style headings

---
 docs/creating-content/documentation-pages.md | 44 ++++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 1c566e85cd0..185a6539b2f 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -29,7 +29,7 @@ Since Hyde does a lot of things automatically, there are some things you may nee
 - You should always have an `index.md` file in the `_docs/` directory
 - Your page will be stored in `_site/docs/<identifier>.html` unless you [change it in the config](#output-directory)
 
-### Advanced usage and customization
+### Advanced Usage and Customization
 
 Like most of HydePHP, the Hyde Documentation module is highly customizable. Much of the frontend is composed using Blade templates and components, which you can customize to your heart's content.
 Since there are so many components, it's hard to list them all here in the documentation, so I encourage you to check out the [source code](https://github.com/hydephp/framework/tree/master/resources/views/components/docs) to see how it's all put together and find the customizations you are looking for.
@@ -51,7 +51,7 @@ This will create the following file saved as `_docs/page-title.md`
 
 ```
 
-### Front Matter is optional
+### Front Matter Is Optional
 
 You don't need to use [front matter](blog-posts#supported-front-matter-properties) to create a documentation page.
 
@@ -73,7 +73,7 @@ navigation:
 
 Hyde makes documentation pages easy to create by automatically generating dynamic content such as the sidebar and page title. If you are not happy with the results you can customize them in the config or with front matter.
 
-### Front Matter reference
+### Front Matter Reference
 
 Before we look at how to override things, here is an overview of the relevant content Hyde generates, and where the data is from as well as where it can be overridden.
 
@@ -91,7 +91,7 @@ The sidebar is automatically generated from the files in the `_docs` directory.
 
 Since this feature shares a lot of similarities and implementation details with the navigation menu, I recommend you read the [navigation menu documentation](navigation) page as well to learn more about the fundamentals and terminology.
 
-### Sidebar ordering
+### Sidebar Ordering
 
 The sidebar is sorted/ordered by the `priority` property. The lower the priority value, the higher up in the sidebar it will be. The default priority is 999. You can override the priority using the following front matter:
 
@@ -102,7 +102,7 @@ navigation:
 
 You can also change the order in the `config/docs.php` configuration file, which may be easier to manage for larger sites. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details.
 
-### Sidebar labels
+### Sidebar Labels
 
 The sidebar items are labelled with the `label` property. The default label is generated from the filename of the file.
 
@@ -113,7 +113,7 @@ navigation:
     label: "My Custom Sidebar Label"
 ```
 
-### Sidebar grouping
+### Sidebar Grouping
 
 Sidebar grouping allows you to group items in the sidebar under category headings. This is useful for creating a sidebar with a lot of items. The official HydePHP.com docs, for instance, use this feature.
 
@@ -128,7 +128,7 @@ navigation:
     group: "Getting Started"
 ```
 
-#### Automatic subdirectory-based grouping
+#### Automatic Subdirectory-Based Grouping
 
 You can also automatically group your documentation pages by placing source files in sub-directories.
 
@@ -155,7 +155,7 @@ This can be useful to create redirects or other items that should not be shown i
 
 Please see the [customization page](customization) for in-depth information on how to customize Hyde, including the documentation pages. Here is a high level overview for quick reference though.
 
-### Output directory
+### Output Directory
 
 If you want to store the compiled documentation pages in a different directory than the default 'docs' directory, for example to specify a version like the Hyde docs does, you can specify the output directory in the Hyde configuration file.
 
@@ -171,11 +171,11 @@ The path is relative to the site output, typically `_site`.
 
 Note that you need to take care as to not set it to something that may conflict with other parts, such as media or posts directories.
 
-### Automatic navigation menu
+### Automatic Navigation Menu
 
 By default, a link to the documentation page is added to the navigation menu when an index.md file is found in the `_docs` directory. Please see [the customization page](customization#navigation-menu--sidebar) for more information.
 
-### Sidebar header name
+### Sidebar Header Name
 
 By default, the site title shown in the sidebar header is generated from the configured site name suffixed with "docs". You can change this in the Docs configuration file. Tip: The header will link to the docs/index page, if it exists.
 
@@ -183,7 +183,7 @@ By default, the site title shown in the sidebar header is generated from the con
 'title' => 'API Documentation',
 ```
 
-### Sidebar footer customization
+### Sidebar Footer Customization
 
 The sidebar footer contains, by default, a link to your site homepage. You can change this in the `config/docs.php` file.
 
@@ -197,7 +197,7 @@ The sidebar footer contains, by default, a link to your site homepage. You can c
 
 You can also set the option to `false` to disable it entirely.
 
-### Sidebar page order
+### Sidebar Page Order
 
 To quickly arrange the order of items in the sidebar, you can reorder the page identifiers in the list and the links will be sorted in that order. Link items without an entry here will fall back to the default priority of 999, putting them last.
 
@@ -213,7 +213,7 @@ To quickly arrange the order of items in the sidebar, you can reorder the page i
 
 See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
 
-### Automatic sidebar group labels
+### Automatic Sidebar Group Labels
 
 When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names. If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file. The array key is the directory name, and the value is the label.
 
@@ -227,7 +227,7 @@ Please note that this option is not added to the config file by default, as it's
 ],
 ```
 
-### Table of contents settings
+### Table of Contents Settings
 
 Hyde automatically generates a table of contents for the page and adds it to the sidebar.
 
@@ -243,7 +243,7 @@ In the `config/docs.php` file you can configure the behaviour, content, and the
 ],
 ```
 
-### Using flattened output paths
+### Using Flattened Output Paths
 
 If this setting is set to true, Hyde will output all documentation pages into the same configured documentation output directory. This means that you can use the automatic directory-based grouping feature, but still have a "flat" output structure. Note that this means that you can't have two documentation pages with the same filename or navigation menu label as they will overwrite each other.
 
@@ -271,7 +271,7 @@ The search feature is enabled by default. You can disable it by removing the `Do
 ],
 ```
 
-### Using the search
+### Using the Search
 
 The search works by generating a JSON search index which the JavaScript plugin loads asynchronously.
 
@@ -281,7 +281,7 @@ The second method is a button added to the documentation pages, similar to how A
 
 >info The full page can be disabled by setting `create_search_page` to `false` in the `docs` config.
 
-### Hiding pages from indexing
+### Hiding Pages from Indexing
 
 If you have a large page on your documentation site, like a changelog, you may want to hide it from the search index. You can do this by adding the page identifier to the `exclude_from_search` array in the `docs` config, similar to how navigation menu items are hidden. The page will still be accessible as normal but will not be added to the search index JSON file.
 
@@ -292,7 +292,7 @@ If you have a large page on your documentation site, like a changelog, you may w
 ]
 ```
 
-### Live search with the realtime compiler
+### Live Search with the Realtime Compiler
 
 The Realtime Compiler that powers the `php hyde serve` command will automatically generate a fresh search index each time the browser requests it.
 
@@ -316,7 +316,7 @@ Here's an example configuration from the official HydePHP.com documentation:
 'source_file_location_base' => 'https://github.com/hydephp/docs/blob/master/',
 ```
 
-#### Changing the button text
+#### Changing the Button Text
 
 Changing the label is easy, just change the following config setting:
 
@@ -325,7 +325,7 @@ Changing the label is easy, just change the following config setting:
 'edit_source_link_text' => 'Edit Source on GitHub',
 ```
 
-#### Changing the position
+#### Changing the Position
 
 By default, the button will be shown in the documentation page footer. You can change this by setting the following config setting to `'header'`, `'footer'`, or `'both'`
 
@@ -334,7 +334,7 @@ By default, the button will be shown in the documentation page footer. You can c
 'edit_source_link_position' => 'header',
 ```
 
-#### Adding a button icon
+#### Adding a Button Icon
 
 This is not included out of the box, but is easy to add with some CSS! Just target the `.edit-page-link` class.
 
@@ -343,6 +343,6 @@ This is not included out of the box, but is easy to add with some CSS! Just targ
 .edit-page-link::before {content: "✏ "}
 ```
 
-#### Changing the Blade view
+#### Changing the Blade View
 
 You can also publish the `edit-source-button.blade.php` view and change it to your liking.

From 7021d23d5e65507b6513456f63feaef27e5fc93c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:34:46 +0200
Subject: [PATCH 2626/2811] Fix clarity

---
 docs/digging-deeper/navigation.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index e9ae8e50818..04832cdb3b9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -107,8 +107,8 @@ navigation:
 
 Let's explore how to customize navigation menus using configuration files:
 
-- For the main navigation menu, use `navigation` setting in the `hyde.php` config file.
-- For the sidebar, use `sidebar` setting in the `docs.php` config file.
+- For the main navigation menu, use the `navigation` setting in the `hyde.php` config file.
+- For the sidebar, use the `sidebar` setting in the `docs.php` config file.
 
 When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
 

From 1eb578ce29a1de6d03b703464b5b5a774afb09d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:34:59 +0200
Subject: [PATCH 2627/2811] Fix title formatting

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 04832cdb3b9..a25c4329b8f 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -181,7 +181,7 @@ You could also combine these methods if desired:
 ]
 ```
 
-### Changing Menu item Labels
+### Changing Menu Item Labels
 
 Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
 

From 14c5ac64e24340959210be825b763b929775f671 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:35:07 +0200
Subject: [PATCH 2628/2811] Use shorter synonym

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index a25c4329b8f..bd0cfe13260 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -201,7 +201,7 @@ If you're not happy with these, it's easy to override navigation link labels by
 
 ### Excluding Items (Blacklist)
 
-When you have a lot of pages, it may be useful to prevent links from being added to the main navigation menu.
+When you have many pages, it may be useful to prevent links from being added to the main navigation menu.
 
 To exclude items from being added, simply add the page's route key to the navigation blacklist in the Hyde config:
 

From 18fafba70484ded8328de00b272120b4698c2960 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:35:38 +0200
Subject: [PATCH 2629/2811] Remove comma from coupled clauses

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index bd0cfe13260..561281a3bac 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -20,7 +20,7 @@ This documentation will guide you through the customization process. To learn ev
 
 ### Internal Structure Overview
 
-Internally, both navigation menu types extend the same base class, and thus share core functionality. This means the configuration process is similar for both types, making the documentation applicable to both.
+Internally, both navigation menu types extend the same base class and thus share core functionality. This means the configuration process is similar for both types, making the documentation applicable to both.
 
 For a deeper understanding of the internal workings, refer to the [Digging Deeper](#digging-deeper-into-the-internals) section.
 

From fcc030d65aa0b115c5a19ead2683df738ba51342 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:35:49 +0200
Subject: [PATCH 2630/2811] Reword line to be more fluent

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 561281a3bac..8019adf378e 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -33,7 +33,7 @@ All navigation menu items have an internal priority value determining their orde
 Here's an overview of what you can customize in your navigation menus:
 
 - Item labels: The text displayed in menu links
-- Item priorities: Control the order of link appearance
+- Item priorities: Control the order in which links appear
 - Item visibility: Choose to hide or show pages in the menu
 - Item grouping: Group pages together in dropdowns or sidebar categories
 

From 714e941f0d4e07b08946f025d6fa8eab954de367 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:40:46 +0200
Subject: [PATCH 2631/2811] Use plural wording to match other pluralized terms
 in sentence

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 8019adf378e..5772e667c58 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -183,7 +183,7 @@ You could also combine these methods if desired:
 
 ### Changing Menu Item Labels
 
-Hyde makes a few attempts to find a suitable label for the navigation menu items to automatically create helpful titles.
+Hyde makes a few attempts to find suitable labels for the navigation menu items to automatically create helpful titles.
 
 If you're not happy with these, it's easy to override navigation link labels by mapping the route key to the desired title in the Hyde config:
 

From 1bea0eff74c4b698c6d3ebf0141822903d6d486a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:40:55 +0200
Subject: [PATCH 2632/2811] Add missing infix

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 5772e667c58..4f9f4407567 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -248,7 +248,7 @@ You can configure how subdirectories should be displayed in the menu:
 
 **Supported Options:**
 - `dropdown`: Pages in subdirectories are displayed in a dropdown menu
-- `hidden`: Pages in subdirectories are not displayed at all the menus
+- `hidden`: Pages in subdirectories are not displayed at all in the menus
 - `flat`: Pages in subdirectories are displayed as individual items
 
 ### Automatic Menu Groups

From d269f6aa981fcd063d93e79057b18f14efe334c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:41:19 +0200
Subject: [PATCH 2633/2811] Add comma between independent clauses

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 4f9f4407567..1c729c6bf28 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -266,7 +266,7 @@ Enable this feature in the `hyde.php` config file by setting the `subdirectory_d
 ],
 ```
 
-Now if you create a page called `_pages/about/contact.md` it will automatically be placed in a dropdown called "About".
+Now if you create a page called `_pages/about/contact.md`, it will automatically be placed in a dropdown called "About".
 
 #### Automatic Documentation Sidebar Grouping
 

From 74c4924e24c44134f00d9a5adf62102cc64b070e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:41:27 +0200
Subject: [PATCH 2634/2811] Fix typo should be a comma

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1c729c6bf28..cad3ff23fd3 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -294,7 +294,7 @@ _pages/
   03-contact.md  # Priority: 3 (saved to _site/contact.html)
 ```
 
-As you can seem Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
+As you can see, Hyde parses the number from the filename and uses it as the priority for the page in navigation menus, while stripping the prefix from the route key.
 
 ### Important Notes
 

From c00ab1b394d3337b43eb687ba1b11a968a8213c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:41:33 +0200
Subject: [PATCH 2635/2811] Add missing word

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index cad3ff23fd3..6dbfcca6c9a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -311,7 +311,7 @@ This feature integrates well with automatic subdirectory-based navigation groupi
 1. You can use numerical prefixes in subdirectories to control the dropdown/sidebar order.
 2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
 
-Here is an example structure of how could organize a documentation site:
+Here is an example structure of how you could organize a documentation site:
 
 ```shell
 _docs/

From 8129241d413a1d92d1f08e1ee6de895937a5a22d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:41:49 +0200
Subject: [PATCH 2636/2811] Remove comma from coupled clauses

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 6dbfcca6c9a..532c40ab24a 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -118,7 +118,7 @@ The `navigation.order` and `sidebar.order` settings allow you to customize the o
 
 #### Basic Priority Syntax
 
-A nice and simple way to define the order of pages, is to add their route keys as a simple list array. We'll then match that array order.
+A nice and simple way to define the order of pages is to add their route keys as a simple list array. We'll then match that array order.
 
 It may be useful to know that we internally will assign a priority calculated according to its position in the list, plus an offset of `500`. The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
 

From 312135ee71eefc64e64ab3c7dc911adc6a605e3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:42:00 +0200
Subject: [PATCH 2637/2811] Change word order to be more fluent

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 532c40ab24a..1e8c73bce68 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -26,7 +26,7 @@ For a deeper understanding of the internal workings, refer to the [Digging Deepe
 
 ### Understanding Priorities
 
-All navigation menu items have an internal priority value determining their order. Lower values place items higher in the menu. The default priority for pages is `999`, placing them last unless you specify a value. Some pages, like the `index` page, are by default configured with the lowest priority of `0`.
+All navigation menu items have an internal priority value determining their order. Lower values place items higher in the menu. The default priority for pages is `999`, placing them last unless you specify a value. Some pages, like the `index` page, are configured by default with the lowest priority of `0`.
 
 ### Customization Options
 

From e46b837feec20ec8673068ded7ef346e22cd158f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:42:38 +0200
Subject: [PATCH 2638/2811] Split out coupled clause to standalone sentence

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1e8c73bce68..b79b2f39478 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -285,7 +285,7 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
 
-This has the great benefit of matching the navigation menu layout with the file structure view, and works especially great with subdirectory-based navigation grouping.
+This has the great benefit of matching the navigation menu layout with the file structure view. It also works especially well with subdirectory-based navigation grouping.
 
 ```shell
 _pages/

From a5df67f53181ebc8277d9f25fa9e675a19a0c08a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 15:42:54 +0200
Subject: [PATCH 2639/2811] Reword to pluralize feature in introduction

---
 docs/digging-deeper/navigation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index b79b2f39478..95e926b45c9 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -8,7 +8,7 @@ navigation:
 
 ## Introduction
 
-HydePHP offers an automatic navigation menu and documentation sidebar generation feature, designed to take the pain out of creating navigation menus.
+HydePHP offers automatic navigation menu and documentation sidebar generation features, designed to take the pain out of creating navigation menus.
 While Hyde does its best to configure these menus automatically based on understanding your project files, you may want to customize them further.
 
 There are two types of navigation menus in Hyde:

From 5a5d36d9c593a914e2c71a3d9ded631f7ed0b73c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:28:58 +0200
Subject: [PATCH 2640/2811] Move the sidebar documentation to the documentation
 pages page

---
 docs/creating-content/documentation-pages.md | 47 +++++++++++-
 docs/digging-deeper/customization.md         |  7 +-
 docs/digging-deeper/navigation.md            | 78 ++++----------------
 3 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 185a6539b2f..08cb115a596 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -100,7 +100,52 @@ navigation:
     priority: 5
 ```
 
-You can also change the order in the `config/docs.php` configuration file, which may be easier to manage for larger sites. See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details.
+You can also change the order in the `config/docs.php` configuration file, which may be easier to manage for larger sites.
+
+#### Basic Priority Syntax
+
+A nice and simple way to define the order of pages is to add their route keys as a simple list array. Hyde will then match that array order.
+
+It may be useful to know that Hyde internally will assign a priority calculated according to its position in the list, plus an offset of `500`. The offset is added to make it easier to place pages earlier in the list using front matter or with explicit priority settings.
+
+```php
+// filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme', // Priority: 500
+        'installation', // Priority: 501
+        'getting-started', // Priority: 502
+    ]
+]
+```
+
+#### Explicit Priority Syntax
+
+You can also specify explicit priorities by adding a value to the array keys. Hyde will then use these exact values as the priorities.
+
+```php
+// filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme' => 10,
+        'installation' => 15,
+        'getting-started' => 20,
+    ]
+]
+```
+
+You could also combine these methods if desired:
+
+```php
+// filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme' => 10, // Priority: 10
+        'installation', // Priority: 500
+        'getting-started', // Priority: 501
+    ]
+]
+```
 
 ### Sidebar Labels
 
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 19b78e541f7..f9c7a0f5682 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -283,15 +283,18 @@ Still, you will likely want to customize some parts of these menus, and thankful
 
 - To customize the navigation menu, use the setting `navigation.order` in the `hyde.php` config.
 - When customizing the navigation menu, you should use the [route key](core-concepts#route-keys) of the page.
+- You can use either a basic list array or specify explicit priorities.
 
 Learn more in the [Navigation Menu](navigation) documentation.
 
 #### Customizing the documentation sidebar
 
 - To customize the sidebar, use the setting `sidebar.order` in the `docs.php` config.
-- When customizing the sidebar, can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
+- When customizing the sidebar, you can use the route key, or just the [page identifier](core-concepts#page-identifiers) of the page.
+- Similar to the navigation menu, you can use a basic list array or specify explicit priorities.
+- You can also use front matter in individual documentation pages to customize their appearance and behavior in the sidebar.
 
-Learn more in the [Documentation Pages](documentation-pages) documentation.
+Learn more in the [Documentation Pages](documentation-pages#sidebar) documentation.
 
 ## Additional Advanced Options
 
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 95e926b45c9..1eaa8464876 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -8,7 +8,7 @@ navigation:
 
 ## Introduction
 
-HydePHP offers automatic navigation menu and documentation sidebar generation features, designed to take the pain out of creating navigation menus.
+HydePHP offers automatic navigation menu generation features, designed to take the pain out of creating navigation menus.
 While Hyde does its best to configure these menus automatically based on understanding your project files, you may want to customize them further.
 
 There are two types of navigation menus in Hyde:
@@ -16,7 +16,7 @@ There are two types of navigation menus in Hyde:
 1. **Primary Navigation Menu**: The main navigation menu appearing on most pages of your site. Unique features include dropdowns for subdirectories, depending on configuration.
 2. **Documentation Sidebar**: The sidebar on documentation pages with links to other documentation pages. Unique features include automatic grouping based on subdirectories.
 
-This documentation will guide you through the customization process. To learn even more about sidebars, visit the [Documentation Pages](documentation-pages) documentation.
+This documentation will guide you through the customization process of the primary navigation menu. To learn about the documentation sidebar, visit the [Documentation Pages](documentation-pages) documentation.
 
 ### Internal Structure Overview
 
@@ -43,11 +43,10 @@ Hyde provides multiple ways to customize navigation menus to suit your needs:
 
 1. Front matter data in Markdown and Blade page files, applicable to all menu types
 2. Configuration in the `hyde` config file for main navigation items
-3. Configuration in the `docs` config file for documentation sidebar items
 
 Keep in mind that front matter data overrides dynamically inferred or config-defined priorities. While useful for quick one-off changes on small sites, it can make reordering items later on more challenging as you can't see the entire structure at once.
 
-Additionally, general options for the entire navigation menus are also available in the `hyde` and `docs` config files.
+Additionally, general options for the entire navigation menus are also available in the `hyde` config file.
 
 ## Front Matter Configuration
 
@@ -105,16 +104,15 @@ navigation:
 
 ## Config File Configuration
 
-Let's explore how to customize navigation menus using configuration files:
+Let's explore how to customize the main navigation menu using configuration files:
 
 - For the main navigation menu, use the `navigation` setting in the `hyde.php` config file.
-- For the sidebar, use the `sidebar` setting in the `docs.php` config file.
 
-When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page. For the sidebar, you can use either the route key or the [page identifier](core-concepts#page-identifiers).
+When customizing the main navigation menu, use the [route key](core-concepts#route-keys) of the page.
 
 ### Changing Priorities
 
-The `navigation.order` and `sidebar.order` settings allow you to customize the order of pages in the navigation menus.
+The `navigation.order` setting allows you to customize the order of pages in the main navigation menu.
 
 #### Basic Priority Syntax
 
@@ -133,17 +131,6 @@ It may be useful to know that we internally will assign a priority calculated ac
 ]
 ```
 
-```php
-// filepath: config/docs.php
-'sidebar' => [
-    'order' => [
-        'readme', // Priority: 500
-        'installation', // Priority: 501
-        'getting-started', // Priority: 502
-    ]
-]
-```
-
 #### Explicit Priority Syntax
 
 You can also specify explicit priorities by adding a value to the array keys. We'll then use these exact values as the priorities.
@@ -159,25 +146,16 @@ You can also specify explicit priorities by adding a value to the array keys. We
 ]
 ```
 
-```php
-// filepath: config/docs.php
-'sidebar' => [
-    'order' => [
-        'readme' => 10,
-        'installation' => 15,
-        'getting-started' => 20,
-    ]
-]
-```
-
 You could also combine these methods if desired:
 
 ```php
-// filepath: Applicable to both
-[
-    'readme' => 10, // Priority: 10
-    'installation', // Priority: 500
-    'getting-started', // Priority: 501
+// filepath: config/hyde.php
+'navigation' => [
+    'order' => [
+        'home' => 10, // Priority: 10
+        'about', // Priority: 500
+        'contact', // Priority: 501
+    ]
 ]
 ```
 
@@ -197,8 +175,6 @@ If you're not happy with these, it's easy to override navigation link labels by
 ]
 ```
 
-**Note:** This feature is not yet supported for the sidebar.
-
 ### Excluding Items (Blacklist)
 
 When you have many pages, it may be useful to prevent links from being added to the main navigation menu.
@@ -268,14 +244,6 @@ Enable this feature in the `hyde.php` config file by setting the `subdirectory_d
 
 Now if you create a page called `_pages/about/contact.md`, it will automatically be placed in a dropdown called "About".
 
-#### Automatic Documentation Sidebar Grouping
-
-This feature is always enabled for documentation pages. Simply place your pages in subdirectories to have them grouped in the sidebar.
-
-For example: `_docs/getting-started/installation.md` will be placed in a group called "Getting Started".
-
->info Tip: When using subdirectory-based dropdowns, you can set their priority using the directory name as the array key.
-
 #### Dropdown Menu Notes
 
 - Dropdowns take priority over standard items. If you have a dropdown with the key `about` and a page with the key `about`, the dropdown will be created, and the page won't be in the menu.
@@ -283,7 +251,7 @@ For example: `_docs/getting-started/installation.md` will be placed in a group c
 
 ## Numerical Prefix Navigation Ordering
 
-HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for both the primary navigation menu and the documentation sidebar.
+HydePHP v2 introduces navigation item ordering based on numerical prefixes in filenames. This feature works for the primary navigation menu.
 
 This has the great benefit of matching the navigation menu layout with the file structure view. It also works especially well with subdirectory-based navigation grouping.
 
@@ -308,25 +276,9 @@ As you can see, Hyde parses the number from the filename and uses it as the prio
 
 This feature integrates well with automatic subdirectory-based navigation grouping. Here are two useful tips:
 
-1. You can use numerical prefixes in subdirectories to control the dropdown/sidebar order.
+1. You can use numerical prefixes in subdirectories to control the dropdown order.
 2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
 
-Here is an example structure of how you could organize a documentation site:
-
-```shell
-_docs/
-  01-getting-started/
-    01-installation.md
-    02-requirements.md
-    03-configuration.md
-  02-usage/
-    01-quick-start.md
-    02-advanced-usage.md
-  03-features/
-    01-feature-1.md
-    02-feature-2.md
-```
-
 ### Customization
 
 If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.

From 8427e55bb455cc446ba07b9eb75a6691c99aae74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:29:43 +0200
Subject: [PATCH 2641/2811] Add lost section

---
 docs/creating-content/documentation-pages.md | 55 ++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 08cb115a596..5341159625b 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -272,6 +272,61 @@ Please note that this option is not added to the config file by default, as it's
 ],
 ```
 
+### Numerical Prefix Sidebar Ordering
+
+HydePHP v2 introduces sidebar item ordering based on numerical prefixes in filenames. This feature works for the documentation sidebar.
+
+This has the great benefit of matching the sidebar layout with the file structure view. It also works especially well with subdirectory-based sidebar grouping.
+
+```shell
+_docs/
+  01-installation.md     # Priority: 1
+  02-configuration.md    # Priority: 2
+  03-usage.md            # Priority: 3
+```
+
+As you can see, Hyde parses the number from the filename and uses it as the priority for the page in the sidebar, while stripping the prefix from the route key.
+
+#### Important Notes
+
+1. The numerical prefix remains part of the page identifier but is stripped from the route key.
+   For example: `_docs/01-installation.md` has route key `installation` and page identifier `01-installation`.
+2. You can delimit the numerical prefix with either a dash or an underscore.
+   For example: Both `_docs/01-installation.md` and `_docs/01_installation.md` are valid.
+3. Leading zeros are optional. `_docs/1-installation.md` is equally valid.
+
+#### Using Numerical Prefix Ordering in Subdirectories
+
+This feature integrates well with automatic subdirectory-based sidebar grouping. Here's an example of how you could organize a documentation site:
+
+```shell
+_docs/
+  01-getting-started/
+    01-installation.md
+    02-requirements.md
+    03-configuration.md
+  02-usage/
+    01-quick-start.md
+    02-advanced-usage.md
+  03-features/
+    01-feature-1.md
+    02-feature-2.md
+```
+
+Here are two useful tips:
+
+1. You can use numerical prefixes in subdirectories to control the sidebar group order.
+2. The numbering within a subdirectory works independently of its siblings, so you can start from one in each subdirectory.
+
+#### Customization
+
+If you're not interested in using numerical prefix ordering, you can disable it in the Hyde config file. Hyde will then no longer extract the priority and will no longer strip the prefix from the route key.
+
+```php
+// filepath: config/hyde.php
+'numerical_page_ordering' => false,
+```
+
 ### Table of Contents Settings
 
 Hyde automatically generates a table of contents for the page and adds it to the sidebar.

From 68f3d33d9d1fd8beb258938e32f3d6084a037be8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:43:03 +0200
Subject: [PATCH 2642/2811] Remove documentation for syntax with no benefit

---
 docs/creating-content/documentation-pages.md | 13 -------------
 docs/digging-deeper/navigation.md            | 13 -------------
 2 files changed, 26 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 5341159625b..3c7d7680026 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -134,19 +134,6 @@ You can also specify explicit priorities by adding a value to the array keys. Hy
 ]
 ```
 
-You could also combine these methods if desired:
-
-```php
-// filepath: config/docs.php
-'sidebar' => [
-    'order' => [
-        'readme' => 10, // Priority: 10
-        'installation', // Priority: 500
-        'getting-started', // Priority: 501
-    ]
-]
-```
-
 ### Sidebar Labels
 
 The sidebar items are labelled with the `label` property. The default label is generated from the filename of the file.
diff --git a/docs/digging-deeper/navigation.md b/docs/digging-deeper/navigation.md
index 1eaa8464876..ffef925624d 100644
--- a/docs/digging-deeper/navigation.md
+++ b/docs/digging-deeper/navigation.md
@@ -146,19 +146,6 @@ You can also specify explicit priorities by adding a value to the array keys. We
 ]
 ```
 
-You could also combine these methods if desired:
-
-```php
-// filepath: config/hyde.php
-'navigation' => [
-    'order' => [
-        'home' => 10, // Priority: 10
-        'about', // Priority: 500
-        'contact', // Priority: 501
-    ]
-]
-```
-
 ### Changing Menu Item Labels
 
 Hyde makes a few attempts to find suitable labels for the navigation menu items to automatically create helpful titles.

From 8d06b5e6f3b4f8937badfc298ff758a231e31f3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:43:46 +0200
Subject: [PATCH 2643/2811] Normalize spelling

---
 docs/creating-content/documentation-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 3c7d7680026..5bc9a900133 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -162,7 +162,7 @@ navigation:
 
 #### Automatic Subdirectory-Based Grouping
 
-You can also automatically group your documentation pages by placing source files in sub-directories.
+You can also automatically group your documentation pages by placing source files in subdirectories.
 
 For example, putting a Markdown file in `_docs/getting-started/` is equivalent to adding the same front matter seen above.
 

From c2dcb0fd2498a9cc31b779d370dd8de9c232f926 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:53:30 +0200
Subject: [PATCH 2644/2811] Restructure and improve the documentation

---
 docs/creating-content/documentation-pages.md | 27 +++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 5bc9a900133..0819dc267e9 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -166,9 +166,7 @@ You can also automatically group your documentation pages by placing source file
 
 For example, putting a Markdown file in `_docs/getting-started/` is equivalent to adding the same front matter seen above.
 
->info Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they would overwrite each other.
-
->info Tip: When using subdirectory-based grouping, you can set the priority of the groups using the directory name as the array key in the config file.
+>warning Note that when the [flattened output paths](#using-flattened-output-paths) setting is enabled (which it is by default), the file will still be compiled to the `_site/docs/` directory like it would be if you didn't use the subdirectories. Note that this means that you can't have two documentation pages with the same filename as they would overwrite each other.
 
 ### Hiding Items
 
@@ -245,11 +243,9 @@ To quickly arrange the order of items in the sidebar, you can reorder the page i
 
 See [the chapter in the customization page](customization#navigation-menu--sidebar) for more details. <br>
 
-### Automatic Sidebar Group Labels
-
-When using the automatic sidebar grouping feature (based on subdirectories), the titles of the groups are generated from the directory names. If these are not to your liking, for example if you need to use special characters, you can override them in the Docs configuration file. The array key is the directory name, and the value is the label.
+### Setting Sidebar Group Labels
 
-Please note that this option is not added to the config file by default, as it's not a super common use case. No worries though, just add the following yourself!
+When using the automatic sidebar grouping feature the titles of the groups are generated from the subdirectory names. If these are not to your liking, for example if you need to use special characters, you can override them in the configuration file. The array key is the directory name, and the value is the label.
 
 ```php
 // Filepath: config/docs.php
@@ -259,6 +255,23 @@ Please note that this option is not added to the config file by default, as it's
 ],
 ```
 
+Please note that this option is not added to the config file by default, as it's not a super common use case. No worries though, just add the following yourself!
+
+#### Setting Group Priorities
+
+When using subdirectory-based grouping, you can set the priority of the groups using the directory name as the array key in the config file:
+
+```php
+// Filepath: config/docs.php
+'sidebar' => [
+    'order' => [
+        'readme',
+        'installation',
+        'getting-started',
+    ],
+],
+```
+
 ### Numerical Prefix Sidebar Ordering
 
 HydePHP v2 introduces sidebar item ordering based on numerical prefixes in filenames. This feature works for the documentation sidebar.

From 358bfcc81207676c44580dd8281f03987e2e83af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:57:24 +0200
Subject: [PATCH 2645/2811] Improve priority setting

---
 docs/creating-content/documentation-pages.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/creating-content/documentation-pages.md b/docs/creating-content/documentation-pages.md
index 0819dc267e9..2238f6777d9 100644
--- a/docs/creating-content/documentation-pages.md
+++ b/docs/creating-content/documentation-pages.md
@@ -257,9 +257,11 @@ When using the automatic sidebar grouping feature the titles of the groups are g
 
 Please note that this option is not added to the config file by default, as it's not a super common use case. No worries though, just add the following yourself!
 
-#### Setting Group Priorities
+#### Setting Sidebar Group Priorities
 
-When using subdirectory-based grouping, you can set the priority of the groups using the directory name as the array key in the config file:
+By default, each group will be assigned the lowest priority found inside the group. However, you can specify the order and priorities for sidebar group keys the same way you can for the sidebar items.
+
+Just use the sidebar group key as instead of the page identifier/route key:
 
 ```php
 // Filepath: config/docs.php

From 2d5edf6967b963010f0ff171bcd5bb2cd2796715 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 17:58:35 +0200
Subject: [PATCH 2646/2811] Add todo

---
 .../Framework/Features/Navigation/NavigationMenuGenerator.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
index 94976bcff51..02467e4c986 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenuGenerator.php
@@ -194,6 +194,7 @@ protected function normalizeGroupLabel(string $label): string
 
     protected function searchForGroupLabelInConfig(string $groupKey): ?string
     {
+        // TODO: Normalize this: sidebar_group_labels -> docs.sidebar.labels
         return $this->getConfigArray($this->generatesSidebar ? 'docs.sidebar_group_labels' : 'hyde.navigation.labels')[$groupKey] ?? null;
     }
 

From 3cbc864bae54f28e5bf33f43e2eb98757e31013b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 18:13:08 +0200
Subject: [PATCH 2647/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 998c920ef11..ac9d8bce2e2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,6 +15,9 @@ This serves two purposes:
 - Added a new `\Hyde\Framework\Exceptions\ParseException` exception class to handle parsing exceptions in data collection files in https://github.com/hydephp/develop/pull/1732
 - Added a new `\Hyde\Framework\Exceptions\InvalidConfigurationException` exception class to handle invalid configuration exceptions in https://github.com/hydephp/develop/pull/1799
 - The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
+- Added support for setting custom navigation items in the YAML configuration in https://github.com/hydephp/develop/pull/1818
+- Added support for setting extra attributes for navigation items in https://github.com/hydephp/develop/pull/1824
+- Introduced a new navigation config builder class to simplify navigation configuration in https://github.com/hydephp/develop/pull/1827
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
@@ -23,6 +26,8 @@ This serves two purposes:
 - **Breaking:** The `hyde.authors` config setting should now be keyed by the usernames. For more information, see below.
 - **Breaking:** The `Author::create()` method now returns an array instead of a `PostAuthor` instance. For more information, see below.
 - **Breaking:** The `Author::get()` method now returns `null` if an author is not found, rather than creating a new instance. For more information, see below.
+- **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
+- **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
 - Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
 - Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
 - Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)

From a313579797704cf18ed5f8cc9efccf2d368f1750 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 18:13:36 +0200
Subject: [PATCH 2648/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index ac9d8bce2e2..d090a09cdca 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -48,6 +48,8 @@ This serves two purposes:
 - Calling the `DataCollection` methods will no longer create the data collections directory in https://github.com/hydephp/develop/pull/1732
 - Markdown includes are now converted to HTML using the custom HydePHP Markdown service, meaning they now support full GFM spec and custom Hyde features like colored blockquotes and code block filepath labels in https://github.com/hydephp/develop/pull/1738
 - Markdown returned from includes are now trimmed of trailing whitespace and newlines in https://github.com/hydephp/develop/pull/1738
+- Reorganized and cleaned up the navigation and sidebar documentation for improved clarity.
+- Moved the sidebar documentation to the documentation pages section for better organization.
 
 ### Deprecated
 - for soon-to-be removed features.

From e2cdca688aebae71b89d08d5c9e2e3880c78cc07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 18:15:54 +0200
Subject: [PATCH 2649/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 75 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d090a09cdca..1bd2a7a4fcd 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -340,3 +340,78 @@ For example, an empty or malformed JSON file will now throw an exception like th
 
 In order to normalize the thrown exceptions, we now rethrow the `ParseException` from `Symfony/Yaml` as our custom `ParseException` to match the JSON and Markdown validation.
 Additionally, an exception will be thrown if a data file is empty, as this is unlikely to be intentional. Markdown files can have an empty body if front matter is present.
+
+## New features
+
+<!-- Editors note: Todo: Maybe move to the relevant docs... -->
+
+### Navigation configuration changes
+
+The custom navigation item configuration format has been updated to use array inputs. This change allows for more flexibility and consistency in defining navigation items.
+
+#### Old format:
+
+```php
+'navigation' => [
+    'custom_items' => [
+        'Custom Item' => '/custom-page',
+    ],
+],
+```
+
+#### New format:
+
+```php
+'navigation' => [
+    'custom_items' => [
+        ['label' => 'Custom Item', 'destination' => '/custom-page'],
+    ],
+],
+```
+
+Additionally, the `hyde.navigation.subdirectories` configuration option has been renamed to `hyde.navigation.subdirectory_display`. Update your configuration files accordingly.
+
+### YAML configuration for navigation items
+
+You can now set custom navigation items directly in your YAML configuration files. This provides an alternative to defining them in the PHP configuration files.
+
+Example:
+
+```yaml
+navigation:
+  custom_items:
+    - label: Custom Item
+      destination: /custom-page
+```
+
+### Extra attributes for navigation items
+
+Navigation items now support extra attributes, allowing you to add custom data or styling to your navigation elements. You can set these attributes in both PHP and YAML configurations.
+
+Example in PHP:
+
+```php
+'navigation' => [
+    'custom_items' => [
+        [
+            'label' => 'Custom Item',
+            'destination' => '/custom-page',
+            'attributes' => ['class' => 'special-link', 'target' => '_blank'],
+        ],
+    ],
+],
+```
+
+Example in YAML:
+
+```yaml
+navigation:
+  custom_items:
+    - label: Custom Item
+      destination: /custom-page
+      attributes:
+        class: special-link
+        target: _blank
+```
+
+These changes provide more flexibility and control over your site's navigation structure. Make sure to update your configuration files and any custom code that interacts with navigation items to align with these new formats and features.

From 84f92a9e85bba40b481e7181d7a6ea301d829a72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 12 Jul 2024 18:17:56 +0200
Subject: [PATCH 2650/2811] Clarify test name and fix invalid option

---
 .../tests/Feature/AutomaticNavigationConfigurationsTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
index 8d3ee0e380d..1c3d0e3611d 100644
--- a/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
+++ b/packages/framework/tests/Feature/AutomaticNavigationConfigurationsTest.php
@@ -899,12 +899,12 @@ public function testDocumentationPagesInSubdirectoriesAreAddedToSidebar()
         ]);
     }
 
-    public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfConfiguration()
+    public function testPagesInSubdirectoriesAreAddedToSidebarRegardlessOfHydeConfiguration()
     {
         $options = ['dropdown', 'flat', 'hidden'];
 
         foreach ($options as $option) {
-            config(['docs.sidebar.subdirectories' => $option]);
+            config(['hyde.navigation.subdirectory_display' => $option]);
 
             $this->assertSidebarEquals([[
                 'label' => 'About',

From 8d4a0a305035ffd37ad5d9b8496e9c66a870a3f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 14:35:30 +0200
Subject: [PATCH 2651/2811] Change test teardown type

---
 packages/framework/tests/Unit/RouteKeyTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index cc30305afd5..3e0e8bf9943 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -145,7 +145,7 @@ public function testItDoesNotExtractNonNumericalFilenamePrefixes()
         $this->assertSame('abc-bar', RouteKey::fromPage(InMemoryPage::class, 'abc-bar')->get());
     }
 
-    public static function tearDownAfterClass(): void
+    protected function tearDown(): void
     {
         MarkdownPage::setOutputDirectory('');
     }

From 8db58efc1259033665922b75bf89eccecdb930ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 14:35:38 +0200
Subject: [PATCH 2652/2811] Test with Markdown page

---
 .../framework/tests/Unit/RouteKeyTest.php     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index 3e0e8bf9943..6cf11b989cb 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -97,52 +97,52 @@ public function testFromPageWithCustomNestedOutputDirectory()
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefix()
     {
-        $this->assertSame('test', RouteKey::fromPage(InMemoryPage::class, '01-test')->get());
+        $this->assertSame('test', RouteKey::fromPage(MarkdownPage::class, '01-test')->get());
     }
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixWithKebabCaseSyntax()
     {
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '01-foo')->get());
-        $this->assertSame('bar', RouteKey::fromPage(InMemoryPage::class, '02-bar')->get());
-        $this->assertSame('baz', RouteKey::fromPage(InMemoryPage::class, '03-baz')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '01-foo')->get());
+        $this->assertSame('bar', RouteKey::fromPage(MarkdownPage::class, '02-bar')->get());
+        $this->assertSame('baz', RouteKey::fromPage(MarkdownPage::class, '03-baz')->get());
     }
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixWithSnakeCaseSyntax()
     {
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '01_foo')->get());
-        $this->assertSame('bar', RouteKey::fromPage(InMemoryPage::class, '02_bar')->get());
-        $this->assertSame('baz', RouteKey::fromPage(InMemoryPage::class, '03_baz')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '01_foo')->get());
+        $this->assertSame('bar', RouteKey::fromPage(MarkdownPage::class, '02_bar')->get());
+        $this->assertSame('baz', RouteKey::fromPage(MarkdownPage::class, '03_baz')->get());
     }
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixRegardlessOfLeadingZeroes()
     {
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '123-foo')->get());
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '0123-foo')->get());
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '00123-foo')->get());
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '000123-foo')->get());
-        $this->assertSame('foo', RouteKey::fromPage(InMemoryPage::class, '0000123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '0123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '00123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '000123-foo')->get());
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, '0000123-foo')->get());
     }
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefixForNestedIdentifiers()
     {
-        $this->assertSame('foo/bar', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar')->get());
-        $this->assertSame('foo/bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/bar/02-baz')->get());
-        $this->assertSame('foo/bar/baz', RouteKey::fromPage(InMemoryPage::class, 'foo/01-bar/03-baz')->get());
+        $this->assertSame('foo/bar', RouteKey::fromPage(MarkdownPage::class, 'foo/01-bar')->get());
+        $this->assertSame('foo/bar/baz', RouteKey::fromPage(MarkdownPage::class, 'foo/bar/02-baz')->get());
+        $this->assertSame('foo/bar/baz', RouteKey::fromPage(MarkdownPage::class, 'foo/01-bar/03-baz')->get());
     }
 
     public function testItDoesNotExtractCoreIdentifierPartFromNumericalFilenamePrefixWhenFeatureIsDisabled()
     {
         self::mockConfig(['hyde.numerical_page_ordering' => false]);
 
-        $this->assertSame('01-test', RouteKey::fromPage(InMemoryPage::class, '01-test')->get());
-        $this->assertSame('01-home', RouteKey::fromPage(InMemoryPage::class, '01-home')->get());
-        $this->assertSame('01-404', RouteKey::fromPage(InMemoryPage::class, '01-404')->get());
+        $this->assertSame('01-test', RouteKey::fromPage(MarkdownPage::class, '01-test')->get());
+        $this->assertSame('01-home', RouteKey::fromPage(MarkdownPage::class, '01-home')->get());
+        $this->assertSame('01-404', RouteKey::fromPage(MarkdownPage::class, '01-404')->get());
     }
 
     public function testItDoesNotExtractNonNumericalFilenamePrefixes()
     {
-        $this->assertSame('foo-bar', RouteKey::fromPage(InMemoryPage::class, 'foo-bar')->get());
-        $this->assertSame('abc-bar', RouteKey::fromPage(InMemoryPage::class, 'abc-bar')->get());
+        $this->assertSame('foo-bar', RouteKey::fromPage(MarkdownPage::class, 'foo-bar')->get());
+        $this->assertSame('abc-bar', RouteKey::fromPage(MarkdownPage::class, 'abc-bar')->get());
     }
 
     protected function tearDown(): void

From 78cd93721510cfe075916d4f87fb13f601bed13b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 14:36:04 +0200
Subject: [PATCH 2653/2811] Move up teardown method

---
 packages/framework/tests/Unit/RouteKeyTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index 6cf11b989cb..a59848feb51 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -20,6 +20,11 @@ class RouteKeyTest extends UnitTestCase
 {
     protected static bool $needsConfig = true;
 
+    protected function tearDown(): void
+    {
+        MarkdownPage::setOutputDirectory('');
+    }
+
     public function testMake()
     {
         $this->assertEquals(RouteKey::make('foo'), new RouteKey('foo'));
@@ -144,9 +149,4 @@ public function testItDoesNotExtractNonNumericalFilenamePrefixes()
         $this->assertSame('foo-bar', RouteKey::fromPage(MarkdownPage::class, 'foo-bar')->get());
         $this->assertSame('abc-bar', RouteKey::fromPage(MarkdownPage::class, 'abc-bar')->get());
     }
-
-    protected function tearDown(): void
-    {
-        MarkdownPage::setOutputDirectory('');
-    }
 }

From 087f183ed8b0b8a0047ae80cfa19750934acb977 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 14:36:33 +0200
Subject: [PATCH 2654/2811] Inline teardown where needed

---
 packages/framework/tests/Unit/RouteKeyTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/RouteKeyTest.php b/packages/framework/tests/Unit/RouteKeyTest.php
index a59848feb51..6fe51cc403c 100644
--- a/packages/framework/tests/Unit/RouteKeyTest.php
+++ b/packages/framework/tests/Unit/RouteKeyTest.php
@@ -20,11 +20,6 @@ class RouteKeyTest extends UnitTestCase
 {
     protected static bool $needsConfig = true;
 
-    protected function tearDown(): void
-    {
-        MarkdownPage::setOutputDirectory('');
-    }
-
     public function testMake()
     {
         $this->assertEquals(RouteKey::make('foo'), new RouteKey('foo'));
@@ -92,12 +87,14 @@ public function testFromPageWithCustomOutputDirectory()
     {
         MarkdownPage::setOutputDirectory('foo');
         $this->assertEquals(new RouteKey('foo/bar'), RouteKey::fromPage(MarkdownPage::class, 'bar'));
+        MarkdownPage::setOutputDirectory('');
     }
 
     public function testFromPageWithCustomNestedOutputDirectory()
     {
         MarkdownPage::setOutputDirectory('foo/bar');
         $this->assertEquals(new RouteKey('foo/bar/baz'), RouteKey::fromPage(MarkdownPage::class, 'baz'));
+        MarkdownPage::setOutputDirectory('');
     }
 
     public function testItExtractsCoreIdentifierPartFromNumericalFilenamePrefix()

From 71549442574d1948632b0a11b9c0878ba197db5b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:00:03 +0200
Subject: [PATCH 2655/2811] Add booting/booted callbacks to the base
 HydeExtension class

---
 .../src/Foundation/Concerns/HydeExtension.php  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/HydeExtension.php b/packages/framework/src/Foundation/Concerns/HydeExtension.php
index 0eb9f6ccf0c..08f30b7e040 100644
--- a/packages/framework/src/Foundation/Concerns/HydeExtension.php
+++ b/packages/framework/src/Foundation/Concerns/HydeExtension.php
@@ -77,4 +77,22 @@ public function discoverRoutes(RouteCollection $collection): void
     {
         //
     }
+
+    /**
+     * Register a callback to be run before the kernel is booted.
+     * Override this method to define your booting logic.
+     */
+    public function booting(): void
+    {
+        //
+    }
+
+    /**
+     * Register a callback to be run after the kernel is booted.
+     * Override this method to define your booted logic.
+     */
+    public function booted(): void
+    {
+        //
+    }
 }

From 9b4b19fd6c6c9e65aa5c3e059e7b28d1ce80d3bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:00:54 +0200
Subject: [PATCH 2656/2811] Introduce local variable so we can use the instance

---
 .../framework/src/Foundation/Concerns/ManagesExtensions.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Concerns/ManagesExtensions.php b/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
index 080c74e5344..ec63d54074f 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
@@ -54,7 +54,8 @@ public function registerExtension(string $extension): void
             throw new InvalidArgumentException("Extension [$extension] is already registered.");
         }
 
-        $this->extensions[$extension] = new $extension();
+        $instance = new $extension();
+        $this->extensions[$extension] = $instance;
     }
 
     /**

From c1bf78fecb050bfbdfa1f022ccbd332a8672599a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:01:34 +0200
Subject: [PATCH 2657/2811] Register the boot callbacks with the extension

Much more elegant idea by Claude, compared to what I was thinking (looping extensions before/after boot)
---
 .../framework/src/Foundation/Concerns/ManagesExtensions.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Foundation/Concerns/ManagesExtensions.php b/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
index ec63d54074f..52de766e3cf 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesExtensions.php
@@ -56,6 +56,9 @@ public function registerExtension(string $extension): void
 
         $instance = new $extension();
         $this->extensions[$extension] = $instance;
+
+        $this->booting([$instance, 'booting']);
+        $this->booted([$instance, 'booted']);
     }
 
     /**

From 838dc6e4d0885624c59f4ac7ab89ca5e910be20e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:09:09 +0200
Subject: [PATCH 2658/2811] Update test to cover new callback methods

---
 .../Feature/HydeExtensionFeatureTest.php      | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
index 6ed83dd5793..a773e97f4f4 100644
--- a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
+++ b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
@@ -51,7 +51,7 @@ public function testHandlerMethodsAreCalledByDiscovery()
 
         $this->kernel->boot();
 
-        $this->assertSame(['files', 'pages', 'routes'], HydeTestExtension::$callCache);
+        $this->assertSame(['booting', 'files', 'pages', 'routes', 'booted'], HydeTestExtension::$callCache);
 
         HydeTestExtension::$callCache = [];
     }
@@ -133,6 +133,19 @@ public function testCustomRegisteredPagesAreDiscoveredByTheRouteCollectionClass(
         $this->assertEquals(new Route(new TestPageClass('bar')), Routes::get('foo/bar'));
     }
 
+    public function testBootingAndBootedMethodsAreCalled()
+    {
+        $this->kernel->registerExtension(BootableTestExtension::class);
+
+        $this->assertSame([], BootableTestExtension::$callCache);
+
+        $this->kernel->boot();
+
+        $this->assertSame(['booting', 'booted'], BootableTestExtension::$callCache);
+
+        BootableTestExtension::$callCache = [];
+    }
+
     protected function markTestSuccessful(): void
     {
         $this->assertTrue(true);
@@ -165,6 +178,16 @@ public function discoverRoutes(RouteCollection $collection): void
     {
         static::$callCache[] = 'routes';
     }
+
+    public function booting(): void
+    {
+        static::$callCache[] = 'booting';
+    }
+
+    public function booted(): void
+    {
+        static::$callCache[] = 'booted';
+    }
 }
 
 class HydeExtensionTestPage extends HydePage
@@ -225,3 +248,18 @@ public static function getCalled(string $method): array
         return self::$callCache[$method];
     }
 }
+
+class BootableTestExtension extends HydeExtension
+{
+    public static array $callCache = [];
+
+    public function booting(): void
+    {
+        static::$callCache[] = 'booting';
+    }
+
+    public function booted(): void
+    {
+        static::$callCache[] = 'booted';
+    }
+}

From 2f44b8501b7118bd69c85b3c9668eadef6204da3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:18:33 +0200
Subject: [PATCH 2659/2811] Document extension booting and booted callbacks

---
 docs/architecture-concepts/extensions-api.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/architecture-concepts/extensions-api.md b/docs/architecture-concepts/extensions-api.md
index d71e6a258b5..5213e0f139d 100644
--- a/docs/architecture-concepts/extensions-api.md
+++ b/docs/architecture-concepts/extensions-api.md
@@ -92,6 +92,24 @@ public function discoverRoutes(RouteCollection $collection): void;
 Any of these can be implemented in your extension class, and they will be called during the discovery. As you can see,
 the instance of the discovery collection is injected into the method for you to interact with.
 
+### Booting and Booted Callbacks
+
+In addition to the discovery handlers, you can also define `booting` and `booted` callbacks in your extension class. These methods allow you to run custom logic before and after the kernel boots, respectively.
+
+```php
+class JsonPageExtension extends HydeExtension {
+    public function booting(): void {
+        // This runs before the kernel boots, meaning pages have not been discovered yet
+    }
+
+    public function booted(): void {
+        // This runs after the kernel has booted, meaning pages have been discovered
+    }
+}
+```
+
+These methods are particularly useful for setting up your extension's environment or performing post-boot operations.
+
 #### Discovery handler example
 
 Let's go crazy and implement a discovery handler to collect `JsonPage` files from an external API! We will do this

From 798a948939358b09a23c928a8ebbae792e4e7543 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:26:38 +0200
Subject: [PATCH 2660/2811] Update extension boot callbacks to inject the
 kernel

---
 docs/architecture-concepts/extensions-api.md  | 12 +++++++----
 .../src/Foundation/Concerns/HydeExtension.php |  5 +++--
 .../Feature/HydeExtensionFeatureTest.php      | 21 ++++++++++++-------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/docs/architecture-concepts/extensions-api.md b/docs/architecture-concepts/extensions-api.md
index 5213e0f139d..2a5588927ae 100644
--- a/docs/architecture-concepts/extensions-api.md
+++ b/docs/architecture-concepts/extensions-api.md
@@ -94,21 +94,25 @@ the instance of the discovery collection is injected into the method for you to
 
 ### Booting and Booted Callbacks
 
-In addition to the discovery handlers, you can also define `booting` and `booted` callbacks in your extension class. These methods allow you to run custom logic before and after the kernel boots, respectively.
+In addition to the discovery handlers, you can also define `booting` and `booted` callbacks in your extension class. These methods allow you to run custom logic before and after the kernel boots, respectively. Both methods receive the `HydeKernel` instance as a parameter, allowing you to interact with the kernel directly.
 
 ```php
+use Hyde\Foundation\HydeKernel;
+
 class JsonPageExtension extends HydeExtension {
-    public function booting(): void {
+    public function booting(HydeKernel $kernel): void {
         // This runs before the kernel boots, meaning pages have not been discovered yet
+        // You can use $kernel to interact with the HydeKernel instance
     }
 
-    public function booted(): void {
+    public function booted(HydeKernel $kernel): void {
         // This runs after the kernel has booted, meaning pages have been discovered
+        // You can use $kernel to interact with the HydeKernel instance
     }
 }
 ```
 
-These methods are particularly useful for setting up your extension's environment or performing post-boot operations.
+These callbacks provide powerful hooks into the Hyde system, allowing your extensions to integrate deeply and modify Hyde's behavior as needed. The `booting` callback can be used to set up the system with information needed to discover pages, while the `booted` callback can can be used to perform operations requiring knowledge of discovered data, even modifying them if needed.
 
 #### Discovery handler example
 
diff --git a/packages/framework/src/Foundation/Concerns/HydeExtension.php b/packages/framework/src/Foundation/Concerns/HydeExtension.php
index 08f30b7e040..d274ddbd663 100644
--- a/packages/framework/src/Foundation/Concerns/HydeExtension.php
+++ b/packages/framework/src/Foundation/Concerns/HydeExtension.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Kernel\FileCollection;
 use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Kernel\RouteCollection;
@@ -82,7 +83,7 @@ public function discoverRoutes(RouteCollection $collection): void
      * Register a callback to be run before the kernel is booted.
      * Override this method to define your booting logic.
      */
-    public function booting(): void
+    public function booting(HydeKernel $kernel): void
     {
         //
     }
@@ -91,7 +92,7 @@ public function booting(): void
      * Register a callback to be run after the kernel is booted.
      * Override this method to define your booted logic.
      */
-    public function booted(): void
+    public function booted(HydeKernel $kernel): void
     {
         //
     }
diff --git a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
index a773e97f4f4..dc46d02c503 100644
--- a/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
+++ b/packages/framework/tests/Feature/HydeExtensionFeatureTest.php
@@ -133,7 +133,7 @@ public function testCustomRegisteredPagesAreDiscoveredByTheRouteCollectionClass(
         $this->assertEquals(new Route(new TestPageClass('bar')), Routes::get('foo/bar'));
     }
 
-    public function testBootingAndBootedMethodsAreCalled()
+    public function testBootingAndBootedMethodsAreCalledWithKernel()
     {
         $this->kernel->registerExtension(BootableTestExtension::class);
 
@@ -141,7 +141,12 @@ public function testBootingAndBootedMethodsAreCalled()
 
         $this->kernel->boot();
 
-        $this->assertSame(['booting', 'booted'], BootableTestExtension::$callCache);
+        $this->assertCount(2, BootableTestExtension::$callCache);
+
+        $this->assertInstanceOf(HydeKernel::class, BootableTestExtension::$callCache['booting']);
+        $this->assertInstanceOf(HydeKernel::class, BootableTestExtension::$callCache['booted']);
+        $this->assertSame($this->kernel, BootableTestExtension::$callCache['booting']);
+        $this->assertSame($this->kernel, BootableTestExtension::$callCache['booted']);
 
         BootableTestExtension::$callCache = [];
     }
@@ -179,12 +184,12 @@ public function discoverRoutes(RouteCollection $collection): void
         static::$callCache[] = 'routes';
     }
 
-    public function booting(): void
+    public function booting(HydeKernel $kernel): void
     {
         static::$callCache[] = 'booting';
     }
 
-    public function booted(): void
+    public function booted(HydeKernel $kernel): void
     {
         static::$callCache[] = 'booted';
     }
@@ -253,13 +258,13 @@ class BootableTestExtension extends HydeExtension
 {
     public static array $callCache = [];
 
-    public function booting(): void
+    public function booting(HydeKernel $kernel): void
     {
-        static::$callCache[] = 'booting';
+        static::$callCache['booting'] = $kernel;
     }
 
-    public function booted(): void
+    public function booted(HydeKernel $kernel): void
     {
-        static::$callCache[] = 'booted';
+        static::$callCache['booted'] = $kernel;
     }
 }

From 9db32e71ca0d2c9e60c09ca1c2b35a30a4e63deb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:32:10 +0200
Subject: [PATCH 2661/2811] Remove parts of documentation that should be
 obvious

---
 docs/architecture-concepts/extensions-api.md                 | 2 --
 packages/framework/src/Foundation/Concerns/HydeExtension.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/docs/architecture-concepts/extensions-api.md b/docs/architecture-concepts/extensions-api.md
index 2a5588927ae..e894444b6c0 100644
--- a/docs/architecture-concepts/extensions-api.md
+++ b/docs/architecture-concepts/extensions-api.md
@@ -102,12 +102,10 @@ use Hyde\Foundation\HydeKernel;
 class JsonPageExtension extends HydeExtension {
     public function booting(HydeKernel $kernel): void {
         // This runs before the kernel boots, meaning pages have not been discovered yet
-        // You can use $kernel to interact with the HydeKernel instance
     }
 
     public function booted(HydeKernel $kernel): void {
         // This runs after the kernel has booted, meaning pages have been discovered
-        // You can use $kernel to interact with the HydeKernel instance
     }
 }
 ```
diff --git a/packages/framework/src/Foundation/Concerns/HydeExtension.php b/packages/framework/src/Foundation/Concerns/HydeExtension.php
index d274ddbd663..1435eb8e929 100644
--- a/packages/framework/src/Foundation/Concerns/HydeExtension.php
+++ b/packages/framework/src/Foundation/Concerns/HydeExtension.php
@@ -81,7 +81,6 @@ public function discoverRoutes(RouteCollection $collection): void
 
     /**
      * Register a callback to be run before the kernel is booted.
-     * Override this method to define your booting logic.
      */
     public function booting(HydeKernel $kernel): void
     {
@@ -90,7 +89,6 @@ public function booting(HydeKernel $kernel): void
 
     /**
      * Register a callback to be run after the kernel is booted.
-     * Override this method to define your booted logic.
      */
     public function booted(HydeKernel $kernel): void
     {

From 4f339b6acf516feb45f7c7939b1088f93f502bcf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:32:30 +0200
Subject: [PATCH 2662/2811] Update code documentation

---
 .../framework/src/Foundation/Concerns/HydeExtension.php     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/HydeExtension.php b/packages/framework/src/Foundation/Concerns/HydeExtension.php
index 1435eb8e929..54f99977325 100644
--- a/packages/framework/src/Foundation/Concerns/HydeExtension.php
+++ b/packages/framework/src/Foundation/Concerns/HydeExtension.php
@@ -80,7 +80,8 @@ public function discoverRoutes(RouteCollection $collection): void
     }
 
     /**
-     * Register a callback to be run before the kernel is booted.
+     * Register a callback to be run before the kernel is booted,
+     * and before file/page/route discovery has begun.
      */
     public function booting(HydeKernel $kernel): void
     {
@@ -88,7 +89,8 @@ public function booting(HydeKernel $kernel): void
     }
 
     /**
-     * Register a callback to be run after the kernel is booted.
+     * Register a callback to be run after the kernel is booted,
+     * and after file/page/route discovery has completed.
      */
     public function booted(HydeKernel $kernel): void
     {

From b8547688682bccac90d3701469b649cc8cb343f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:33:53 +0200
Subject: [PATCH 2663/2811] Restructure documentation

---
 docs/architecture-concepts/extensions-api.md              | 8 +++++---
 .../framework/src/Foundation/Concerns/HydeExtension.php   | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/architecture-concepts/extensions-api.md b/docs/architecture-concepts/extensions-api.md
index e894444b6c0..7c6f4c7928e 100644
--- a/docs/architecture-concepts/extensions-api.md
+++ b/docs/architecture-concepts/extensions-api.md
@@ -101,16 +101,18 @@ use Hyde\Foundation\HydeKernel;
 
 class JsonPageExtension extends HydeExtension {
     public function booting(HydeKernel $kernel): void {
-        // This runs before the kernel boots, meaning pages have not been discovered yet
+        // This runs before the kernel boots and before running auto-discovery
     }
 
     public function booted(HydeKernel $kernel): void {
-        // This runs after the kernel has booted, meaning pages have been discovered
+        // This runs after the kernel boots and after running auto-discovery
     }
 }
 ```
 
-These callbacks provide powerful hooks into the Hyde system, allowing your extensions to integrate deeply and modify Hyde's behavior as needed. The `booting` callback can be used to set up the system with information needed to discover pages, while the `booted` callback can can be used to perform operations requiring knowledge of discovered data, even modifying them if needed.
+The `booting` callback can be used to set up the system with information needed to discover pages, while the `booted` callback can can be used to perform operations requiring knowledge of discovered data, even modifying them if needed.
+
+These callbacks provide powerful hooks into the Hyde system, allowing your extensions to integrate deeply and modify Hyde's behavior as needed. 
 
 #### Discovery handler example
 
diff --git a/packages/framework/src/Foundation/Concerns/HydeExtension.php b/packages/framework/src/Foundation/Concerns/HydeExtension.php
index 54f99977325..b83a83780bc 100644
--- a/packages/framework/src/Foundation/Concerns/HydeExtension.php
+++ b/packages/framework/src/Foundation/Concerns/HydeExtension.php
@@ -81,7 +81,7 @@ public function discoverRoutes(RouteCollection $collection): void
 
     /**
      * Register a callback to be run before the kernel is booted,
-     * and before file/page/route discovery has begun.
+     * which is before any file/page/route discovery has begun.
      */
     public function booting(HydeKernel $kernel): void
     {
@@ -90,7 +90,7 @@ public function booting(HydeKernel $kernel): void
 
     /**
      * Register a callback to be run after the kernel is booted,
-     * and after file/page/route discovery has completed.
+     * which is after file/page/route discovery has completed.
      */
     public function booted(HydeKernel $kernel): void
     {

From af8714f88508626247d154c70d11d66412945d0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 13 Jul 2024 19:35:24 +0200
Subject: [PATCH 2664/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1bd2a7a4fcd..443c767eab7 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,6 +15,7 @@ This serves two purposes:
 - Added a new `\Hyde\Framework\Exceptions\ParseException` exception class to handle parsing exceptions in data collection files in https://github.com/hydephp/develop/pull/1732
 - Added a new `\Hyde\Framework\Exceptions\InvalidConfigurationException` exception class to handle invalid configuration exceptions in https://github.com/hydephp/develop/pull/1799
 - The `\Hyde\Facades\Features` class is no longer marked as internal, and is now thus part of the public API.
+- Added support for setting `booting()` and `booted()` callbacks in `HydeExtension` classes, allowing extension developers to hook into the kernel boot process more easily in https://github.com/hydephp/develop/pull/1847
 - Added support for setting custom navigation items in the YAML configuration in https://github.com/hydephp/develop/pull/1818
 - Added support for setting extra attributes for navigation items in https://github.com/hydephp/develop/pull/1824
 - Introduced a new navigation config builder class to simplify navigation configuration in https://github.com/hydephp/develop/pull/1827

From ff9dfb3a328dc95ce89915882ec71b869fe3a71d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 16 Jul 2024 13:58:21 +0200
Subject: [PATCH 2665/2811] Update CustomExceptionsTest.php

---
 packages/framework/tests/Unit/CustomExceptionsTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index af058ac7390..97927a1760b 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -136,6 +136,13 @@ public function testParseExceptionWithTxtExtension()
         $this->assertSame("Invalid data in file: 'example.txt'", $exception->getMessage());
     }
 
+    public function testParseExceptionWithJsonExtension()
+    {
+        $exception = new ParseException('example.json');
+
+        $this->assertSame("Invalid Json in file: 'example.json'", $exception->getMessage());
+    }
+
     public function testParseExceptionWithUnsupportedExtension()
     {
         $exception = new ParseException('example.foo');

From a26ea882776b699a30b4122d82a3fa337464ff4c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 17 Jul 2024 15:01:57 +0200
Subject: [PATCH 2666/2811] Update develop.iml

---
 .idea/develop.iml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.idea/develop.iml b/.idea/develop.iml
index c351593718e..d5243986813 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -14,11 +14,6 @@
       <sourceFolder url="file://$MODULE_DIR$/packages/hyde/app" isTestSource="false" packagePrefix="App\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/testing/src" isTestSource="false" packagePrefix="Hyde\Testing\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/ui-kit/src" isTestSource="false" packagePrefix="Hyde\UIKit\" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests/Feature" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests/Unit" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/hyde/tests/Feature" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/publications/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/realtime-compiler/tests/Integration" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyde" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyde/framework" />
       <excludeFolder url="file://$MODULE_DIR$/packages/realtime-compiler/vendor/hyde" />

From 6240e9bad72ddf5d5777a980148e4fa195c43afe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 12:45:16 +0200
Subject: [PATCH 2667/2811] Don't proxy search index files as they are now
 based on page objects

Fixes https://github.com/hydephp/develop/issues/1802. We could add some code to save to disk if preview saving is enabled, something for later. I considered having this read from the file if it exists, but think that is not intuitive as it then won't change with content changes.
---
 packages/realtime-compiler/src/Routing/Router.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/realtime-compiler/src/Routing/Router.php b/packages/realtime-compiler/src/Routing/Router.php
index 963d3cef51c..37c0aac9a06 100644
--- a/packages/realtime-compiler/src/Routing/Router.php
+++ b/packages/realtime-compiler/src/Routing/Router.php
@@ -63,6 +63,11 @@ protected function shouldProxy(Request $request): bool
             return false;
         }
 
+        // Don't proxy the search.json file, as it's generated on the fly.
+        if (str_ends_with($request->path, 'search.json')) {
+            return false;
+        }
+
         // The page is not a web page, so we assume it should be proxied.
         return true;
     }

From 9d3920387247184db3a39f50cf135ee0151859bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 12:47:44 +0200
Subject: [PATCH 2668/2811] Remove old search index proxying code

---
 packages/realtime-compiler/src/Routing/Router.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packages/realtime-compiler/src/Routing/Router.php b/packages/realtime-compiler/src/Routing/Router.php
index 37c0aac9a06..9fb7dcf5e46 100644
--- a/packages/realtime-compiler/src/Routing/Router.php
+++ b/packages/realtime-compiler/src/Routing/Router.php
@@ -11,7 +11,6 @@
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
 use Hyde\RealtimeCompiler\Models\FileObject;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 
 class Router
 {
@@ -77,10 +76,6 @@ protected function shouldProxy(Request $request): bool
      */
     protected function proxyStatic(): Response
     {
-        if ($this->request->path === '/docs/search.json') {
-            $this->generateSearchIndex();
-        }
-
         $path = AssetFileLocator::find($this->request->path);
 
         if ($path === null) {
@@ -96,14 +91,4 @@ protected function proxyStatic(): Response
             'Content-Length' => $file->getContentLength(),
         ]);
     }
-
-    /**
-     * Generate the documentation search index.
-     */
-    protected function generateSearchIndex(): void
-    {
-        $this->bootApplication();
-
-        GeneratesDocumentationSearchIndex::handle();
-    }
 }

From 36168364cef5319201d7abd8f3fc53eccba05993 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 16:14:27 +0200
Subject: [PATCH 2669/2811] Remove deprecated method
 `FeaturedImage::isRemote()`

Tie in with https://github.com/hydephp/develop/pull/1882
---
 .../Features/Blogging/Models/FeaturedImage.php       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ebb3522c883..0f42f961c87 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -9,7 +9,6 @@
 use Hyde\Facades\Config;
 use Illuminate\Support\Str;
 use Hyde\Support\BuildWarnings;
-use JetBrains\PhpStorm\Deprecated;
 use Illuminate\Support\Facades\Http;
 use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Framework\Exceptions\FileNotFoundException;
@@ -241,15 +240,4 @@ protected function getContentLengthForRemoteImage(): int
 
         return 0;
     }
-
-    /**
-     * @codeCoverageIgnore Deprecated method.
-     *
-     * @deprecated This method will be removed in v2.0. Please use `Hyperlinks::isRemote` instead.
-     */
-    #[Deprecated(reason: 'Replaced by the \Hyde\Foundation\Kernel\Hyperlinks::isRemote method', replacement: '\Hyde\Foundation\Kernel\Hyperlinks::isRemote(%parametersList%)', since: '1.8.0')]
-    public static function isRemote(string $source): bool
-    {
-        return Hyperlinks::isRemote($source);
-    }
 }

From cc3733fcf1145cae24c3f48871e9d8828ddb14a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 16:19:03 +0200
Subject: [PATCH 2670/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 443c767eab7..e19121252fc 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -62,6 +62,7 @@ This serves two purposes:
 - Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now returning `null` if no base URL is set in https://github.com/hydephp/develop/pull/1760
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
+- Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
 
 ### Fixed
 - Added missing collection key types in Hyde facade method annotations in https://github.com/hydephp/develop/pull/1784

From 58673694cc1946bfe63f71eea20cd2aaabb61e3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 16:21:20 +0200
Subject: [PATCH 2671/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e19121252fc..11438f7662f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -343,6 +343,26 @@ For example, an empty or malformed JSON file will now throw an exception like th
 In order to normalize the thrown exceptions, we now rethrow the `ParseException` from `Symfony/Yaml` as our custom `ParseException` to match the JSON and Markdown validation.
 Additionally, an exception will be thrown if a data file is empty, as this is unlikely to be intentional. Markdown files can have an empty body if front matter is present.
 
+### Removal of `FeaturedImage::isRemote()` method
+
+The `FeaturedImage::isRemote()` method has been removed in v2.0. This method was deprecated in v1.8.0 and has now been completely removed.
+
+#### Upgrade guide
+
+If you were using `FeaturedImage::isRemote()` in your code, you should replace it with `Hyperlinks::isRemote()`. Here's how to update your code:
+
+```php
+// Old code
+FeaturedImage::isRemote($source);
+
+// New code
+use Hyde\Foundation\Kernel\Hyperlinks;
+
+Hyperlinks::isRemote($source);
+```
+
+This change was implemented in https://github.com/hydephp/develop/pull/1883. Make sure to update any instances of `FeaturedImage::isRemote()` in your codebase to ensure compatibility with HydePHP v2.0.
+
 ## New features
 
 <!-- Editors note: Todo: Maybe move to the relevant docs... -->

From 2382709bfae243629c292335dfe8bc7722169b89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 18:31:58 +0200
Subject: [PATCH 2672/2811] Update blog posts to use `BlogPosting` Schema.org
 type

This is a more specific subset of Article. Fixes https://github.com/hydephp/develop/issues/1842
---
 RELEASE_NOTES.md                                                | 1 +
 .../framework/resources/views/components/post/article.blade.php | 2 +-
 .../framework/tests/Feature/StaticSiteBuilderPostModuleTest.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 11438f7662f..d5ce619590d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -39,6 +39,7 @@ This serves two purposes:
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
+- Minor: Updated the blog post layout to use the `BlogPosting` Schema.org type instead of `Article` in https://github.com/hydephp/develop/pull/1887
 - Overhauled the blog post author feature in https://github.com/hydephp/develop/pull/1782
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749
diff --git a/packages/framework/resources/views/components/post/article.blade.php b/packages/framework/resources/views/components/post/article.blade.php
index 9d54df611f2..bed0f77e4fc 100644
--- a/packages/framework/resources/views/components/post/article.blade.php
+++ b/packages/framework/resources/views/components/post/article.blade.php
@@ -1,4 +1,4 @@
-<article aria-label="Article" id="{{ $page->identifier }}" itemscope itemtype="https://schema.org/Article"
+<article aria-label="Article" id="{{ $page->identifier }}" itemscope itemtype="https://schema.org/BlogPosting"
     @class(['post-article mx-auto', config('markdown.prose_classes', 'prose dark:prose-invert'), 'torchlight-enabled' => Features::hasTorchlight()])>
     <meta itemprop="identifier" content="{{ $page->identifier }}">
     @if($page->getCanonicalUrl() !== null)
diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index 10af1b63700..18f4743ecdb 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -96,7 +96,7 @@ public function testPostContainsExpectedMetaTags()
     public function testPostContainsExpectedItemprops()
     {
         $this->inspectHtml([
-            'itemtype="https://schema.org/Article"',
+            'itemtype="https://schema.org/BlogPosting"',
             'itemtype="https://schema.org/Person"',
             'itemprop="identifier"',
             'itemprop="headline"',

From 12001d9dea7bc2c0a6570acb49c139eb3b3e40d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 18:39:21 +0200
Subject: [PATCH 2673/2811] Update blog post feeds to use `BlogPosting`
 Schema.org type

This is a more specific subset of Article. See https://github.com/hydephp/develop/issues/1842
---
 RELEASE_NOTES.md                                                | 2 +-
 .../resources/views/components/article-excerpt.blade.php        | 2 +-
 packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d5ce619590d..b4899c03a0c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -39,7 +39,7 @@ This serves two purposes:
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
-- Minor: Updated the blog post layout to use the `BlogPosting` Schema.org type instead of `Article` in https://github.com/hydephp/develop/pull/1887
+- Minor: Updated the blog post layout and post feed component to use the `BlogPosting` Schema.org type instead of `Article` in https://github.com/hydephp/develop/pull/1887
 - Overhauled the blog post author feature in https://github.com/hydephp/develop/pull/1782
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749
diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 666c628ab0f..3e4574f2343 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -1,5 +1,5 @@
 @php /** @var \Hyde\Pages\MarkdownPost $post */ @endphp
-<article class="mt-4 mb-8" itemscope itemtype="https://schema.org/Article">
+<article class="mt-4 mb-8" itemscope itemtype="https://schema.org/BlogPosting">
     <meta itemprop="identifier" content="{{ $post->identifier }}">
     @if(Hyde::hasSiteUrl())
         <meta itemprop="url" content="{{ Hyde::url('posts/' . $post->identifier) }}">
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 48e1818fcf0..508b009f5cd 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -24,7 +24,7 @@ protected function renderTestView(MarkdownPost $post): string
     public function testComponentCanBeRendered()
     {
         $view = $this->renderTestView(MarkdownPost::make());
-        $this->assertStringContainsString('https://schema.org/Article', $view);
+        $this->assertStringContainsString('https://schema.org/BlogPosting', $view);
     }
 
     public function testComponentRendersPostData()

From 0492507e0d84078dd3129e02577aa1c84bc2589b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 18:49:01 +0200
Subject: [PATCH 2674/2811] Add more rich metadata to article excerpt content

---
 .../resources/views/components/article-excerpt.blade.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 3e4574f2343..15d2dd07e7e 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -7,7 +7,7 @@
 
     <header>
         <a href="{{ $post->getRoute() }}" class="block w-fit">
-            <h2 class="text-2xl font-bold text-gray-700 hover:text-gray-900 dark:text-gray-200 dark:hover:text-white transition-colors duration-75">
+            <h2 itemprop="headline" class="text-2xl font-bold text-gray-700 hover:text-gray-900 dark:text-gray-200 dark:hover:text-white transition-colors duration-75">
                 {{ $post->data('title') ?? $post->title }}
             </h2>
         </a>
@@ -31,7 +31,7 @@
 
     @if($post->data('description') !== null)
         <section role="doc-abstract" aria-label="Excerpt">
-            <p class="leading-relaxed my-1">
+            <p itemprop="description" class="leading-relaxed my-1">
                 {{ $post->data('description') }}
             </p>
         </section>

From 58b87e02b0b599453ab55ae1a0ab6e4dce440569 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 18:50:22 +0200
Subject: [PATCH 2675/2811] Update the blog post feed to be a rich item list

---
 .../views/components/article-excerpt.blade.php        |  2 +-
 .../views/components/blog-post-feed.blade.php         | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 15d2dd07e7e..c16a9cd01e3 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -1,5 +1,5 @@
 @php /** @var \Hyde\Pages\MarkdownPost $post */ @endphp
-<article class="mt-4 mb-8" itemscope itemtype="https://schema.org/BlogPosting">
+<article itemprop="item" itemscope itemtype="https://schema.org/BlogPosting">
     <meta itemprop="identifier" content="{{ $post->identifier }}">
     @if(Hyde::hasSiteUrl())
         <meta itemprop="url" content="{{ Hyde::url('posts/' . $post->identifier) }}">
diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php
index 6276589e72b..652c22988a5 100644
--- a/packages/framework/resources/views/components/blog-post-feed.blade.php
+++ b/packages/framework/resources/views/components/blog-post-feed.blade.php
@@ -1,3 +1,8 @@
-@foreach(MarkdownPost::getLatestPosts() as $post)
-    @include('hyde::components.article-excerpt')
-@endforeach
\ No newline at end of file
+<ol itemscope itemtype="https://schema.org/ItemList">
+@foreach(MarkdownPost::getLatestPosts()->values() as $index => $post)
+    <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mt-4 mb-8">
+        <meta itemprop="position" content="{{ $index + 1 }}">
+        @include('hyde::components.article-excerpt')
+    </li>
+  @endforeach
+</ol>
\ No newline at end of file

From 9ee426e0af4f56bc803af08436354f1e3873a613 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 18:52:52 +0200
Subject: [PATCH 2676/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b4899c03a0c..f1fca25c216 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -40,6 +40,7 @@ This serves two purposes:
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
 - Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
 - Minor: Updated the blog post layout and post feed component to use the `BlogPosting` Schema.org type instead of `Article` in https://github.com/hydephp/develop/pull/1887
+- Added more rich markup data to blog post components in https://github.com/hydephp/develop/pull/1888 (Note that this inevitably changes the HTML output of the blog post components, and that any customized templates will need to be republished to reflect these changes)
 - Overhauled the blog post author feature in https://github.com/hydephp/develop/pull/1782
 - Improved the sitemap data generation to be smarter and more dynamic in https://github.com/hydephp/develop/pull/1744
 - Skipped build tasks will now exit with an exit code of 3 instead of 0 in https://github.com/hydephp/develop/pull/1749

From 84d38c4fafe4dcd461ca72d5b4bf54c27c5e5d1c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 19:16:18 +0200
Subject: [PATCH 2677/2811] Update blog post feed to add image metadata when
 available

---
 .../components/article-excerpt.blade.php      |  4 +++
 .../Unit/Views/ArticleExcerptViewTest.php     | 25 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 4e1e148ee00..3cba5bf7c46 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -5,6 +5,10 @@
         <meta itemprop="url" content="{{ $post->getCanonicalUrl()  }}">
     @endif
 
+    @isset($post->image)
+         <meta itemprop="image" content="{{ $post->image }}">
+    @endif
+
     <header>
         <a href="{{ $post->getRoute() }}" class="block w-fit">
             <h2 itemprop="headline" class="text-2xl font-bold text-gray-700 hover:text-gray-900 dark:text-gray-200 dark:hover:text-white transition-colors duration-75">
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 508b009f5cd..04187b8a3fc 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -73,4 +73,29 @@ public function testThereIsACommaAfterDateStringWhenThereIsAAuthor()
 
         $this->assertStringContainsString('Jan 1st, 2022</span>,', $view);
     }
+
+    public function testItempropImageIsNotAddedWhenThereIsNoImage()
+    {
+        $view = $this->renderTestView(MarkdownPost::make());
+        $this->assertStringNotContainsString('itemprop="image"', $view);
+    }
+
+    public function testItempropImageIsAddedWhenThereIsAnImage()
+    {
+        // Test with local path
+        $viewLocal = $this->renderTestView(MarkdownPost::make(matter: [
+            'image' => 'path/to/local/image.jpg',
+        ]));
+
+        $this->assertStringContainsString('itemprop="image"', $viewLocal);
+        $this->assertStringContainsString('content="media/path/to/local/image.jpg"', $viewLocal);
+
+        // Test with remote URL
+        $viewRemote = $this->renderTestView(MarkdownPost::make(matter: [
+            'image' => 'https://example.com/image.jpg',
+        ]));
+
+        $this->assertStringContainsString('itemprop="image"', $viewRemote);
+        $this->assertStringContainsString('content="https://example.com/image.jpg"', $viewRemote);
+    }
 }

From 0cc1816fc2cd0bf056a2bd9a0fa206e987be816f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 19:24:27 +0200
Subject: [PATCH 2678/2811] Update article excerpt date span to be a time
 element

---
 .../resources/views/components/article-excerpt.blade.php    | 2 +-
 .../framework/tests/Unit/Views/ArticleExcerptViewTest.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 3cba5bf7c46..131d805ff1b 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -20,7 +20,7 @@
     <footer>
         @isset($post->date)
             <span class="opacity-75">
-                <span itemprop="dateCreated datePublished">{{ $post->date->short }}</span>{{ isset($post->author) ? ',' : '' }}
+                <time itemprop="dateCreated datePublished">{{ $post->date->short }}</time>{{ isset($post->author) ? ',' : '' }}
             </span>
         @endisset
         @isset($post->author)
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 04187b8a3fc..64d233f008d 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -60,8 +60,8 @@ public function testThereIsNoCommaAfterDateStringWhenThereIsNoAuthor()
             'date' => '2022-01-01',
         ]));
 
-        $this->assertStringContainsString('Jan 1st, 2022</span>', $view);
-        $this->assertStringNotContainsString('Jan 1st, 2022</span>,', $view);
+        $this->assertStringContainsString('Jan 1st, 2022</time>', $view);
+        $this->assertStringNotContainsString('Jan 1st, 2022</time>,', $view);
     }
 
     public function testThereIsACommaAfterDateStringWhenThereIsAAuthor()
@@ -71,7 +71,7 @@ public function testThereIsACommaAfterDateStringWhenThereIsAAuthor()
             'author' => 'John Doe',
         ]));
 
-        $this->assertStringContainsString('Jan 1st, 2022</span>,', $view);
+        $this->assertStringContainsString('Jan 1st, 2022</time>,', $view);
     }
 
     public function testItempropImageIsNotAddedWhenThereIsNoImage()

From bd8b709785e1974f893f86adf9f747b932acc9ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 19:28:32 +0200
Subject: [PATCH 2679/2811] Add the proper datetime to metadata element

---
 .../resources/views/components/article-excerpt.blade.php | 2 +-
 .../tests/Unit/Views/ArticleExcerptViewTest.php          | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index 131d805ff1b..92ae514acc2 100644
--- a/packages/framework/resources/views/components/article-excerpt.blade.php
+++ b/packages/framework/resources/views/components/article-excerpt.blade.php
@@ -20,7 +20,7 @@
     <footer>
         @isset($post->date)
             <span class="opacity-75">
-                <time itemprop="dateCreated datePublished">{{ $post->date->short }}</time>{{ isset($post->author) ? ',' : '' }}
+                <time itemprop="dateCreated datePublished" datetime="{{ $post->date->datetime }}">{{ $post->date->short }}</time>{{ isset($post->author) ? ',' : '' }}
             </span>
         @endisset
         @isset($post->author)
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 64d233f008d..d49838ccd16 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -54,6 +54,15 @@ public function testComponentRendersPostWithAuthorObject()
         $this->assertStringContainsString('John Doe', $view);
     }
 
+    public function testMetadataHasIsoDate()
+    {
+        $view = $this->renderTestView(MarkdownPost::make(matter: [
+            'date' => '2022-01-01',
+        ]));
+
+        $this->assertStringContainsString('<time itemprop="dateCreated datePublished" datetime="2022-01-01T00:00:00+00:00">Jan 1st, 2022</time>', $view);
+    }
+
     public function testThereIsNoCommaAfterDateStringWhenThereIsNoAuthor()
     {
         $view = $this->renderTestView(MarkdownPost::make(matter: [

From bba209b1866f19255341fe14feade17c1844cb3c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 19:29:13 +0200
Subject: [PATCH 2680/2811] Test date is not added when not set

---
 .../framework/tests/Unit/Views/ArticleExcerptViewTest.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index d49838ccd16..ea83bdc457a 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -63,6 +63,13 @@ public function testMetadataHasIsoDate()
         $this->assertStringContainsString('<time itemprop="dateCreated datePublished" datetime="2022-01-01T00:00:00+00:00">Jan 1st, 2022</time>', $view);
     }
 
+    public function testDateIsNotAddedWhenNotSet()
+    {
+        $view = $this->renderTestView(MarkdownPost::make());
+
+        $this->assertStringNotContainsString('<time', $view);
+    }
+
     public function testThereIsNoCommaAfterDateStringWhenThereIsNoAuthor()
     {
         $view = $this->renderTestView(MarkdownPost::make(matter: [

From 790654c980839540fc04adc5fce83900d5b4933c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 23 Jul 2024 19:44:13 +0200
Subject: [PATCH 2681/2811] Revert to throw an exception when trying to get
 unconfigured base URL

---
 RELEASE_NOTES.md                                      |  4 ++--
 .../src/Foundation/Concerns/ForwardsHyperlinks.php    |  2 +-
 .../framework/src/Foundation/Kernel/Hyperlinks.php    | 11 +++++++----
 packages/framework/src/Hyde.php                       |  2 +-
 packages/framework/src/helpers.php                    |  2 +-
 packages/framework/tests/Feature/HelpersTest.php      |  3 +++
 .../Unit/Foundation/HyperlinksUrlPathHelpersTest.php  |  8 ++++++--
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f1fca25c216..56c25e5f345 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -38,7 +38,7 @@ This serves two purposes:
 - Minor: Methods in the `Includes` facade now return `HtmlString` objects instead of `string` in https://github.com/hydephp/develop/pull/1738. For more information, see below.
 - Minor: `Includes::path()` and  `Includes::get()` methods now normalizes paths to be basenames to match the behaviour of the other include methods in https://github.com/hydephp/develop/pull/1738. This means that nested directories are no longer supported, as you should use a data collection for that.
 - Minor: The `processing_time_ms` attribute in the `sitemap.xml` file has now been removed in https://github.com/hydephp/develop/pull/1744
-- Minor: Updated the `Hyde::url()` helper to return `null` instead of throwing a `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760
+- Minor: Updated the `Hyde::url()` helper throw a `BadMethodCallException` instead `BaseUrlNotSetException` when no site URL is set and no path was provided to the method in https://github.com/hydephp/develop/pull/1760 and https://github.com/hydephp/develop/pull/1890
 - Minor: Updated the blog post layout and post feed component to use the `BlogPosting` Schema.org type instead of `Article` in https://github.com/hydephp/develop/pull/1887
 - Added more rich markup data to blog post components in https://github.com/hydephp/develop/pull/1888 (Note that this inevitably changes the HTML output of the blog post components, and that any customized templates will need to be republished to reflect these changes)
 - Overhauled the blog post author feature in https://github.com/hydephp/develop/pull/1782
@@ -61,7 +61,7 @@ This serves two purposes:
 - Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 - Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
 - Removed the deprecated global`unslash()` function, replaced with the namespaced `\Hyde\unslash()` function in https://github.com/hydephp/develop/pull/1754
-- Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now returning `null` if no base URL is set in https://github.com/hydephp/develop/pull/1760
+- Removed the deprecated `BaseUrlNotSetException` class, with the `Hyde::url()` helper now throwing `BadMethodCallException` if no base URL is set in https://github.com/hydephp/develop/pull/1760
 - Removed: The deprecated `PostAuthor::getName()` method is now removed (use `$author->name`) in https://github.com/hydephp/develop/pull/1782
 - Internal: Removed the internal `DocumentationSearchPage::generate()` method as it was unused in https://github.com/hydephp/develop/pull/1569
 - Removed the deprecated `FeaturedImage::isRemote()` method in https://github.com/hydephp/develop/pull/1883. Use `Hyperlinks::isRemote()` instead.
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index d5b87105f0e..9d194fd5f42 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -33,7 +33,7 @@ public function asset(string $name, bool $preferQualifiedUrl = false): string
         return $this->hyperlinks->asset($name, $preferQualifiedUrl);
     }
 
-    public function url(string $path = ''): ?string
+    public function url(string $path = ''): string
     {
         return $this->hyperlinks->url($path);
     }
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 15ae4b27a52..e127cdfaa82 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -5,6 +5,7 @@
 namespace Hyde\Foundation\Kernel;
 
 use Hyde\Facades\Config;
+use BadMethodCallException;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Exceptions\FileNotFoundException;
@@ -139,9 +140,11 @@ public function hasSiteUrl(): bool
      * Return a qualified URL to the supplied path if a base URL is set.
      *
      * @param  string  $path  An optional relative path suffix. Omit to return the base URL.
-     * @return string|null The qualified URL, or null if the base URL is not set and no path is provided.
+     * @return string The qualified URL, or the base URL if no path is supplied.
+     *
+     * @throws BadMethodCallException If the site URL is not set in the configuration and no path is supplied.
      */
-    public function url(string $path = ''): ?string
+    public function url(string $path = ''): string
     {
         $path = $this->formatLink(trim($path, '/'));
 
@@ -159,8 +162,8 @@ public function url(string $path = ''): ?string
             return $path;
         }
 
-        // User is trying to get the base URL, but it's not set
-        return null;
+        // User is trying to get the base URL, but it's not set, so we throw an exception.
+        throw new BadMethodCallException('The site URL is not set in the configuration.');
     }
 
     /**
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 3c13830d05a..cc309a3b21c 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -39,7 +39,7 @@
  * @method static string relativeLink(string $destination)
  * @method static string mediaLink(string $destination, bool $validate = false)
  * @method static string asset(string $name, bool $preferQualifiedUrl = false)
- * @method static string|null url(string $path = '')
+ * @method static string url(string $path = '')
  * @method static Route|null route(string $key)
  * @method static string makeTitle(string $value)
  * @method static string normalizeNewlines(string $string)
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
index 4f47188b222..34e8f9da12b 100644
--- a/packages/framework/src/helpers.php
+++ b/packages/framework/src/helpers.php
@@ -42,7 +42,7 @@ function route(string $key): ?Hyde\Support\Models\Route
             /**
              * Get a qualified URL to the supplied path if a base URL is set.
              */
-            function url(string $path = ''): ?string
+            function url(string $path = ''): string
             {
                 return hyde()->url($path);
             }
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 4ea9d3a0c29..300342e4735 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -6,6 +6,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use BadMethodCallException;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -178,6 +179,7 @@ public function testUrlFunctionWithoutBaseUrl()
     public function testUrlFunctionWithoutBaseUrlOrPath()
     {
         $this->app['config']->set(['hyde.url' => null]);
+        $this->expectException(BadMethodCallException::class);
         $this->assertNull(url());
     }
 
@@ -185,6 +187,7 @@ public function testUrlFunctionWithoutBaseUrlOrPath()
     public function testUrlFunctionWithLocalhostBaseUrlButNoPath()
     {
         $this->app['config']->set(['hyde.url' => 'http://localhost']);
+        $this->expectException(BadMethodCallException::class);
         $this->assertNull(url());
     }
 
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index 14b18821ce3..bc3a1f0061f 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
+use BadMethodCallException;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Kernel\Hyperlinks;
 use Hyde\Testing\TestCase;
@@ -153,11 +154,14 @@ public function testQualifiedUrlHelperWithAlreadyQualifiedUrlStillFormatsPathWit
         $this->assertSame('http://localhost/foo/bar', $this->class->url('http://localhost/foo/bar/'));
     }
 
-    public function testQualifiedUrlReturnsNullWhenNoSiteUrlIsSet()
+    public function testQualifiedUrlThrowsExceptionWhenNoSiteUrlIsSet()
     {
         $this->withSiteUrl(null);
 
-        $this->assertNull($this->class->url());
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('The site URL is not set in the configuration.');
+
+        $this->class->url();
     }
 
     public function testHelperFallsBackToRelativeLinksWhenNoSiteUrlIsSet()

From 3026fa4934b42fcdc12f85059ee712fa9369f2fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:00:10 +0200
Subject: [PATCH 2682/2811] Fix formatting

---
 .../resources/views/components/blog-post-feed.blade.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php
index 652c22988a5..0cfa5ad87a4 100644
--- a/packages/framework/resources/views/components/blog-post-feed.blade.php
+++ b/packages/framework/resources/views/components/blog-post-feed.blade.php
@@ -4,5 +4,5 @@
         <meta itemprop="position" content="{{ $index + 1 }}">
         @include('hyde::components.article-excerpt')
     </li>
-  @endforeach
+@endforeach
 </ol>
\ No newline at end of file

From 571ebc94e8e2071c95f59cbce9b89928d7ef2062 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:12:04 +0200
Subject: [PATCH 2683/2811] Update to expect author data being used

---
 packages/framework/tests/Feature/HomepageViewTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HomepageViewTest.php b/packages/framework/tests/Feature/HomepageViewTest.php
index 49193cd72c1..a7e48f25ed1 100644
--- a/packages/framework/tests/Feature/HomepageViewTest.php
+++ b/packages/framework/tests/Feature/HomepageViewTest.php
@@ -52,7 +52,7 @@ public function testPostFeedHomepageWithPosts()
     {
         Hyde::shareViewData(new BladePage('index'));
 
-        Hyde::pages()->add(new MarkdownPost('hello-world', ['author' => 'Mr Hyde'], 'Hello World!'));
+        Hyde::pages()->add(new MarkdownPost('hello-world', ['author' => 'mr_hyde'], 'Hello World!'));
 
         $view = $this->view(view('hyde::homepages.post-feed'));
 
@@ -61,6 +61,6 @@ public function testPostFeedHomepageWithPosts()
             ->assertSeeHtml('id="post-feed"')
             ->assertSeeHtml('<a href="posts/hello-world.html"')
             ->assertSee('Hello World!')
-            ->assertSee('Mr Hyde');
+            ->assertSee('Mr. Hyde');
     }
 }

From 0f33d15ec68756f16329de9b4f02b788c541c91b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:32:08 +0200
Subject: [PATCH 2684/2811] Reformat view

---
 .../views/components/blog-post-feed.blade.php        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php
index 0cfa5ad87a4..59e4ca4bd76 100644
--- a/packages/framework/resources/views/components/blog-post-feed.blade.php
+++ b/packages/framework/resources/views/components/blog-post-feed.blade.php
@@ -1,8 +1,8 @@
 <ol itemscope itemtype="https://schema.org/ItemList">
-@foreach(MarkdownPost::getLatestPosts()->values() as $index => $post)
-    <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mt-4 mb-8">
-        <meta itemprop="position" content="{{ $index + 1 }}">
-        @include('hyde::components.article-excerpt')
-    </li>
-@endforeach
+    @foreach(MarkdownPost::getLatestPosts()->values() as $index => $post)
+        <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mt-4 mb-8">
+            <meta itemprop="position" content="{{ $index + 1 }}">
+            @include('hyde::components.article-excerpt')
+        </li>
+    @endforeach
 </ol>
\ No newline at end of file

From 5bc606845357dac7f7f32ef12a44e0ef4dcf9324 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:40:16 +0200
Subject: [PATCH 2685/2811] Create BlogPostFeedComponentViewTest.php

---
 .../Views/BlogPostFeedComponentViewTest.php   | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php

diff --git a/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php b/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php
new file mode 100644
index 00000000000..cbc5b8c1f03
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+use Hyde\Hyde;
+use Hyde\Testing\TestCase;
+use Hyde\Pages\MarkdownPost;
+use Hyde\Testing\TestsBladeViews;
+
+/**
+ * @coversNothing Test to ensure the blog post feed component can be rendered
+ */
+class BlogPostFeedComponentViewTest extends TestCase
+{
+    use TestsBladeViews;
+
+    public function testPostFeedWithoutPosts()
+    {
+        $view = $this->view(view('hyde::components.blog-post-feed'));
+
+        $view->assertSeeHtml('<ol itemscope itemtype="https://schema.org/ItemList">')
+            ->assertDontSee('<li')
+            ->assertDontSee('<article')
+            ->assertSeeHtml('</ol>');
+    }
+
+    public function testPostFeedWithSinglePost()
+    {
+        Hyde::pages()->add(new MarkdownPost('hello-world', ['author' => 'mr_hyde'], 'Hello World!'));
+
+        $view = $this->view(view('hyde::components.blog-post-feed'));
+
+        $view->assertSeeHtml('<ol itemscope itemtype="https://schema.org/ItemList">')
+            ->assertSeeHtml('<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"')
+            ->assertSeeHtml('<meta itemprop="position" content="1">')
+            ->assertSeeHtml('<article itemprop="item" itemscope itemtype="https://schema.org/BlogPosting">')
+            ->assertSeeHtml('<meta itemprop="identifier" content="hello-world">')
+            ->assertSeeHtml('<a href="posts/hello-world.html"')
+            ->assertSeeHtml('<h2 itemprop="headline"')
+            ->assertSee('Hello World')
+            ->assertSeeHtml('<span itemprop="author" itemscope itemtype="https://schema.org/Person">')
+            ->assertSee('Mr. Hyde')
+            ->assertSeeHtml('<p itemprop="description"')
+            ->assertSee('Hello World!')
+            ->assertSeeHtml('<a href="posts/hello-world.html"')
+            ->assertSee('Read post')
+            ->assertSeeHtml('</article>')
+            ->assertSeeHtml('</li>')
+            ->assertSeeHtml('</ol>');
+    }
+
+    public function testPostFeedWithMultiplePosts()
+    {
+        Hyde::pages()->add(new MarkdownPost('hello-world', ['author' => 'mr_hyde'], 'Hello World!'));
+        Hyde::pages()->add(new MarkdownPost('second-post', ['author' => 'jane_doe'], 'Another post content'));
+
+        $view = $this->view(view('hyde::components.blog-post-feed'));
+
+        $view->assertSeeHtml('<ol itemscope itemtype="https://schema.org/ItemList">')
+            ->assertSeeHtml('<meta itemprop="position" content="1">')
+            ->assertSeeHtml('<meta itemprop="position" content="2">')
+            ->assertSee('Hello World')
+            ->assertSee('Mr. Hyde')
+            ->assertSee('Another post content')
+            ->assertSee('Jane Doe')
+            ->assertSeeHtml('</ol>');
+    }
+}

From 6cbefcfeff892681cb4d9c586e69ecdf81b03739 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:43:39 +0200
Subject: [PATCH 2686/2811] Refactor to use the loop variable instead of the
 index

---
 .../resources/views/components/blog-post-feed.blade.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php
index 59e4ca4bd76..67a6c6d9e19 100644
--- a/packages/framework/resources/views/components/blog-post-feed.blade.php
+++ b/packages/framework/resources/views/components/blog-post-feed.blade.php
@@ -1,7 +1,7 @@
 <ol itemscope itemtype="https://schema.org/ItemList">
-    @foreach(MarkdownPost::getLatestPosts()->values() as $index => $post)
+    @foreach(MarkdownPost::getLatestPosts() as $post)
         <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mt-4 mb-8">
-            <meta itemprop="position" content="{{ $index + 1 }}">
+            <meta itemprop="position" content="{{ $loop->iteration }}">
             @include('hyde::components.article-excerpt')
         </li>
     @endforeach

From 8bb51164b1aa3038a1871b2884883384cede6d33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:54:11 +0200
Subject: [PATCH 2687/2811] Support passing posts to the component

---
 .../views/components/blog-post-feed.blade.php |  2 +-
 .../Views/BlogPostFeedComponentViewTest.php   | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php
index 67a6c6d9e19..e3943b3532a 100644
--- a/packages/framework/resources/views/components/blog-post-feed.blade.php
+++ b/packages/framework/resources/views/components/blog-post-feed.blade.php
@@ -1,5 +1,5 @@
 <ol itemscope itemtype="https://schema.org/ItemList">
-    @foreach(MarkdownPost::getLatestPosts() as $post)
+    @foreach($posts ?? MarkdownPost::getLatestPosts() as $post)
         <li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mt-4 mb-8">
             <meta itemprop="position" content="{{ $loop->iteration }}">
             @include('hyde::components.article-excerpt')
diff --git a/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php b/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php
index cbc5b8c1f03..9cf2198fce8 100644
--- a/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/BlogPostFeedComponentViewTest.php
@@ -67,4 +67,26 @@ public function testPostFeedWithMultiplePosts()
             ->assertSee('Jane Doe')
             ->assertSeeHtml('</ol>');
     }
+
+    public function testPostFeedWithCustomPosts()
+    {
+        Hyde::pages()->add(new MarkdownPost('global', ['author' => 'default'], 'Ignored post content'));
+
+        $customPosts = [
+            new MarkdownPost('hello-world', ['author' => 'mr_hyde'], 'Hello World!'),
+            new MarkdownPost('second-post', ['author' => 'jane_doe'], 'Another post content'),
+        ];
+
+        $view = $this->view(view('hyde::components.blog-post-feed', [
+            'posts' => $customPosts,
+        ]));
+
+        $view->assertSeeHtml('<ol itemscope itemtype="https://schema.org/ItemList">')
+            ->assertDontSee('Ignored post content')
+            ->assertSee('Hello World')
+            ->assertSee('Mr. Hyde')
+            ->assertSee('Another post content')
+            ->assertSee('Jane Doe')
+            ->assertSeeHtml('</ol>');
+    }
 }

From f74102e8e2ee7d395748de4de5f168ca25480ecb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 11:54:53 +0200
Subject: [PATCH 2688/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 56c25e5f345..1d25087a717 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,7 @@ This serves two purposes:
 - Added support for setting custom navigation items in the YAML configuration in https://github.com/hydephp/develop/pull/1818
 - Added support for setting extra attributes for navigation items in https://github.com/hydephp/develop/pull/1824
 - Introduced a new navigation config builder class to simplify navigation configuration in https://github.com/hydephp/develop/pull/1827
+- You can now add custom posts to the blog post feed component when including it directly in https://github.com/hydephp/develop/pull/1893
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.

From 0f5526aee870d2397d4815f1c3a48ea1586dd64f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:00:03 +0200
Subject: [PATCH 2689/2811] Create FeatureEnumTest.php

---
 .../framework/tests/Unit/FeatureEnumTest.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Unit/FeatureEnumTest.php

diff --git a/packages/framework/tests/Unit/FeatureEnumTest.php b/packages/framework/tests/Unit/FeatureEnumTest.php
new file mode 100644
index 00000000000..2688dc7880e
--- /dev/null
+++ b/packages/framework/tests/Unit/FeatureEnumTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Enums\Feature
+ */
+class FeatureEnumTest extends UnitTestCase
+{
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}

From e09313fb2ece38cfbde4406acfa63c67455ac34a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:00:56 +0200
Subject: [PATCH 2690/2811] Generate test with Claude

---
 .../framework/tests/Unit/FeatureEnumTest.php  | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/FeatureEnumTest.php b/packages/framework/tests/Unit/FeatureEnumTest.php
index 2688dc7880e..bc2aefb39e8 100644
--- a/packages/framework/tests/Unit/FeatureEnumTest.php
+++ b/packages/framework/tests/Unit/FeatureEnumTest.php
@@ -5,14 +5,29 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Testing\UnitTestCase;
+use Hyde\Enums\Feature;
 
 /**
  * @covers \Hyde\Enums\Feature
  */
 class FeatureEnumTest extends UnitTestCase
 {
-    public function testExample()
+    public function testEnumCasesExist()
     {
-        $this->assertTrue(true);
+        $this->assertInstanceOf(Feature::class, Feature::HtmlPages);
+        $this->assertInstanceOf(Feature::class, Feature::MarkdownPosts);
+        $this->assertInstanceOf(Feature::class, Feature::BladePages);
+        $this->assertInstanceOf(Feature::class, Feature::MarkdownPages);
+        $this->assertInstanceOf(Feature::class, Feature::DocumentationPages);
+        $this->assertInstanceOf(Feature::class, Feature::Darkmode);
+        $this->assertInstanceOf(Feature::class, Feature::DocumentationSearch);
+        $this->assertInstanceOf(Feature::class, Feature::Torchlight);
+    }
+
+    public function testEnumValuesAreUnique()
+    {
+        $values = array_map(fn($case) => $case->name, Feature::cases());
+        $uniqueValues = array_unique($values);
+        $this->assertSame(count($values), count($uniqueValues));
     }
 }

From 39e62be7070efef12a61b177fd8bdfc608e1f2be Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:01:04 +0200
Subject: [PATCH 2691/2811] Add a `Feature::fromName()` enum helper

---
 packages/framework/src/Enums/Feature.php       |  7 +++++++
 .../framework/tests/Unit/FeatureEnumTest.php   | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 85694270e0c..36dbaa013c9 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Enums;
 
+use function constant;
+
 /**
  * A configurable feature that belongs to the Features class.
  *
@@ -24,4 +26,9 @@ enum Feature
 
     // Integrations
     case Torchlight;
+
+    public static function fromName(string $name): self
+    {
+        return constant("self::$name");
+    }
 }
diff --git a/packages/framework/tests/Unit/FeatureEnumTest.php b/packages/framework/tests/Unit/FeatureEnumTest.php
index bc2aefb39e8..d2b81923443 100644
--- a/packages/framework/tests/Unit/FeatureEnumTest.php
+++ b/packages/framework/tests/Unit/FeatureEnumTest.php
@@ -24,6 +24,24 @@ public function testEnumCasesExist()
         $this->assertInstanceOf(Feature::class, Feature::Torchlight);
     }
 
+    public function testFromNameMethod()
+    {
+        $this->assertSame(Feature::HtmlPages, Feature::fromName('HtmlPages'));
+        $this->assertSame(Feature::MarkdownPosts, Feature::fromName('MarkdownPosts'));
+        $this->assertSame(Feature::BladePages, Feature::fromName('BladePages'));
+        $this->assertSame(Feature::MarkdownPages, Feature::fromName('MarkdownPages'));
+        $this->assertSame(Feature::DocumentationPages, Feature::fromName('DocumentationPages'));
+        $this->assertSame(Feature::Darkmode, Feature::fromName('Darkmode'));
+        $this->assertSame(Feature::DocumentationSearch, Feature::fromName('DocumentationSearch'));
+        $this->assertSame(Feature::Torchlight, Feature::fromName('Torchlight'));
+    }
+
+    public function testFromNameMethodThrowsExceptionForInvalidName()
+    {
+        $this->expectException(\Error::class);
+        Feature::fromName('InvalidFeatureName');
+    }
+
     public function testEnumValuesAreUnique()
     {
         $values = array_map(fn($case) => $case->name, Feature::cases());

From f7cc5ed718ef8e948b23f5f3f6a2b8a0a46e4244 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:04:09 +0200
Subject: [PATCH 2692/2811] Update helper to return null if not defined

---
 packages/framework/src/Enums/Feature.php          | 7 ++++++-
 packages/framework/tests/Unit/FeatureEnumTest.php | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index 36dbaa013c9..ed9f40cb6df 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Enums;
 
+use function defined;
 use function constant;
 
 /**
@@ -27,8 +28,12 @@ enum Feature
     // Integrations
     case Torchlight;
 
-    public static function fromName(string $name): self
+    public static function fromName(string $name): ?self
     {
+        if (! defined("self::$name")) {
+            return null;
+        }
+
         return constant("self::$name");
     }
 }
diff --git a/packages/framework/tests/Unit/FeatureEnumTest.php b/packages/framework/tests/Unit/FeatureEnumTest.php
index d2b81923443..d1d724830ed 100644
--- a/packages/framework/tests/Unit/FeatureEnumTest.php
+++ b/packages/framework/tests/Unit/FeatureEnumTest.php
@@ -36,10 +36,9 @@ public function testFromNameMethod()
         $this->assertSame(Feature::Torchlight, Feature::fromName('Torchlight'));
     }
 
-    public function testFromNameMethodThrowsExceptionForInvalidName()
+    public function testFromNameMethodReturnsNullForInvalidName()
     {
-        $this->expectException(\Error::class);
-        Feature::fromName('InvalidFeatureName');
+        $this->assertNull(Feature::fromName('InvalidName'));
     }
 
     public function testEnumValuesAreUnique()

From de729eb99abee1af09e9d2d2fa3e44dd45d230a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:04:39 +0200
Subject: [PATCH 2693/2811] Document method

Matching the PHP tryFrom method documentation
---
 packages/framework/src/Enums/Feature.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Enums/Feature.php b/packages/framework/src/Enums/Feature.php
index ed9f40cb6df..2c854356686 100644
--- a/packages/framework/src/Enums/Feature.php
+++ b/packages/framework/src/Enums/Feature.php
@@ -28,6 +28,7 @@ enum Feature
     // Integrations
     case Torchlight;
 
+    /** Translates a case name into the corresponding Enum case, if any. If there is no matching case defined, it will return null. */
     public static function fromName(string $name): ?self
     {
         if (! defined("self::$name")) {

From 5ccdbec12a3e2e10bc55fbe2446501c3dcfe730b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:10:32 +0200
Subject: [PATCH 2694/2811] Clean up generated test

---
 .../framework/tests/Unit/FeatureEnumTest.php  | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Unit/FeatureEnumTest.php b/packages/framework/tests/Unit/FeatureEnumTest.php
index d1d724830ed..bb1ee28dd5a 100644
--- a/packages/framework/tests/Unit/FeatureEnumTest.php
+++ b/packages/framework/tests/Unit/FeatureEnumTest.php
@@ -12,16 +12,18 @@
  */
 class FeatureEnumTest extends UnitTestCase
 {
-    public function testEnumCasesExist()
+    public function testEnumCases()
     {
-        $this->assertInstanceOf(Feature::class, Feature::HtmlPages);
-        $this->assertInstanceOf(Feature::class, Feature::MarkdownPosts);
-        $this->assertInstanceOf(Feature::class, Feature::BladePages);
-        $this->assertInstanceOf(Feature::class, Feature::MarkdownPages);
-        $this->assertInstanceOf(Feature::class, Feature::DocumentationPages);
-        $this->assertInstanceOf(Feature::class, Feature::Darkmode);
-        $this->assertInstanceOf(Feature::class, Feature::DocumentationSearch);
-        $this->assertInstanceOf(Feature::class, Feature::Torchlight);
+        $this->assertSame([
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
+            Feature::MarkdownPages,
+            Feature::DocumentationPages,
+            Feature::Darkmode,
+            Feature::DocumentationSearch,
+            Feature::Torchlight,
+        ], Feature::cases());
     }
 
     public function testFromNameMethod()
@@ -40,11 +42,4 @@ public function testFromNameMethodReturnsNullForInvalidName()
     {
         $this->assertNull(Feature::fromName('InvalidName'));
     }
-
-    public function testEnumValuesAreUnique()
-    {
-        $values = array_map(fn($case) => $case->name, Feature::cases());
-        $uniqueValues = array_unique($values);
-        $this->assertSame(count($values), count($uniqueValues));
-    }
 }

From d7a173d3ec4da0956dab09f04bdc80c81b3ba3de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:12:02 +0200
Subject: [PATCH 2695/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1d25087a717..05e014306af 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -20,6 +20,7 @@ This serves two purposes:
 - Added support for setting extra attributes for navigation items in https://github.com/hydephp/develop/pull/1824
 - Introduced a new navigation config builder class to simplify navigation configuration in https://github.com/hydephp/develop/pull/1827
 - You can now add custom posts to the blog post feed component when including it directly in https://github.com/hydephp/develop/pull/1893
+- Added a `Feature::fromName()` enum helper in https://github.com/hydephp/develop/pull/1895
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.

From ea17c2151423adba4de83b65abad32327c440f76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 13:48:55 +0200
Subject: [PATCH 2696/2811] Test can specify features in YAML configuration

---
 .../Feature/YamlConfigurationFeatureTest.php  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 4bd0a733680..3100b9a6c60 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -5,7 +5,10 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Hyde;
+use ReflectionClass;
+use Hyde\Enums\Feature;
 use Hyde\Testing\TestCase;
+use Hyde\Facades\Features;
 use Illuminate\Support\Env;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Framework\Features\Navigation\NavigationItem;
@@ -726,6 +729,50 @@ public function testAddingExtraYamlNavigationItemFieldsThrowsAnException()
         unlink('hyde.yml');
     }
 
+    public function testCanSpecifyFeaturesInYamlConfiguration()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          features:
+            - html-pages
+            - markdown-posts
+            - blade-pages
+            - markdown-pages
+            - documentation-pages
+        YAML);
+
+        $this->runBootstrappers();
+
+        $expectedFeatures = [
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
+            Feature::MarkdownPages,
+            Feature::DocumentationPages,
+        ];
+
+        // Test that the Features facade methods return the correct values
+        $this->assertTrue(Features::hasHtmlPages());
+        $this->assertTrue(Features::hasMarkdownPosts());
+        $this->assertTrue(Features::hasBladePages());
+        $this->assertTrue(Features::hasMarkdownPages());
+        $this->assertTrue(Features::hasDocumentationPages());
+        $this->assertFalse(Features::hasDarkmode());
+        $this->assertFalse(Features::hasDocumentationSearch());
+        $this->assertFalse(Features::hasTorchlight());
+
+        // Test that a disabled feature returns false
+        $this->assertFalse(Features::has(Feature::Darkmode));
+
+
+        // Use reflection to access the protected features property
+        $reflection = new ReflectionClass(Hyde::features());
+        $featuresProperty = $reflection->getProperty('features');
+        $actualFeatures = $featuresProperty->getValue(Hyde::features());
+
+        $this->assertSame($expectedFeatures, $actualFeatures);
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From d395df6f1221627c086fc036a503463430da6c9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:17:14 +0200
Subject: [PATCH 2697/2811] Support specifying features in the YAML
 configuration

---
 .../Internal/LoadYamlConfiguration.php        | 23 +++++++++
 .../Feature/YamlConfigurationFeatureTest.php  | 51 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 51c9bb9df1f..1c815bc498d 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Foundation\Internal;
 
+use Hyde\Enums\Feature;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Hyde\Foundation\Application;
 use Illuminate\Config\Repository;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
@@ -56,6 +58,10 @@ protected function mergeParsedConfiguration(): void
                 $data['authors'] = $this->parseAuthors($data['authors']);
             }
 
+            if ($namespace === 'hyde' && isset($data['features'])) {
+                $data['features'] = $this->parseFeatures($data['features']);
+            }
+
             $this->mergeConfiguration($namespace, Arr::undot($data ?: []));
         }
     }
@@ -77,4 +83,21 @@ protected function parseAuthors(array $authors): array
             return InvalidConfigurationException::try(fn () => [$username => PostAuthor::create($author)], $message);
         });
     }
+
+    /**
+     * @param  array<string>  $features
+     * @return array<\Hyde\Enums\Feature>
+     */
+    protected function parseFeatures(array $features): array
+    {
+        return array_map(function (string $feature): Feature {
+            $enumName = Str::studly($feature);
+            $case = Feature::fromName($enumName);
+            if (! $case) {
+                throw new InvalidConfigurationException("Invalid feature '{$feature}' specified in the YAML config file. (Feature::{$enumName} does not exist)");
+            }
+
+            return $case;
+        }, $features);
+    }
 }
diff --git a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
index 3100b9a6c60..5f2eefb0870 100644
--- a/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationFeatureTest.php
@@ -764,6 +764,35 @@ public function testCanSpecifyFeaturesInYamlConfiguration()
         // Test that a disabled feature returns false
         $this->assertFalse(Features::has(Feature::Darkmode));
 
+        // Use reflection to access the protected features property
+        $reflection = new ReflectionClass(Hyde::features());
+        $featuresProperty = $reflection->getProperty('features');
+        $actualFeatures = $featuresProperty->getValue(Hyde::features());
+
+        $this->assertSame($expectedFeatures, $actualFeatures);
+    }
+
+    public function testCanSpecifyFeaturesInYamlConfigurationWithUnderscores()
+    {
+        $this->file('hyde.yml', <<<'YAML'
+        hyde:
+          features:
+            - html_pages
+            - markdown_posts
+            - blade_pages
+            - markdown_pages
+            - documentation_pages
+        YAML);
+
+        $this->runBootstrappers();
+
+        $expectedFeatures = [
+            Feature::HtmlPages,
+            Feature::MarkdownPosts,
+            Feature::BladePages,
+            Feature::MarkdownPages,
+            Feature::DocumentationPages,
+        ];
 
         // Use reflection to access the protected features property
         $reflection = new ReflectionClass(Hyde::features());
@@ -773,6 +802,28 @@ public function testCanSpecifyFeaturesInYamlConfiguration()
         $this->assertSame($expectedFeatures, $actualFeatures);
     }
 
+    public function testExceptionIsThrownWhenFeatureIsNotDefined()
+    {
+        $exceptionThrown = false;
+
+        file_put_contents('hyde.yml', <<<'YAML'
+        hyde:
+          features:
+            - not-a-feature
+        YAML);
+
+        try {
+            $this->runBootstrappers();
+        } catch (InvalidConfigurationException $exception) {
+            $exceptionThrown = true;
+            $this->assertSame("Invalid feature 'not-a-feature' specified in the YAML config file. (Feature::NotAFeature does not exist)", $exception->getMessage());
+        }
+
+        unlink('hyde.yml');
+
+        $this->assertTrue($exceptionThrown, 'Failed asserting that the exception was thrown.');
+    }
+
     protected function runBootstrappers(?array $withMergedConfig = null): void
     {
         $this->refreshApplication();

From 1c6381d3d277a792a6bfcaacbe4e5897c607cd58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:18:47 +0200
Subject: [PATCH 2698/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 05e014306af..3a38491bf1c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -21,6 +21,7 @@ This serves two purposes:
 - Introduced a new navigation config builder class to simplify navigation configuration in https://github.com/hydephp/develop/pull/1827
 - You can now add custom posts to the blog post feed component when including it directly in https://github.com/hydephp/develop/pull/1893
 - Added a `Feature::fromName()` enum helper in https://github.com/hydephp/develop/pull/1895
+- Added support for specifying features in the YAML configuration in https://github.com/hydephp/develop/pull/1896
 
 ### Changed
 - **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.

From 61457cdaddc917cbbb7c94d42e2109902cdfae76 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:22:27 +0200
Subject: [PATCH 2699/2811] Cleanup the code

---
 .../src/Foundation/Internal/LoadYamlConfiguration.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 1c815bc498d..1a39dc46948 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -91,10 +91,11 @@ protected function parseAuthors(array $authors): array
     protected function parseFeatures(array $features): array
     {
         return array_map(function (string $feature): Feature {
-            $enumName = Str::studly($feature);
-            $case = Feature::fromName($enumName);
+            $name = Str::studly($feature);
+            $case = Feature::fromName($name);
+
             if (! $case) {
-                throw new InvalidConfigurationException("Invalid feature '{$feature}' specified in the YAML config file. (Feature::{$enumName} does not exist)");
+                throw new InvalidConfigurationException("Invalid feature '{$feature}' specified in the YAML config file. (Feature::{$name} does not exist)");
             }
 
             return $case;

From 2a97871d285dcd2e0b4ad211fb68dfa4fd1c52ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 14:29:32 +0200
Subject: [PATCH 2700/2811] Unwrap curly braces

---
 .../framework/src/Foundation/Internal/LoadYamlConfiguration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
index 1a39dc46948..7a0e07e9d03 100644
--- a/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
+++ b/packages/framework/src/Foundation/Internal/LoadYamlConfiguration.php
@@ -95,7 +95,7 @@ protected function parseFeatures(array $features): array
             $case = Feature::fromName($name);
 
             if (! $case) {
-                throw new InvalidConfigurationException("Invalid feature '{$feature}' specified in the YAML config file. (Feature::{$name} does not exist)");
+                throw new InvalidConfigurationException("Invalid feature '$feature' specified in the YAML config file. (Feature::$name does not exist)");
             }
 
             return $case;

From c201d3a911e563d84d1c2ada7540fef1159b8df9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 16:27:49 +0200
Subject: [PATCH 2701/2811] Update the build service to group together dynamic
 pages

---
 .../framework/src/Framework/Services/BuildService.php    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index e275ed2dd39..37d489afe8d 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Hyde;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Foundation\Kernel\RouteCollection;
 use Hyde\Framework\Actions\StaticPageBuilder;
@@ -62,6 +63,10 @@ protected function compilePagesForClass(string $pageClass): void
 
     protected function getClassPluralName(string $pageClass): string
     {
+        if ($pageClass === InMemoryPage::class) {
+            return 'Dynamic Pages';
+        }
+
         return preg_replace('/([a-z])([A-Z])/', '$1 $2', class_basename($pageClass)).'s';
     }
 
@@ -69,6 +74,10 @@ protected function getClassPluralName(string $pageClass): string
     protected function getPageTypes(): array
     {
         return Hyde::pages()->map(function (HydePage $page): string {
+            if ($page instanceof InMemoryPage) {
+                return InMemoryPage::class;
+            }
+
             return $page::class;
         })->unique()->values()->toArray();
     }

From cf0bfc8a4cfb23b991c3ad654ab6e40039d671bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 16:33:02 +0200
Subject: [PATCH 2702/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3a38491bf1c..2c37ec7a021 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -56,6 +56,7 @@ This serves two purposes:
 - Markdown returned from includes are now trimmed of trailing whitespace and newlines in https://github.com/hydephp/develop/pull/1738
 - Reorganized and cleaned up the navigation and sidebar documentation for improved clarity.
 - Moved the sidebar documentation to the documentation pages section for better organization.
+- The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 
 ### Deprecated
 - for soon-to-be removed features.

From 37e5921bc1b46cd98b133668f6859922571b7a23 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 18:39:43 +0100
Subject: [PATCH 2703/2811] Initial feature abstract

---
 docs/digging-deeper/advanced-markdown.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index bf58e739fd1..3b13d463bed 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -156,6 +156,14 @@ anything within the path label will be rendered as HTML. This means you can add
 ```
 ````
 
+### Dynamic Markdown links
+
+In order to create automatically resolved links from your pages and posts, you can use the special Hyde Markdown link syntax.
+
+For all the supported syntax options, Hyde will resolve a relative link based on the current page being rendered.
+
+Since this happens in our Markdown processor, this will work regardless of if you have custom HTML or Blade enabled for your site.
+
 ### Limitations
 
 The filepaths are hidden on mobile devices using CSS to prevent them from overlapping with the code block.

From 1f9912865a541e331c97f92364a10363331be61c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 18:39:48 +0100
Subject: [PATCH 2704/2811] Add examples

---
 docs/digging-deeper/advanced-markdown.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 3b13d463bed..0256ed6458f 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -164,6 +164,24 @@ For all the supported syntax options, Hyde will resolve a relative link based on
 
 Since this happens in our Markdown processor, this will work regardless of if you have custom HTML or Blade enabled for your site.
 
+#### Resolving a route
+
+```markdown
+[Home](hyde::route('home'))
+```
+
+#### Resolving a relative link
+
+```markdown
+[Home](hyde::relativeLink('home'))
+```
+
+#### Resolving a media asset
+
+```markdown
+![Image](hyde::media('image.jpg'))
+```
+
 ### Limitations
 
 The filepaths are hidden on mobile devices using CSS to prevent them from overlapping with the code block.

From 04dcd92ddbfd8bc395df8d9d40917cb378033a3c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 25 Feb 2024 18:43:05 +0100
Subject: [PATCH 2705/2811] Streamline examples

---
 docs/digging-deeper/advanced-markdown.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 0256ed6458f..bf2240e6c93 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -164,21 +164,14 @@ For all the supported syntax options, Hyde will resolve a relative link based on
 
 Since this happens in our Markdown processor, this will work regardless of if you have custom HTML or Blade enabled for your site.
 
-#### Resolving a route
-
 ```markdown
+<!-- Resolving a route -->
 [Home](hyde::route('home'))
-```
 
-#### Resolving a relative link
-
-```markdown
+<!-- Resolving a relative link -->
 [Home](hyde::relativeLink('home'))
-```
-
-#### Resolving a media asset
 
-```markdown
+<!-- Resolving a media asset -->
 ![Image](hyde::media('image.jpg'))
 ```
 

From eec58870c6ff389c90244bd5f701ab52872dce78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:15:06 +0200
Subject: [PATCH 2706/2811] Match the Hyde facade methods

---
 docs/digging-deeper/advanced-markdown.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index bf2240e6c93..fd9803663a1 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -172,7 +172,7 @@ Since this happens in our Markdown processor, this will work regardless of if yo
 [Home](hyde::relativeLink('home'))
 
 <!-- Resolving a media asset -->
-![Image](hyde::media('image.jpg'))
+![Image](hyde::asset('image.jpg'))
 ```
 
 ### Limitations

From 397da8e0045aba6e59a0104a1f83a89c919cc477 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:24:25 +0200
Subject: [PATCH 2707/2811] Create DynamicMarkdownLinksTest.php

---
 .../tests/Feature/DynamicMarkdownLinksTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Feature/DynamicMarkdownLinksTest.php

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
new file mode 100644
index 00000000000..eae8ef2be58
--- /dev/null
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Hyde
+ */
+class DynamicMarkdownLinksTest extends TestCase
+{
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}

From 63bab3b8308b95d6cabb0772a448c8690e24bfd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:17:36 +0200
Subject: [PATCH 2708/2811] Create DynamicMarkdownLinkProcessor.php

---
 .../Processing/DynamicMarkdownLinkProcessor.php        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
new file mode 100644
index 00000000000..24b2415c298
--- /dev/null
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Markdown\Processing;
+
+class DynamicMarkdownLinkProcessor
+{
+    //
+}

From d1ee654e231b6ecdcc2152a608abd5edc719504c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:17:51 +0200
Subject: [PATCH 2709/2811] Implements MarkdownPostProcessorContract

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 24b2415c298..ce913e077d5 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Markdown\Processing;
 
-class DynamicMarkdownLinkProcessor
+use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
+
+class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     //
 }

From a2e30520d8e03088afc0763f0167899174d209ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:24:16 +0200
Subject: [PATCH 2710/2811] Draft postprocess method

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index ce913e077d5..a47642414a4 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -8,5 +8,8 @@
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
-    //
+    public static function postprocess(string $html): string
+    {
+        // TODO: Implement postprocess() method.
+    }
 }

From 59b06182e4716c528ec90d43d22590ece6c9be39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:24:32 +0200
Subject: [PATCH 2711/2811] Revert "Create DynamicMarkdownLinksTest.php"

This reverts commit 091a8d5c48f51af5e24686cfca3494daf79c3ba6.
---
 .../tests/Feature/DynamicMarkdownLinksTest.php | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/DynamicMarkdownLinksTest.php

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
deleted file mode 100644
index eae8ef2be58..00000000000
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Hyde
- */
-class DynamicMarkdownLinksTest extends TestCase
-{
-    public function testExample()
-    {
-        $this->assertTrue(true);
-    }
-}

From 47bfef53fb5985da8123466fb055cdbcd9c90d95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:26:21 +0200
Subject: [PATCH 2712/2811] Create DynamicMarkdownLinkProcessorTest.php

---
 .../Markdown/DynamicMarkdownLinkProcessorTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
new file mode 100644
index 00000000000..4fc7c0e2f1a
--- /dev/null
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature\Services\Markdown;
+
+use Hyde\Testing\UnitTestCase;
+
+/**
+ * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
+ */
+class DynamicMarkdownLinkProcessorTest extends UnitTestCase
+{
+    //
+}

From 9a08865586e21def88514c4ad64e2ae007e3e09b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:33:23 +0200
Subject: [PATCH 2713/2811] Implement the initial dynamic markdown link feature

---
 .../DynamicMarkdownLinkProcessor.php          | 19 ++++++-
 .../DynamicMarkdownLinkProcessorTest.php      | 52 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index a47642414a4..3b17b28b5fc 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -4,12 +4,29 @@
 
 namespace Hyde\Markdown\Processing;
 
+use Hyde\Hyde;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
-        // TODO: Implement postprocess() method.
+        $patterns = [
+            '/<a href="hyde::route\(\'([^\']+)\'\)"/' => function ($matches) {
+                return '<a href="'.Hyde::route($matches[1]).'"';
+            },
+            '/<a href="hyde::relativeLink\(\'([^\']+)\'\)"/' => function ($matches) {
+                return '<a href="'.Hyde::relativeLink($matches[1]).'"';
+            },
+            '/<img src="hyde::asset\(\'([^\']+)\'\)"/' => function ($matches) {
+                return '<img src="'.Hyde::asset($matches[1]).'"';
+            },
+        ];
+
+        foreach ($patterns as $pattern => $replacement) {
+            $html = preg_replace_callback($pattern, $replacement, $html);
+        }
+
+        return $html;
     }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 4fc7c0e2f1a..c6e42bcff2a 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -4,12 +4,62 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Models\Route;
+use Hyde\Support\Facades\Render;
+use Hyde\Foundation\Facades\Routes;
+use Hyde\Support\Models\RenderData;
+use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
  */
 class DynamicMarkdownLinkProcessorTest extends UnitTestCase
 {
-    //
+    protected static bool $needsConfig = true;
+    protected static bool $needsKernel = true;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Render::swap(new RenderData());
+
+        Routes::addRoute(new Route(new InMemoryPage('home')));
+    }
+
+    public function testRouteReplacement()
+    {
+        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
+        $expected = '<p><a href="home.html">Home</a></p>';
+        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testRelativeLinkReplacement()
+    {
+        $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
+        $expected = '<p><a href="about">About</a></p>';
+        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testAssetReplacement()
+    {
+        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
+        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
+        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMultipleReplacements()
+    {
+        $input = '<p><a href="hyde::route(\'home\')">Home</a> <a href="hyde::relativeLink(\'about\')">About</a> <img src="hyde::asset(\'logo.png\')" alt="Logo" /></p>';
+        $expected = '<p><a href="home.html">Home</a> <a href="about">About</a> <img src="media/logo.png" alt="Logo" /></p>';
+        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testNoReplacements()
+    {
+        $input = '<p>This is a regular <a href="https://example.com">link</a> with no Hyde syntax.</p>';
+        $this->assertEquals($input, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 }

From 6ec38dd1f4b1fbde44ef66cd099c8829342aa8a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:45:56 +0200
Subject: [PATCH 2714/2811] Refactor to use strict types

---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 3b17b28b5fc..ef41334443b 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -11,14 +11,15 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
+        /** @var array<string, callable(array<int, string>): string> $patterns */
         $patterns = [
-            '/<a href="hyde::route\(\'([^\']+)\'\)"/' => function ($matches) {
+            '/<a href="hyde::route\(\'([^\']+)\'\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::route($matches[1]).'"';
             },
-            '/<a href="hyde::relativeLink\(\'([^\']+)\'\)"/' => function ($matches) {
+            '/<a href="hyde::relativeLink\(\'([^\']+)\'\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::relativeLink($matches[1]).'"';
             },
-            '/<img src="hyde::asset\(\'([^\']+)\'\)"/' => function ($matches) {
+            '/<img src="hyde::asset\(\'([^\']+)\'\)"/' => function (array $matches): string {
                 return '<img src="'.Hyde::asset($matches[1]).'"';
             },
         ];

From eabee96bbe0a4500aeca4bf8b52a937aed13a468 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:48:12 +0200
Subject: [PATCH 2715/2811] Extract helper method

---
 .../DynamicMarkdownLinkProcessor.php          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index ef41334443b..52ae7a605eb 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -11,8 +11,17 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
-        /** @var array<string, callable(array<int, string>): string> $patterns */
-        $patterns = [
+        foreach (static::patterns() as $pattern => $replacement) {
+            $html = preg_replace_callback($pattern, $replacement, $html);
+        }
+
+        return $html;
+    }
+
+    /** @return array<string, callable(array<int, string>): string> */
+    protected static function patterns(): array
+    {
+        return [
             '/<a href="hyde::route\(\'([^\']+)\'\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::route($matches[1]).'"';
             },
@@ -23,11 +32,5 @@ public static function postprocess(string $html): string
                 return '<img src="'.Hyde::asset($matches[1]).'"';
             },
         ];
-
-        foreach ($patterns as $pattern => $replacement) {
-            $html = preg_replace_callback($pattern, $replacement, $html);
-        }
-
-        return $html;
     }
 }

From 3c91dd7958e16d4449b2322b03d94ab309e40117 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:49:51 +0200
Subject: [PATCH 2716/2811] Supress faulty inspection

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index c6e42bcff2a..d722ca54b0e 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -1,5 +1,7 @@
 <?php
 
+/** @noinspection HtmlUnknownTarget */
+
 declare(strict_types=1);
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;

From a2c7879815e84a59e73ab5d152350da2febcea95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:54:33 +0200
Subject: [PATCH 2717/2811] Use more readable formatting for complex test
 fixture

---
 .../Markdown/DynamicMarkdownLinkProcessorTest.php  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index d722ca54b0e..183a6d7414b 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -54,8 +54,18 @@ public function testAssetReplacement()
 
     public function testMultipleReplacements()
     {
-        $input = '<p><a href="hyde::route(\'home\')">Home</a> <a href="hyde::relativeLink(\'about\')">About</a> <img src="hyde::asset(\'logo.png\')" alt="Logo" /></p>';
-        $expected = '<p><a href="home.html">Home</a> <a href="about">About</a> <img src="media/logo.png" alt="Logo" /></p>';
+        $input = <<<'MARKDOWN'
+        <a href="hyde::route('home')">Home</a>
+        <a href="hyde::relativeLink('about')">About</a>
+        <img src="hyde::asset('logo.png')" alt="Logo" />
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <a href="home.html">Home</a>
+        <a href="about">About</a>
+        <img src="media/logo.png" alt="Logo" />
+        HTML;
+
         $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 

From 33ba914f9ec938abf3cb4909a4871d2ed0811504 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:54:59 +0200
Subject: [PATCH 2718/2811] Use assert same instead of assert equals

---
 .../Markdown/DynamicMarkdownLinkProcessorTest.php      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 183a6d7414b..48026b79b39 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -35,21 +35,21 @@ public function testRouteReplacement()
     {
         $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
         $expected = '<p><a href="home.html">Home</a></p>';
-        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testRelativeLinkReplacement()
     {
         $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
         $expected = '<p><a href="about">About</a></p>';
-        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacement()
     {
         $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
         $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
-        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testMultipleReplacements()
@@ -66,12 +66,12 @@ public function testMultipleReplacements()
         <img src="media/logo.png" alt="Logo" />
         HTML;
 
-        $this->assertEquals($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testNoReplacements()
     {
         $input = '<p>This is a regular <a href="https://example.com">link</a> with no Hyde syntax.</p>';
-        $this->assertEquals($input, DynamicMarkdownLinkProcessor::postprocess($input));
+        $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 }

From 15ecda86a7272dcc92ddc8a9b4485a8be0c2d86a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 17:58:44 +0200
Subject: [PATCH 2719/2811] Update Markdown link support to work without single
 quotes

---
 .../Processing/DynamicMarkdownLinkProcessor.php | 12 ++++++------
 .../DynamicMarkdownLinkProcessorTest.php        | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 52ae7a605eb..bf00a9a8c1a 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -22,14 +22,14 @@ public static function postprocess(string $html): string
     protected static function patterns(): array
     {
         return [
-            '/<a href="hyde::route\(\'([^\']+)\'\)"/' => function (array $matches): string {
-                return '<a href="'.Hyde::route($matches[1]).'"';
+            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+                return '<a href="'.Hyde::route($matches[2]).'"';
             },
-            '/<a href="hyde::relativeLink\(\'([^\']+)\'\)"/' => function (array $matches): string {
-                return '<a href="'.Hyde::relativeLink($matches[1]).'"';
+            '/<a href="hyde::relativeLink\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+                return '<a href="'.Hyde::relativeLink($matches[2]).'"';
             },
-            '/<img src="hyde::asset\(\'([^\']+)\'\)"/' => function (array $matches): string {
-                return '<img src="'.Hyde::asset($matches[1]).'"';
+            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+                return '<img src="'.Hyde::asset($matches[2]).'"';
             },
         ];
     }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 48026b79b39..8191fdb7c45 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -36,6 +36,9 @@ public function testRouteReplacement()
         $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
         $expected = '<p><a href="home.html">Home</a></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputUnquoted = '<p><a href="hyde::route(home)">Home</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
     }
 
     public function testRelativeLinkReplacement()
@@ -43,6 +46,9 @@ public function testRelativeLinkReplacement()
         $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
         $expected = '<p><a href="about">About</a></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputUnquoted = '<p><a href="hyde::relativeLink(about)">About</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
     }
 
     public function testAssetReplacement()
@@ -50,6 +56,9 @@ public function testAssetReplacement()
         $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
         $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputUnquoted = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
     }
 
     public function testMultipleReplacements()
@@ -67,6 +76,14 @@ public function testMultipleReplacements()
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputUnquoted = <<<'MARKDOWN'
+        <a href="hyde::route(home)">Home</a>
+        <a href="hyde::relativeLink(about)">About</a>
+        <img src="hyde::asset(logo.png)" alt="Logo" />
+        MARKDOWN;
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
     }
 
     public function testNoReplacements()

From 048910d6d913f591d0d951867c465d8b6cecd6ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:00:20 +0200
Subject: [PATCH 2720/2811] Update Markdown link support to work with double
 quotes

---
 .../DynamicMarkdownLinkProcessor.php          |  6 +--
 .../DynamicMarkdownLinkProcessorTest.php      | 46 +++++++++++++------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index bf00a9a8c1a..fe50a979784 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -22,13 +22,13 @@ public static function postprocess(string $html): string
     protected static function patterns(): array
     {
         return [
-            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<a href="hyde::route\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::route($matches[2]).'"';
             },
-            '/<a href="hyde::relativeLink\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<a href="hyde::relativeLink\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::relativeLink($matches[2]).'"';
             },
-            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<img src="hyde::asset\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<img src="'.Hyde::asset($matches[2]).'"';
             },
         ];
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 8191fdb7c45..7ff8843d509 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -33,9 +33,13 @@ protected function setUp(): void
 
     public function testRouteReplacement()
     {
-        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
         $expected = '<p><a href="home.html">Home</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputSingleQuotes = '<p><a href="hyde::route(\'home\')">Home</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+
+        $inputDoubleQuotes = '<p><a href="hyde::route("home")">Home</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
 
         $inputUnquoted = '<p><a href="hyde::route(home)">Home</a></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
@@ -43,9 +47,13 @@ public function testRouteReplacement()
 
     public function testRelativeLinkReplacement()
     {
-        $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
         $expected = '<p><a href="about">About</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputSingleQuotes = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+
+        $inputDoubleQuotes = '<p><a href="hyde::relativeLink("about")">About</a></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
 
         $inputUnquoted = '<p><a href="hyde::relativeLink(about)">About</a></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
@@ -53,9 +61,13 @@ public function testRelativeLinkReplacement()
 
     public function testAssetReplacement()
     {
-        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
         $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+
+        $inputSingleQuotes = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+
+        $inputDoubleQuotes = '<p><img src="hyde::asset("image.jpg")" alt="Image" /></p>';
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
 
         $inputUnquoted = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
@@ -63,19 +75,27 @@ public function testAssetReplacement()
 
     public function testMultipleReplacements()
     {
-        $input = <<<'MARKDOWN'
-        <a href="hyde::route('home')">Home</a>
-        <a href="hyde::relativeLink('about')">About</a>
-        <img src="hyde::asset('logo.png')" alt="Logo" />
-        MARKDOWN;
-
         $expected = <<<'HTML'
         <a href="home.html">Home</a>
         <a href="about">About</a>
         <img src="media/logo.png" alt="Logo" />
         HTML;
 
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $inputSingleQuotes = <<<'MARKDOWN'
+        <a href="hyde::route('home')">Home</a>
+        <a href="hyde::relativeLink('about')">About</a>
+        <img src="hyde::asset('logo.png')" alt="Logo" />
+        MARKDOWN;
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+
+        $inputDoubleQuotes = <<<'MARKDOWN'
+        <a href="hyde::route("home")">Home</a>
+        <a href="hyde::relativeLink("about")">About</a>
+        <img src="hyde::asset("logo.png")" alt="Logo" />
+        MARKDOWN;
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
 
         $inputUnquoted = <<<'MARKDOWN'
         <a href="hyde::route(home)">Home</a>

From 017355f117a9475bb83eb09a54747d04b11523c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:03:16 +0200
Subject: [PATCH 2721/2811] Split out multiple assertions to dedicated unit
 tests

The testMultipleReplacements method does not need to be split since we don't get any new information from testing already tested alternate syntaxes. That test is mainly for humans to visualise the applicable code better in a more real life scenario.
---
 .../DynamicMarkdownLinkProcessorTest.php      | 97 +++++++++++--------
 1 file changed, 56 insertions(+), 41 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 7ff8843d509..57c875b2f7b 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -33,82 +33,97 @@ protected function setUp(): void
 
     public function testRouteReplacement()
     {
+        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
         $expected = '<p><a href="home.html">Home</a></p>';
 
-        $inputSingleQuotes = '<p><a href="hyde::route(\'home\')">Home</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 
-        $inputDoubleQuotes = '<p><a href="hyde::route("home")">Home</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
+    public function testRouteReplacementWithDoubleQuotes()
+    {
+        $input = '<p><a href="hyde::route("home")">Home</a></p>';
+        $expected = '<p><a href="home.html">Home</a></p>';
 
-        $inputUnquoted = '<p><a href="hyde::route(home)">Home</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testRouteReplacementWithoutQuotes()
+    {
+        $input = '<p><a href="hyde::route(home)">Home</a></p>';
+        $expected = '<p><a href="home.html">Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testRelativeLinkReplacement()
     {
+        $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
         $expected = '<p><a href="about">About</a></p>';
 
-        $inputSingleQuotes = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 
-        $inputDoubleQuotes = '<p><a href="hyde::relativeLink("about")">About</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
+    public function testRelativeLinkReplacementWithDoubleQuotes()
+    {
+        $input = '<p><a href="hyde::relativeLink("about")">About</a></p>';
+        $expected = '<p><a href="about">About</a></p>';
 
-        $inputUnquoted = '<p><a href="hyde::relativeLink(about)">About</a></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testRelativeLinkReplacementWithoutQuotes()
+    {
+        $input = '<p><a href="hyde::relativeLink(about)">About</a></p>';
+        $expected = '<p><a href="about">About</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacement()
     {
+        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
         $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
 
-        $inputSingleQuotes = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 
-        $inputDoubleQuotes = '<p><img src="hyde::asset("image.jpg")" alt="Image" /></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
+    public function testAssetReplacementWithDoubleQuotes()
+    {
+        $input = '<p><img src="hyde::asset("image.jpg")" alt="Image" /></p>';
+        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
 
-        $inputUnquoted = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testMultipleReplacements()
+    public function testAssetReplacementWithoutQuotes()
     {
-        $expected = <<<'HTML'
-        <a href="home.html">Home</a>
-        <a href="about">About</a>
-        <img src="media/logo.png" alt="Logo" />
-        HTML;
+        $input = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
+        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
 
-        $inputSingleQuotes = <<<'MARKDOWN'
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMultipleReplacements()
+    {
+        $input = <<<'MARKDOWN'
         <a href="hyde::route('home')">Home</a>
         <a href="hyde::relativeLink('about')">About</a>
         <img src="hyde::asset('logo.png')" alt="Logo" />
         MARKDOWN;
 
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputSingleQuotes));
-
-        $inputDoubleQuotes = <<<'MARKDOWN'
-        <a href="hyde::route("home")">Home</a>
-        <a href="hyde::relativeLink("about")">About</a>
-        <img src="hyde::asset("logo.png")" alt="Logo" />
-        MARKDOWN;
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputDoubleQuotes));
-
-        $inputUnquoted = <<<'MARKDOWN'
-        <a href="hyde::route(home)">Home</a>
-        <a href="hyde::relativeLink(about)">About</a>
-        <img src="hyde::asset(logo.png)" alt="Logo" />
-        MARKDOWN;
+        $expected = <<<'HTML'
+        <a href="home.html">Home</a>
+        <a href="about">About</a>
+        <img src="media/logo.png" alt="Logo" />
+        HTML;
 
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($inputUnquoted));
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testNoReplacements()
     {
         $input = '<p>This is a regular <a href="https://example.com">link</a> with no Hyde syntax.</p>';
+
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 }

From df09449ab2e856f3fe360888382f958cf3c104bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:08:42 +0200
Subject: [PATCH 2722/2811] Revert "Update Markdown link support to work with
 double quotes"

This reverts commit 048910d6d913f591d0d951867c465d8b6cecd6ed. See https://github.com/hydephp/develop/pull/1590#discussion_r1690082732
---
 .../DynamicMarkdownLinkProcessor.php          |  6 ++---
 .../DynamicMarkdownLinkProcessorTest.php      | 24 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index fe50a979784..bf00a9a8c1a 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -22,13 +22,13 @@ public static function postprocess(string $html): string
     protected static function patterns(): array
     {
         return [
-            '/<a href="hyde::route\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::route($matches[2]).'"';
             },
-            '/<a href="hyde::relativeLink\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<a href="hyde::relativeLink\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::relativeLink($matches[2]).'"';
             },
-            '/<img src="hyde::asset\((\'|"|)([^\'"]+)\1\)"/' => function (array $matches): string {
+            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<img src="'.Hyde::asset($matches[2]).'"';
             },
         ];
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 57c875b2f7b..e87afe8ee2c 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -39,14 +39,6 @@ public function testRouteReplacement()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRouteReplacementWithDoubleQuotes()
-    {
-        $input = '<p><a href="hyde::route("home")">Home</a></p>';
-        $expected = '<p><a href="home.html">Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testRouteReplacementWithoutQuotes()
     {
         $input = '<p><a href="hyde::route(home)">Home</a></p>';
@@ -63,14 +55,6 @@ public function testRelativeLinkReplacement()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRelativeLinkReplacementWithDoubleQuotes()
-    {
-        $input = '<p><a href="hyde::relativeLink("about")">About</a></p>';
-        $expected = '<p><a href="about">About</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testRelativeLinkReplacementWithoutQuotes()
     {
         $input = '<p><a href="hyde::relativeLink(about)">About</a></p>';
@@ -87,14 +71,6 @@ public function testAssetReplacement()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testAssetReplacementWithDoubleQuotes()
-    {
-        $input = '<p><img src="hyde::asset("image.jpg")" alt="Image" /></p>';
-        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testAssetReplacementWithoutQuotes()
     {
         $input = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';

From 55df5a3a4724021aab6c73a5852be8fc148eb512 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:10:33 +0200
Subject: [PATCH 2723/2811] Register the dynamic Markdown link processor

---
 .../Framework/Concerns/Internal/SetsUpMarkdownConverter.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
index 38302778834..307c2caa81d 100644
--- a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
+++ b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
@@ -8,6 +8,7 @@
 use Hyde\Markdown\Processing\BladeDownProcessor;
 use Hyde\Markdown\Processing\ShortcodeProcessor;
 use Hyde\Markdown\Processing\CodeblockFilepathProcessor;
+use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 use Torchlight\Commonmark\V2\TorchlightExtension;
 
 use function array_merge;
@@ -73,6 +74,8 @@ protected function registerPostProcessors(): void
             CodeblockFilepathProcessor::class,
             Config::getBool('markdown.features.codeblock_filepaths', true)
         );
+
+        $this->registerPostProcessor(DynamicMarkdownLinkProcessor::class);
     }
 
     protected function registerPreProcessor(string $class, bool $when = true): void

From 16051f7e2c2bab364f8de18adb1b33aef72b9d4a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:11:05 +0200
Subject: [PATCH 2724/2811] Reapply "Create DynamicMarkdownLinksTest.php"

This reverts commit 59b06182e4716c528ec90d43d22590ece6c9be39.
---
 .../tests/Feature/DynamicMarkdownLinksTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/framework/tests/Feature/DynamicMarkdownLinksTest.php

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
new file mode 100644
index 00000000000..eae8ef2be58
--- /dev/null
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Hyde
+ */
+class DynamicMarkdownLinksTest extends TestCase
+{
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}

From b0fe2bb0708e4971fa830da78874f2419da426bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:11:34 +0200
Subject: [PATCH 2725/2811] Rename test to DynamicMarkdownLinksFeatureTest

---
 ...arkdownLinksTest.php => DynamicMarkdownLinksFeatureTest.php} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Feature/{DynamicMarkdownLinksTest.php => DynamicMarkdownLinksFeatureTest.php} (79%)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
similarity index 79%
rename from packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
rename to packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index eae8ef2be58..66814d5b4af 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Hyde
  */
-class DynamicMarkdownLinksTest extends TestCase
+class DynamicMarkdownLinksFeatureTest extends TestCase
 {
     public function testExample()
     {

From 69a5277a239a874c8cb48037f72b000cb3749df7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:12:34 +0200
Subject: [PATCH 2726/2811] Set up coverage

---
 .../tests/Feature/DynamicMarkdownLinksFeatureTest.php          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 66814d5b4af..0d186b56e45 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -7,7 +7,8 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Hyde
+ * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
+ * @covers \Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {

From 6a7f46a9497844d4fe762e101075332eaa9a942c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:12:57 +0200
Subject: [PATCH 2727/2811] Add test crosslinks

---
 .../framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php | 2 ++
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 0d186b56e45..87aafdc3007 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -9,6 +9,8 @@
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
  * @covers \Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\Markdown\DynamicMarkdownLinkProcessorTest
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index e87afe8ee2c..ff7bb6923ef 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
+ *
+ * @see \Hyde\Framework\Testing\Feature\DynamicMarkdownLinksFeatureTest
  */
 class DynamicMarkdownLinkProcessorTest extends UnitTestCase
 {

From 85860164032a6c5efa81b2701fe44103be264055 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:15:23 +0200
Subject: [PATCH 2728/2811] Match heredoc name to type

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index ff7bb6923ef..04f53ca365d 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -83,11 +83,11 @@ public function testAssetReplacementWithoutQuotes()
 
     public function testMultipleReplacements()
     {
-        $input = <<<'MARKDOWN'
+        $input = <<<'HTML'
         <a href="hyde::route('home')">Home</a>
         <a href="hyde::relativeLink('about')">About</a>
         <img src="hyde::asset('logo.png')" alt="Logo" />
-        MARKDOWN;
+        HTML;
 
         $expected = <<<'HTML'
         <a href="home.html">Home</a>

From 18607561dc1ed8b717870b16bf46c0f61442235c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:29:59 +0200
Subject: [PATCH 2729/2811] Always render Markdown using the service

---
 .../framework/src/Markdown/Models/Markdown.php     | 14 +++-----------
 .../Feature/ColoredBlockquoteShortcodesTest.php    |  3 +++
 .../framework/tests/Unit/MarkdownFacadeTest.php    |  3 +++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Markdown/Models/Markdown.php b/packages/framework/src/Markdown/Models/Markdown.php
index 568ae22be2e..e9c6c80c6a7 100644
--- a/packages/framework/src/Markdown/Models/Markdown.php
+++ b/packages/framework/src/Markdown/Models/Markdown.php
@@ -5,7 +5,6 @@
 namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Services\MarkdownService;
-use Hyde\Markdown\MarkdownConverter;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\HtmlString;
@@ -84,20 +83,13 @@ public static function fromFile(string $path): static
     /**
      * Render a Markdown string into HTML.
      *
-     * If a source model is provided, the Markdown will be converted using the dynamic MarkdownService,
-     * otherwise, the pre-configured singleton from the service container will be used instead.
+     * If a source page class is provided, that class will be used to configure
+     * the Hyde Markdown converter to enable features specific to that page.
      *
      * @return string $html
      */
     public static function render(string $markdown, ?string $pageClass = null): string
     {
-        if ($pageClass !== null) {
-            return (new MarkdownService($markdown, $pageClass))->parse();
-        } else {
-            /** @var MarkdownConverter $converter */
-            $converter = app(MarkdownConverter::class);
-
-            return (string) $converter->convert($markdown);
-        }
+        return (new MarkdownService($markdown, $pageClass))->parse();
     }
 }
diff --git a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
index dce752c8313..f12ffed3492 100644
--- a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
+++ b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
@@ -12,6 +12,9 @@
  */
 class ColoredBlockquoteShortcodesTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     public function testSignature()
     {
         $this->assertSame('>', ColoredBlockquotes::signature());
diff --git a/packages/framework/tests/Unit/MarkdownFacadeTest.php b/packages/framework/tests/Unit/MarkdownFacadeTest.php
index 88531f35744..88903630f90 100644
--- a/packages/framework/tests/Unit/MarkdownFacadeTest.php
+++ b/packages/framework/tests/Unit/MarkdownFacadeTest.php
@@ -12,6 +12,9 @@
  */
 class MarkdownFacadeTest extends UnitTestCase
 {
+    protected static bool $needsKernel = true;
+    protected static bool $needsConfig = true;
+
     public function testRender(): void
     {
         $html = Markdown::render('# Hello World!');

From 2b6e40efa9b18590c5a16ddf63a4e931eaaaeb82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:37:56 +0200
Subject: [PATCH 2730/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2c37ec7a021..3871aafcb54 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -57,6 +57,7 @@ This serves two purposes:
 - Reorganized and cleaned up the navigation and sidebar documentation for improved clarity.
 - Moved the sidebar documentation to the documentation pages section for better organization.
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
+- The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
 
 ### Deprecated
 - for soon-to-be removed features.

From e943c198b4c4eece221224664f0c5e8270409bdf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:44:58 +0200
Subject: [PATCH 2731/2811] Implement the basic test

---
 .../DynamicMarkdownLinksFeatureTest.php       | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 87aafdc3007..66ca829ad27 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -1,10 +1,16 @@
 <?php
 
+/** @noinspection HtmlUnknownTarget */
+
 declare(strict_types=1);
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Hyde\Pages\InMemoryPage;
+use Hyde\Support\Models\Route;
+use Hyde\Foundation\Facades\Routes;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
@@ -14,8 +20,36 @@
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
-    public function testExample()
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Routes::addRoute(new Route(new InMemoryPage('home')));
+        Routes::addRoute(new Route(new InMemoryPage('blog/post')));
+    }
+
+    public function testDynamicMarkdownLinks()
     {
-        $this->assertTrue(true);
+        $input = <<<'MARKDOWN'
+        [Home](hyde::route('home'))
+        [About](hyde::relativeLink('about'))
+        ![Logo](hyde::asset('logo.png'))
+        
+        [Home](hyde::route(home))
+        [About](hyde::relativeLink(about))
+        ![Logo](hyde::asset(logo.png))
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="home.html">Home</a>
+        <a href="about">About</a>
+        <img src="media/logo.png" alt="Logo" /></p>
+        <p><a href="home.html">Home</a>
+        <a href="about">About</a>
+        <img src="media/logo.png" alt="Logo" /></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
 }

From d489d9020f85b3a7c8ed6d0653139a8aa7ba59ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:45:24 +0200
Subject: [PATCH 2732/2811] Generate more tests with Claude

---
 .../DynamicMarkdownLinksFeatureTest.php       | 103 +++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 66ca829ad27..10a2e96c5ac 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         Routes::addRoute(new Route(new InMemoryPage('blog/post')));
     }
 
-    public function testDynamicMarkdownLinks()
+    public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
         [Home](hyde::route('home'))
@@ -52,4 +52,105 @@ public function testDynamicMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testDynamicMarkdownLinksWithDoubleQuotes()
+    {
+        $input = <<<'MARKDOWN'
+        [Home](hyde::route("home"))
+        [About](hyde::relativeLink("about"))
+        ![Logo](hyde::asset("logo.png"))
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="home.html">Home</a>
+        <a href="about">About</a>
+        <img src="media/logo.png" alt="Logo" /></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
+
+    public function testDynamicMarkdownLinksInParagraphs()
+    {
+        $input = <<<'MARKDOWN'
+        This is a paragraph with a [link to home](hyde::route('home')) and an [about link](hyde::relativeLink('about')).
+
+        Another paragraph with an ![image](hyde::asset('image.jpg')).
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p>This is a paragraph with a <a href="home.html">link to home</a> and an <a href="about">about link</a>.</p>
+        <p>Another paragraph with an <img src="media/image.jpg" alt="image" />.</p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
+
+    public function testDynamicMarkdownLinksInLists()
+    {
+        $input = <<<'MARKDOWN'
+        - [Home](hyde::route('home'))
+        - [About](hyde::relativeLink('about'))
+        - ![Logo](hyde::asset('logo.png'))
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <ul>
+        <li>
+        <a href="home.html">Home</a>
+        </li>
+        <li>
+        <a href="about">About</a>
+        </li>
+        <li>
+        <img src="media/logo.png" alt="Logo" />
+        </li>
+        </ul>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
+
+    public function testDynamicMarkdownLinksWithNestedRoutes()
+    {
+        $input = <<<'MARKDOWN'
+        [Blog Post](hyde::route('blog/post'))
+        [Relative Blog](hyde::relativeLink('blog/post'))
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="blog/post.html">Blog Post</a>
+        <a href="blog/post">Relative Blog</a></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
+
+    public function testMixOfDynamicAndRegularMarkdownLinks()
+    {
+        $input = <<<'MARKDOWN'
+        [Home](hyde::route('home'))
+        [External](https://example.com)
+        [About](hyde::relativeLink('about'))
+        [Regular](regular-link.html)
+        ![Logo](hyde::asset('logo.png'))
+        ![External Image](https://example.com/image.jpg)
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="home.html">Home</a>
+        <a href="https://example.com">External</a>
+        <a href="about">About</a>
+        <a href="regular-link.html">Regular</a>
+        <img src="media/logo.png" alt="Logo" />
+        <img src="https://example.com/image.jpg" alt="External Image" /></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
 }

From a8aeb8bf91e0e1d7d86ec81199df1780882c2b5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:45:40 +0200
Subject: [PATCH 2733/2811] Skip unsupported test

See https://github.com/hydephp/develop/pull/1590#discussion_r1690082732
---
 .../framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 10a2e96c5ac..5034aecda8a 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -55,6 +55,8 @@ public function testBasicDynamicMarkdownLinks()
 
     public function testDynamicMarkdownLinksWithDoubleQuotes()
     {
+        $this->markTestSkipped('https://github.com/hydephp/develop/pull/1590#discussion_r1690082732');
+
         $input = <<<'MARKDOWN'
         [Home](hyde::route("home"))
         [About](hyde::relativeLink("about"))

From b10b55a5d67c3300f6fa2ff42f09939831cf54e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:48:11 +0200
Subject: [PATCH 2734/2811] Add fault tolerance testing

---
 .../DynamicMarkdownLinkProcessorTest.php      | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 04f53ca365d..6f7ee4bb102 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -104,4 +104,91 @@ public function testNoReplacements()
 
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
+
+    public function testMalformedRouteLink()
+    {
+        $input = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedRelativeLink()
+    {
+        $input = '<p><a href="hyde::relativeLink(about\')">Malformed About</a></p>';
+        $expected = '<p><a href="hyde::relativeLink(about\')">Malformed About</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedAssetLink()
+    {
+        $input = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
+        $expected = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testEmptyRouteLink()
+    {
+        $input = '<p><a href="hyde::route()">Empty Route</a></p>';
+        $expected = '<p><a href="hyde::route()">Empty Route</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testEmptyRelativeLink()
+    {
+        $input = '<p><a href="hyde::relativeLink()">Empty Relative Link</a></p>';
+        $expected = '<p><a href="hyde::relativeLink()">Empty Relative Link</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testEmptyAssetLink()
+    {
+        $input = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
+        $expected = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMixedValidAndInvalidLinks()
+    {
+        $input = <<<'HTML'
+        <a href="hyde::route('home')">Valid Home</a>
+        <a href="hyde::route(invalid'">Invalid Route</a>
+        <a href="hyde::relativeLink('about')">Valid About</a>
+        <a href="hyde::relativeLink(about')">Invalid Relative</a>
+        <img src="hyde::asset('logo.png')" alt="Valid Logo" />
+        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
+        HTML;
+
+        $expected = <<<'HTML'
+        <a href="home.html">Valid Home</a>
+        <a href="hyde::route(invalid'">Invalid Route</a>
+        <a href="about">Valid About</a>
+        <a href="hyde::relativeLink(about')">Invalid Relative</a>
+        <img src="media/logo.png" alt="Valid Logo" />
+        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
+        HTML;
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedHydeSyntax()
+    {
+        $input = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
+        $expected = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testNonExistentRouteFunction()
+    {
+        $input = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
+        $expected = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 }

From d105152f3e9b19eca36d6f98767a3d371c027318 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 18:48:17 +0200
Subject: [PATCH 2735/2811] Section test code

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 6f7ee4bb102..e5790ea88d6 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -105,6 +105,8 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
+    // Fault tolerance tests
+
     public function testMalformedRouteLink()
     {
         $input = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';

From f2d02fbd33c07d7d07a6feb86a0f41c377b446a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:01:32 +0200
Subject: [PATCH 2736/2811] Add more fault tolerance tests

---
 .../DynamicMarkdownLinkProcessorTest.php         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index e5790ea88d6..c917bc2e1ab 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -115,6 +115,22 @@ public function testMalformedRouteLink()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
+    public function testMalformedRouteLink2()
+    {
+        $input = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedRouteLink3()
+    {
+        $input = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
     public function testMalformedRelativeLink()
     {
         $input = '<p><a href="hyde::relativeLink(about\')">Malformed About</a></p>';

From ad20f39262517d90b3453f2dd442fef9cbd19208 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:07:01 +0200
Subject: [PATCH 2737/2811] Throw an exception for non existent routes

---
 .../Processing/DynamicMarkdownLinkProcessor.php       | 11 ++++++++++-
 .../Markdown/DynamicMarkdownLinkProcessorTest.php     | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index bf00a9a8c1a..d6b9796d344 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,6 +5,7 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
@@ -23,7 +24,15 @@ protected static function patterns(): array
     {
         return [
             '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                return '<a href="'.Hyde::route($matches[2]).'"';
+                $route = Hyde::route($matches[2]);
+                if ($route === null) {
+                    // While the other patterns work regardless of if input is valid,
+                    // this method returns null, which silently fails to an empty string.
+                    // So we instead throw an exception to alert the developer of the issue.
+                    throw new RouteNotFoundException($matches[2]);
+                }
+
+                return '<a href="'.$route.'"';
             },
             '/<a href="hyde::relativeLink\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<a href="'.Hyde::relativeLink($matches[2]).'"';
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index c917bc2e1ab..4ebc368e653 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -12,6 +12,7 @@
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
@@ -105,6 +106,15 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
+    public function testNonExistentRouteThrowsException()
+    {
+        $this->expectException(RouteNotFoundException::class);
+        $this->expectExceptionMessage('Route [non-existent] not found.');
+
+        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
+        DynamicMarkdownLinkProcessor::postprocess($input);
+    }
+
     // Fault tolerance tests
 
     public function testMalformedRouteLink()

From 61a552beb06f43ae0f8055105a89643154183df0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:10:37 +0200
Subject: [PATCH 2738/2811] Extract helper method

---
 .../DynamicMarkdownLinkProcessor.php           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index d6b9796d344..b9d3c37a10e 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,6 +5,7 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
+use Hyde\Support\Models\Route;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -25,12 +26,7 @@ protected static function patterns(): array
         return [
             '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 $route = Hyde::route($matches[2]);
-                if ($route === null) {
-                    // While the other patterns work regardless of if input is valid,
-                    // this method returns null, which silently fails to an empty string.
-                    // So we instead throw an exception to alert the developer of the issue.
-                    throw new RouteNotFoundException($matches[2]);
-                }
+                static::validateRouteExists($route, $matches[2]);
 
                 return '<a href="'.$route.'"';
             },
@@ -42,4 +38,14 @@ protected static function patterns(): array
             },
         ];
     }
+
+    protected static function validateRouteExists(?Route $route, $routeKey): void
+    {
+        if ($route === null) {
+            // While the other patterns work regardless of if input is valid,
+            // this method returns null, which silently fails to an empty string.
+            // So we instead throw an exception to alert the developer of the issue.
+            throw new RouteNotFoundException($routeKey);
+        }
+    }
 }

From ee000ced31862c0ba2e26bfe0af007991c708150 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:10:49 +0200
Subject: [PATCH 2739/2811] Add newline

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index b9d3c37a10e..2b48b86c203 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -26,6 +26,7 @@ protected static function patterns(): array
         return [
             '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 $route = Hyde::route($matches[2]);
+
                 static::validateRouteExists($route, $matches[2]);
 
                 return '<a href="'.$route.'"';

From 80edd88d786f813e9d72cb66714ae714cd6ce820 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:11:08 +0200
Subject: [PATCH 2740/2811] Add newline

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 2b48b86c203..2c2eb91cd66 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -46,6 +46,7 @@ protected static function validateRouteExists(?Route $route, $routeKey): void
             // While the other patterns work regardless of if input is valid,
             // this method returns null, which silently fails to an empty string.
             // So we instead throw an exception to alert the developer of the issue.
+
             throw new RouteNotFoundException($routeKey);
         }
     }

From 8e1e51678bb3609e1c396443500b920b39860339 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:17:17 +0200
Subject: [PATCH 2741/2811] Try to find the faulty line

---
 .../Framework/Exceptions/RouteNotFoundException.php  | 12 ++++++++++++
 .../Processing/DynamicMarkdownLinkProcessor.php      | 12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
index 1f173d27f78..4e8c05e3d45 100644
--- a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
+++ b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
@@ -20,4 +20,16 @@ public function __construct(?string $routeKey = null)
     {
         parent::__construct($routeKey ? sprintf('Route [%s] not found.', $routeKey) : $this->message);
     }
+
+    /**
+     * @interal
+     *
+     * @experimental
+     *
+     * @codeCoverageIgnore
+     */
+    public function setErroredFile(string $path): void
+    {
+        $this->message = rtrim($this->message, '.').sprintf(' (in file [%s])', $path);
+    }
 }
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 2c2eb91cd66..c983ca3f638 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
+use Hyde\Support\Facades\Render;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -47,7 +48,16 @@ protected static function validateRouteExists(?Route $route, $routeKey): void
             // this method returns null, which silently fails to an empty string.
             // So we instead throw an exception to alert the developer of the issue.
 
-            throw new RouteNotFoundException($routeKey);
+            $exception = new RouteNotFoundException($routeKey);
+
+            // In order to show the developer where this error is, we try to find the faulty Markdown file.
+            $page = Render::getPage();
+            if ($page !== null) {
+                $path = $page->getSourcePath();
+                $exception->setErroredFile($path);
+            }
+
+            throw $exception;
         }
     }
 }

From 12383155c8773356e37a0566ee731bfb1c393012 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:25:11 +0200
Subject: [PATCH 2742/2811] Try to find the line number of the error

---
 .../Framework/Exceptions/RouteNotFoundException.php  |  7 +++++--
 .../Processing/DynamicMarkdownLinkProcessor.php      | 12 +++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
index 4e8c05e3d45..61b408b7c0d 100644
--- a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
+++ b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
@@ -28,8 +28,11 @@ public function __construct(?string $routeKey = null)
      *
      * @codeCoverageIgnore
      */
-    public function setErroredFile(string $path): void
+    public function setErroredFile(string $path, int $line = 0): void
     {
-        $this->message = rtrim($this->message, '.').sprintf(' (in file [%s])', $path);
+        $this->message = rtrim($this->message, '.').sprintf(' (in file %s)', $path);
+
+        $this->file = realpath($path) ?: $path;
+        $this->line = $line;
     }
 }
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index c983ca3f638..598ec42eb78 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,8 +5,10 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
+use Hyde\Facades\Filesystem;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
+use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -54,7 +56,15 @@ protected static function validateRouteExists(?Route $route, $routeKey): void
             $page = Render::getPage();
             if ($page !== null) {
                 $path = $page->getSourcePath();
-                $exception->setErroredFile($path);
+                $contents = Filesystem::getContents($path);
+                // Try to find the line number of the error.
+                $lineNumber = strpos($contents, $routeKey);
+                if ($lineNumber !== false) {
+                    $lineNumber = substr_count(substr($contents, 0, $lineNumber), "\n") + 1;
+                    $exception->setErroredFile($path, $lineNumber);
+                } else {
+                    $exception->setErroredFile($path);
+                }
             }
 
             throw $exception;

From 5fa57910d5a8e5ef2b1e7e36a9cb669ddd137ecd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:27:09 +0200
Subject: [PATCH 2743/2811] Extract method

---
 .../DynamicMarkdownLinkProcessor.php          | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 598ec42eb78..8d7d0967930 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -53,21 +53,33 @@ protected static function validateRouteExists(?Route $route, $routeKey): void
             $exception = new RouteNotFoundException($routeKey);
 
             // In order to show the developer where this error is, we try to find the faulty Markdown file.
-            $page = Render::getPage();
-            if ($page !== null) {
-                $path = $page->getSourcePath();
-                $contents = Filesystem::getContents($path);
-                // Try to find the line number of the error.
-                $lineNumber = strpos($contents, $routeKey);
-                if ($lineNumber !== false) {
-                    $lineNumber = substr_count(substr($contents, 0, $lineNumber), "\n") + 1;
-                    $exception->setErroredFile($path, $lineNumber);
-                } else {
-                    $exception->setErroredFile($path);
-                }
-            }
+            self::tryToFindErroredLine($routeKey, $exception);
 
             throw $exception;
         }
     }
+
+    /**
+     * @interal If we use more features like these we may want to wrap the RouteNotFoundException in a custom MarkdownPageException.
+     *
+     * @experimental
+     *
+     * @codeCoverageIgnore
+     */
+    protected static function tryToFindErroredLine($routeKey, RouteNotFoundException $exception): void
+    {
+        $page = Render::getPage();
+        if ($page !== null) {
+            $path = $page->getSourcePath();
+            $contents = Filesystem::getContents($path);
+            // Try to find the line number of the error.
+            $lineNumber = strpos($contents, $routeKey);
+            if ($lineNumber !== false) {
+                $lineNumber = substr_count(substr($contents, 0, $lineNumber), "\n") + 1;
+                $exception->setErroredFile($path, $lineNumber);
+            } else {
+                $exception->setErroredFile($path);
+            }
+        }
+    }
 }

From 475c8efe2f1ce15f643204b26174d009e7dd47fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 19:43:14 +0200
Subject: [PATCH 2744/2811] Test the line finding

---
 .../DynamicMarkdownLinkProcessor.php          |  4 +--
 .../DynamicMarkdownLinksFeatureTest.php       | 26 +++++++++++++++++++
 .../DynamicMarkdownLinkProcessorTest.php      | 16 ++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 8d7d0967930..458bc3c9d39 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -63,13 +63,11 @@ protected static function validateRouteExists(?Route $route, $routeKey): void
      * @interal If we use more features like these we may want to wrap the RouteNotFoundException in a custom MarkdownPageException.
      *
      * @experimental
-     *
-     * @codeCoverageIgnore
      */
     protected static function tryToFindErroredLine($routeKey, RouteNotFoundException $exception): void
     {
         $page = Render::getPage();
-        if ($page !== null) {
+        if ($page !== null && Filesystem::exists($page->getSourcePath())) {
             $path = $page->getSourcePath();
             $contents = Filesystem::getContents($path);
             // Try to find the line number of the error.
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 5034aecda8a..9b0e51151ea 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -9,8 +9,11 @@
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Framework\Actions\StaticPageBuilder;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
@@ -155,4 +158,27 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testNonExistentRouteThrowsExceptionWithLineLocationWhenRenderingAPage()
+    {
+        $this->file('_pages/test.md', <<<'MARKDOWN'
+        Some
+        Extra
+        Newlines
+
+        [test](hyde::route('non-existent'))
+        
+        And some more text.
+        MARKDOWN);
+
+        try {
+            $page = MarkdownPage::parse('test');
+            StaticPageBuilder::handle($page);
+        } catch (RouteNotFoundException $exception) {
+            $this->assertSame('Route [non-existent] not found (in file _pages/test.md)', $exception->getMessage());
+            $this->assertSame(realpath(Hyde::path('_pages/test.md')), $exception->getFile());
+            $this->assertSame(5, $exception->getLine());
+            $this->assertIsString($exception->getFile());
+        }
+    }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 4ebc368e653..42192af9878 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,7 +6,9 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
+use Mockery;
 use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
@@ -115,6 +117,20 @@ public function testNonExistentRouteThrowsException()
         DynamicMarkdownLinkProcessor::postprocess($input);
     }
 
+    public function testNonExistentRouteThrowsExceptionWithGracefulLineFindingWhenNoFileSourceExists()
+    {
+        $instance = Mockery::mock(RenderData::class);
+        $instance->shouldReceive('getPage')->andReturn(new MarkdownPage('test'));
+
+        Render::swap($instance);
+
+        $this->expectException(RouteNotFoundException::class);
+        $this->expectExceptionMessage('Route [non-existent] not found.');
+
+        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
+        DynamicMarkdownLinkProcessor::postprocess($input);
+    }
+
     // Fault tolerance tests
 
     public function testMalformedRouteLink()

From 5da5b2fd5cc8fc62d3cf915810fa4c479a5543b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 20:42:44 +0200
Subject: [PATCH 2745/2811] Revert out of scope line finder

See https://github.com/hydephp/develop/pull/1590#discussion_r1690205820

Revert "Extract helper method"
This reverts commit 61a552beb06f43ae0f8055105a89643154183df0.

Revert "Test the line finding"

This reverts commit 475c8efe2f1ce15f643204b26174d009e7dd47fe.

Revert "Extract method"

This reverts commit 5fa57910d5a8e5ef2b1e7e36a9cb669ddd137ecd.

Revert "Try to find the line number of the error"

This reverts commit 12383155c8773356e37a0566ee731bfb1c393012.

Revert "Try to find the faulty line"

This reverts commit 8e1e51678bb3609e1c396443500b920b39860339.

Revert "Add newline"

This reverts commit 80edd88d786f813e9d72cb66714ae714cd6ce820.

Revert "Add newline"

This reverts commit ee000ced31862c0ba2e26bfe0af007991c708150.
---
 .../Exceptions/RouteNotFoundException.php     | 15 ------
 .../DynamicMarkdownLinkProcessor.php          | 50 +++----------------
 .../DynamicMarkdownLinksFeatureTest.php       | 26 ----------
 .../DynamicMarkdownLinkProcessorTest.php      | 16 ------
 4 files changed, 6 insertions(+), 101 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
index 61b408b7c0d..1f173d27f78 100644
--- a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
+++ b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
@@ -20,19 +20,4 @@ public function __construct(?string $routeKey = null)
     {
         parent::__construct($routeKey ? sprintf('Route [%s] not found.', $routeKey) : $this->message);
     }
-
-    /**
-     * @interal
-     *
-     * @experimental
-     *
-     * @codeCoverageIgnore
-     */
-    public function setErroredFile(string $path, int $line = 0): void
-    {
-        $this->message = rtrim($this->message, '.').sprintf(' (in file %s)', $path);
-
-        $this->file = realpath($path) ?: $path;
-        $this->line = $line;
-    }
 }
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 458bc3c9d39..d6b9796d344 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,10 +5,6 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
-use Hyde\Facades\Filesystem;
-use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
-use Illuminate\Support\Facades\File;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -29,8 +25,12 @@ protected static function patterns(): array
         return [
             '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 $route = Hyde::route($matches[2]);
-
-                static::validateRouteExists($route, $matches[2]);
+                if ($route === null) {
+                    // While the other patterns work regardless of if input is valid,
+                    // this method returns null, which silently fails to an empty string.
+                    // So we instead throw an exception to alert the developer of the issue.
+                    throw new RouteNotFoundException($matches[2]);
+                }
 
                 return '<a href="'.$route.'"';
             },
@@ -42,42 +42,4 @@ protected static function patterns(): array
             },
         ];
     }
-
-    protected static function validateRouteExists(?Route $route, $routeKey): void
-    {
-        if ($route === null) {
-            // While the other patterns work regardless of if input is valid,
-            // this method returns null, which silently fails to an empty string.
-            // So we instead throw an exception to alert the developer of the issue.
-
-            $exception = new RouteNotFoundException($routeKey);
-
-            // In order to show the developer where this error is, we try to find the faulty Markdown file.
-            self::tryToFindErroredLine($routeKey, $exception);
-
-            throw $exception;
-        }
-    }
-
-    /**
-     * @interal If we use more features like these we may want to wrap the RouteNotFoundException in a custom MarkdownPageException.
-     *
-     * @experimental
-     */
-    protected static function tryToFindErroredLine($routeKey, RouteNotFoundException $exception): void
-    {
-        $page = Render::getPage();
-        if ($page !== null && Filesystem::exists($page->getSourcePath())) {
-            $path = $page->getSourcePath();
-            $contents = Filesystem::getContents($path);
-            // Try to find the line number of the error.
-            $lineNumber = strpos($contents, $routeKey);
-            if ($lineNumber !== false) {
-                $lineNumber = substr_count(substr($contents, 0, $lineNumber), "\n") + 1;
-                $exception->setErroredFile($path, $lineNumber);
-            } else {
-                $exception->setErroredFile($path);
-            }
-        }
-    }
 }
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 9b0e51151ea..5034aecda8a 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -9,11 +9,8 @@
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Hyde\Pages\InMemoryPage;
-use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
@@ -158,27 +155,4 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
-
-    public function testNonExistentRouteThrowsExceptionWithLineLocationWhenRenderingAPage()
-    {
-        $this->file('_pages/test.md', <<<'MARKDOWN'
-        Some
-        Extra
-        Newlines
-
-        [test](hyde::route('non-existent'))
-        
-        And some more text.
-        MARKDOWN);
-
-        try {
-            $page = MarkdownPage::parse('test');
-            StaticPageBuilder::handle($page);
-        } catch (RouteNotFoundException $exception) {
-            $this->assertSame('Route [non-existent] not found (in file _pages/test.md)', $exception->getMessage());
-            $this->assertSame(realpath(Hyde::path('_pages/test.md')), $exception->getFile());
-            $this->assertSame(5, $exception->getLine());
-            $this->assertIsString($exception->getFile());
-        }
-    }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 42192af9878..4ebc368e653 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,9 +6,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Mockery;
 use Hyde\Pages\InMemoryPage;
-use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
@@ -117,20 +115,6 @@ public function testNonExistentRouteThrowsException()
         DynamicMarkdownLinkProcessor::postprocess($input);
     }
 
-    public function testNonExistentRouteThrowsExceptionWithGracefulLineFindingWhenNoFileSourceExists()
-    {
-        $instance = Mockery::mock(RenderData::class);
-        $instance->shouldReceive('getPage')->andReturn(new MarkdownPage('test'));
-
-        Render::swap($instance);
-
-        $this->expectException(RouteNotFoundException::class);
-        $this->expectExceptionMessage('Route [non-existent] not found.');
-
-        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
-        DynamicMarkdownLinkProcessor::postprocess($input);
-    }
-
     // Fault tolerance tests
 
     public function testMalformedRouteLink()

From 2bf321c0b080d8dca574bcf9bacffc5031a13199 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 20:49:53 +0200
Subject: [PATCH 2746/2811] Generate new documentation with Claude

---
 docs/digging-deeper/advanced-markdown.md | 53 +++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index fd9803663a1..5b4f1225019 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -156,25 +156,66 @@ anything within the path label will be rendered as HTML. This means you can add
 ```
 ````
 
-### Dynamic Markdown links
+## Dynamic Markdown Links
 
-In order to create automatically resolved links from your pages and posts, you can use the special Hyde Markdown link syntax.
+HydePHP provides a powerful feature for creating automatically resolved links within your pages and posts using a special Hyde Markdown link syntax. This feature allows you to generate dynamic links that are resolved based on the current page being rendered.
 
-For all the supported syntax options, Hyde will resolve a relative link based on the current page being rendered.
+### Usage
 
-Since this happens in our Markdown processor, this will work regardless of if you have custom HTML or Blade enabled for your site.
+You can use the following syntax options in your Markdown files:
 
 ```markdown
 <!-- Resolving a route -->
 [Home](hyde::route('home'))
 
 <!-- Resolving a relative link -->
-[Home](hyde::relativeLink('home'))
+[About](hyde::relativeLink('about'))
 
 <!-- Resolving a media asset -->
-![Image](hyde::asset('image.jpg'))
+![Logo](hyde::asset('logo.png'))
 ```
 
+### How It Works
+
+The Hyde Markdown processor handles these special links during the conversion process. This means that the feature works regardless of whether you have custom HTML or Blade enabled for your site.
+
+Here's what each function does:
+
+- `hyde::route()`: Generates a link to a specific route in your Hyde site.
+- `hyde::relativeLink()`: Creates a relative link to another page.
+- `hyde::asset()`: Resolves the path to a media asset in your site.
+
+### Behavior and Error Handling
+
+- If the specified route or asset exists, Hyde will generate the correct URL.
+- If a route specified in `hyde::route()` does not exist, a `RouteNotFoundException` will be thrown. This helps catch errors early in the development process.
+
+>info Note: The exception throwing behavior for non-existent routes is designed to provide immediate feedback during development. In production environments, you may want to handle these exceptions gracefully.
+
+### Best Practices
+
+1. Always double-check that the pages or assets you're linking to exist in your project.
+2. Use meaningful names for your routes to make your Markdown more readable and maintainable.
+3. Consider using `hyde::relativeLink()` for local navigation if your site structure might change.
+
+### Customization
+
+You can customize how Hyde handles dynamic links by modifying the `config/hyde.php` file. For example, you might want to change how non-existent routes are handled in production:
+
+```php
+// filepath: config/hyde.php
+'dynamic_links' => [
+    'throw_exception_on_missing_route' => env('APP_ENV') === 'local',
+],
+```
+
+### Limitations
+
+- The dynamic link syntax is only processed within Markdown files. It won't work in plain HTML or Blade templates.
+- Make sure to use the correct syntax (`hyde::function('parameter')`) as other variations may not be recognized.
+
+By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links.
+
 ### Limitations
 
 The filepaths are hidden on mobile devices using CSS to prevent them from overlapping with the code block.

From 6d43f736811ecee50b6016195fa5f010367064a2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 20:50:03 +0200
Subject: [PATCH 2747/2811] Proof generated documentation

---
 docs/digging-deeper/advanced-markdown.md | 40 +++++-------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 5b4f1225019..26432b77999 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -165,7 +165,7 @@ HydePHP provides a powerful feature for creating automatically resolved links wi
 You can use the following syntax options in your Markdown files:
 
 ```markdown
-<!-- Resolving a route -->
+<!-- Resolving a page route -->
 [Home](hyde::route('home'))
 
 <!-- Resolving a relative link -->
@@ -179,42 +179,18 @@ You can use the following syntax options in your Markdown files:
 
 The Hyde Markdown processor handles these special links during the conversion process. This means that the feature works regardless of whether you have custom HTML or Blade enabled for your site.
 
-Here's what each function does:
-
-- `hyde::route()`: Generates a link to a specific route in your Hyde site.
-- `hyde::relativeLink()`: Creates a relative link to another page.
-- `hyde::asset()`: Resolves the path to a media asset in your site.
-
-### Behavior and Error Handling
-
-- If the specified route or asset exists, Hyde will generate the correct URL.
-- If a route specified in `hyde::route()` does not exist, a `RouteNotFoundException` will be thrown. This helps catch errors early in the development process.
-
->info Note: The exception throwing behavior for non-existent routes is designed to provide immediate feedback during development. In production environments, you may want to handle these exceptions gracefully.
-
-### Best Practices
-
-1. Always double-check that the pages or assets you're linking to exist in your project.
-2. Use meaningful names for your routes to make your Markdown more readable and maintainable.
-3. Consider using `hyde::relativeLink()` for local navigation if your site structure might change.
 
-### Customization
-
-You can customize how Hyde handles dynamic links by modifying the `config/hyde.php` file. For example, you might want to change how non-existent routes are handled in production:
+Here's what each function does:
 
-```php
-// filepath: config/hyde.php
-'dynamic_links' => [
-    'throw_exception_on_missing_route' => env('APP_ENV') === 'local',
-],
-```
+- `hyde::route()`: Generates a link to a specific route in your Hyde site. This is equivalent to `{{ Hyde::route('route.name') }}` in Blade (But we throw if the route doesn't exist).
+- `hyde::relativeLink()`: Creates a relative link to another page. This is equivalent to `{{ Hyde::relativeLink('path') }}` in Blade.
+- `hyde::asset()`: Resolves the path to a media asset in your site. This is equivalent to `{{ Hyde::asset('path') }}` in Blade.
 
-### Limitations
+By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links.
 
-- The dynamic link syntax is only processed within Markdown files. It won't work in plain HTML or Blade templates.
-- Make sure to use the correct syntax (`hyde::function('parameter')`) as other variations may not be recognized.
+### Considerations
 
-By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links.
+**Note:** For the route helper we throw an exception if the route doesn't exist. This is to provide immediate feedback during development.
 
 ### Limitations
 

From 5e96cda5fe2443a42ebb5894e5ca4f347b797a82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 21:04:44 +0200
Subject: [PATCH 2748/2811] Streamline documentation

---
 docs/digging-deeper/advanced-markdown.md | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 26432b77999..72ebe98d07e 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -158,7 +158,7 @@ anything within the path label will be rendered as HTML. This means you can add
 
 ## Dynamic Markdown Links
 
-HydePHP provides a powerful feature for creating automatically resolved links within your pages and posts using a special Hyde Markdown link syntax. This feature allows you to generate dynamic links that are resolved based on the current page being rendered.
+HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using a special Hyde Markdown link syntax, designed to match the syntax of the `Hyde` facade.
 
 ### Usage
 
@@ -175,22 +175,25 @@ You can use the following syntax options in your Markdown files:
 ![Logo](hyde::asset('logo.png'))
 ```
 
-### How It Works
+By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links. The feature is always enabled in the Markdown converter.
 
-The Hyde Markdown processor handles these special links during the conversion process. This means that the feature works regardless of whether you have custom HTML or Blade enabled for your site.
 
+### Breakdown
 
-Here's what each function does:
+The example above is equivalent to the following Blade syntax:
 
-- `hyde::route()`: Generates a link to a specific route in your Hyde site. This is equivalent to `{{ Hyde::route('route.name') }}` in Blade (But we throw if the route doesn't exist).
-- `hyde::relativeLink()`: Creates a relative link to another page. This is equivalent to `{{ Hyde::relativeLink('path') }}` in Blade.
-- `hyde::asset()`: Resolves the path to a media asset in your site. This is equivalent to `{{ Hyde::asset('path') }}` in Blade.
+```blade
+<!-- Resolving a page route -->
+{{ Hyde::route('route.name') ?? throw new RouteNotFoundException() }}
 
-By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links.
+<!-- Resolving a relative link -->
+{{ Hyde::relativeLink('path') }}
 
-### Considerations
+<!-- Resolving a media asset -->
+{{ Hyde::asset('path') }}
+```
 
-**Note:** For the route helper we throw an exception if the route doesn't exist. This is to provide immediate feedback during development.
+As you can see, we throw an exception if the route doesn't exist, to provide immediate feedback during development.
 
 ### Limitations
 

From a2b256b6c5f77435e8d90fb41cd82594fc6ff4af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 21:05:06 +0200
Subject: [PATCH 2749/2811] Fix documentation location

---
 docs/digging-deeper/advanced-markdown.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 72ebe98d07e..60123b9d3f0 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -156,6 +156,11 @@ anything within the path label will be rendered as HTML. This means you can add
 ```
 ````
 
+### Limitations
+
+The filepaths are hidden on mobile devices using CSS to prevent them from overlapping with the code block.
+
+
 ## Dynamic Markdown Links
 
 HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using a special Hyde Markdown link syntax, designed to match the syntax of the `Hyde` facade.
@@ -195,9 +200,6 @@ The example above is equivalent to the following Blade syntax:
 
 As you can see, we throw an exception if the route doesn't exist, to provide immediate feedback during development.
 
-### Limitations
-
-The filepaths are hidden on mobile devices using CSS to prevent them from overlapping with the code block.
 
 ## Configuration
 

From 9589bc17d1165cbc577e298d4500c7aeb9a2c48d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 21:12:32 +0200
Subject: [PATCH 2750/2811] Remove dynamic relative link Markdown feature
 offering little value

Can't see too big of a use case for this
---
 docs/digging-deeper/advanced-markdown.md      |  6 ---
 .../DynamicMarkdownLinkProcessor.php          |  3 --
 .../DynamicMarkdownLinksFeatureTest.php       | 20 ++--------
 .../DynamicMarkdownLinkProcessorTest.php      | 38 -------------------
 4 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 60123b9d3f0..f8d59d14267 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -173,9 +173,6 @@ You can use the following syntax options in your Markdown files:
 <!-- Resolving a page route -->
 [Home](hyde::route('home'))
 
-<!-- Resolving a relative link -->
-[About](hyde::relativeLink('about'))
-
 <!-- Resolving a media asset -->
 ![Logo](hyde::asset('logo.png'))
 ```
@@ -191,9 +188,6 @@ The example above is equivalent to the following Blade syntax:
 <!-- Resolving a page route -->
 {{ Hyde::route('route.name') ?? throw new RouteNotFoundException() }}
 
-<!-- Resolving a relative link -->
-{{ Hyde::relativeLink('path') }}
-
 <!-- Resolving a media asset -->
 {{ Hyde::asset('path') }}
 ```
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index d6b9796d344..0bbe7643826 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -34,9 +34,6 @@ protected static function patterns(): array
 
                 return '<a href="'.$route.'"';
             },
-            '/<a href="hyde::relativeLink\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                return '<a href="'.Hyde::relativeLink($matches[2]).'"';
-            },
             '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
                 return '<img src="'.Hyde::asset($matches[2]).'"';
             },
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index 5034aecda8a..a4d57aa76a5 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -32,20 +32,16 @@ public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
         [Home](hyde::route('home'))
-        [About](hyde::relativeLink('about'))
         ![Logo](hyde::asset('logo.png'))
         
         [Home](hyde::route(home))
-        [About](hyde::relativeLink(about))
         ![Logo](hyde::asset(logo.png))
         MARKDOWN;
 
         $expected = <<<'HTML'
         <p><a href="home.html">Home</a>
-        <a href="about">About</a>
         <img src="media/logo.png" alt="Logo" /></p>
         <p><a href="home.html">Home</a>
-        <a href="about">About</a>
         <img src="media/logo.png" alt="Logo" /></p>
 
         HTML;
@@ -59,13 +55,11 @@ public function testDynamicMarkdownLinksWithDoubleQuotes()
 
         $input = <<<'MARKDOWN'
         [Home](hyde::route("home"))
-        [About](hyde::relativeLink("about"))
         ![Logo](hyde::asset("logo.png"))
         MARKDOWN;
 
         $expected = <<<'HTML'
         <p><a href="home.html">Home</a>
-        <a href="about">About</a>
         <img src="media/logo.png" alt="Logo" /></p>
 
         HTML;
@@ -76,13 +70,13 @@ public function testDynamicMarkdownLinksWithDoubleQuotes()
     public function testDynamicMarkdownLinksInParagraphs()
     {
         $input = <<<'MARKDOWN'
-        This is a paragraph with a [link to home](hyde::route('home')) and an [about link](hyde::relativeLink('about')).
+        This is a paragraph with a [link to home](hyde::route('home')).
 
         Another paragraph with an ![image](hyde::asset('image.jpg')).
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p>This is a paragraph with a <a href="home.html">link to home</a> and an <a href="about">about link</a>.</p>
+        <p>This is a paragraph with a <a href="home.html">link to home</a>.</p>
         <p>Another paragraph with an <img src="media/image.jpg" alt="image" />.</p>
 
         HTML;
@@ -94,7 +88,6 @@ public function testDynamicMarkdownLinksInLists()
     {
         $input = <<<'MARKDOWN'
         - [Home](hyde::route('home'))
-        - [About](hyde::relativeLink('about'))
         - ![Logo](hyde::asset('logo.png'))
         MARKDOWN;
 
@@ -104,9 +97,6 @@ public function testDynamicMarkdownLinksInLists()
         <a href="home.html">Home</a>
         </li>
         <li>
-        <a href="about">About</a>
-        </li>
-        <li>
         <img src="media/logo.png" alt="Logo" />
         </li>
         </ul>
@@ -120,12 +110,10 @@ public function testDynamicMarkdownLinksWithNestedRoutes()
     {
         $input = <<<'MARKDOWN'
         [Blog Post](hyde::route('blog/post'))
-        [Relative Blog](hyde::relativeLink('blog/post'))
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="blog/post.html">Blog Post</a>
-        <a href="blog/post">Relative Blog</a></p>
+        <p><a href="blog/post.html">Blog Post</a></p>
 
         HTML;
 
@@ -137,7 +125,6 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
         $input = <<<'MARKDOWN'
         [Home](hyde::route('home'))
         [External](https://example.com)
-        [About](hyde::relativeLink('about'))
         [Regular](regular-link.html)
         ![Logo](hyde::asset('logo.png'))
         ![External Image](https://example.com/image.jpg)
@@ -146,7 +133,6 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
         $expected = <<<'HTML'
         <p><a href="home.html">Home</a>
         <a href="https://example.com">External</a>
-        <a href="about">About</a>
         <a href="regular-link.html">Regular</a>
         <img src="media/logo.png" alt="Logo" />
         <img src="https://example.com/image.jpg" alt="External Image" /></p>
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 4ebc368e653..daca2d7ea34 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -50,22 +50,6 @@ public function testRouteReplacementWithoutQuotes()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRelativeLinkReplacement()
-    {
-        $input = '<p><a href="hyde::relativeLink(\'about\')">About</a></p>';
-        $expected = '<p><a href="about">About</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testRelativeLinkReplacementWithoutQuotes()
-    {
-        $input = '<p><a href="hyde::relativeLink(about)">About</a></p>';
-        $expected = '<p><a href="about">About</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testAssetReplacement()
     {
         $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
@@ -86,13 +70,11 @@ public function testMultipleReplacements()
     {
         $input = <<<'HTML'
         <a href="hyde::route('home')">Home</a>
-        <a href="hyde::relativeLink('about')">About</a>
         <img src="hyde::asset('logo.png')" alt="Logo" />
         HTML;
 
         $expected = <<<'HTML'
         <a href="home.html">Home</a>
-        <a href="about">About</a>
         <img src="media/logo.png" alt="Logo" />
         HTML;
 
@@ -141,14 +123,6 @@ public function testMalformedRouteLink3()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testMalformedRelativeLink()
-    {
-        $input = '<p><a href="hyde::relativeLink(about\')">Malformed About</a></p>';
-        $expected = '<p><a href="hyde::relativeLink(about\')">Malformed About</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testMalformedAssetLink()
     {
         $input = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
@@ -165,14 +139,6 @@ public function testEmptyRouteLink()
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testEmptyRelativeLink()
-    {
-        $input = '<p><a href="hyde::relativeLink()">Empty Relative Link</a></p>';
-        $expected = '<p><a href="hyde::relativeLink()">Empty Relative Link</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
     public function testEmptyAssetLink()
     {
         $input = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
@@ -186,8 +152,6 @@ public function testMixedValidAndInvalidLinks()
         $input = <<<'HTML'
         <a href="hyde::route('home')">Valid Home</a>
         <a href="hyde::route(invalid'">Invalid Route</a>
-        <a href="hyde::relativeLink('about')">Valid About</a>
-        <a href="hyde::relativeLink(about')">Invalid Relative</a>
         <img src="hyde::asset('logo.png')" alt="Valid Logo" />
         <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
         HTML;
@@ -195,8 +159,6 @@ public function testMixedValidAndInvalidLinks()
         $expected = <<<'HTML'
         <a href="home.html">Valid Home</a>
         <a href="hyde::route(invalid'">Invalid Route</a>
-        <a href="about">Valid About</a>
-        <a href="hyde::relativeLink(about')">Invalid Relative</a>
         <img src="media/logo.png" alt="Valid Logo" />
         <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
         HTML;

From d4d8762640544f0402c651797715b0303384940e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 21:47:29 +0200
Subject: [PATCH 2751/2811] New proof of concept

---
 docs/digging-deeper/advanced-markdown.md      |  38 ++++--
 .../DynamicMarkdownLinkProcessor.php          |  59 +++++----
 .../DynamicMarkdownLinksFeatureTest.php       |  83 ++++++------
 .../DynamicMarkdownLinkProcessorTest.php      | 122 ++++++------------
 4 files changed, 141 insertions(+), 161 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index f8d59d14267..ce04af98bfd 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -163,7 +163,7 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 ## Dynamic Markdown Links
 
-HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using a special Hyde Markdown link syntax, designed to match the syntax of the `Hyde` facade.
+HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using source file paths, which are then converted to the appropriate routes in the built site.
 
 ### Usage
 
@@ -171,29 +171,43 @@ You can use the following syntax options in your Markdown files:
 
 ```markdown
 <!-- Resolving a page route -->
-[Home](hyde::route('home'))
+[Home](/_pages/index.blade.php)
 
 <!-- Resolving a media asset -->
-![Logo](hyde::asset('logo.png'))
+![Logo](/_media/logo.svg)
 ```
 
 By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links. The feature is always enabled in the Markdown converter.
 
+### How It Works
 
-### Breakdown
+When you use a source file path in your Markdown links, HydePHP will automatically convert it to the appropriate route or asset path in the built site. For example:
 
-The example above is equivalent to the following Blade syntax:
+- `/_pages/index.blade.php` will be converted to `index.html`
+- `/_pages/blog/post.blade.php` will be converted to `blog/post.html`
+- `/_media/logo.svg` will be converted to `media/logo.svg`
 
-```blade
-<!-- Resolving a page route -->
-{{ Hyde::route('route.name') ?? throw new RouteNotFoundException() }}
+This conversion happens during the build process, ensuring that your links are always up-to-date with your current site structure.
 
-<!-- Resolving a media asset -->
-{{ Hyde::asset('path') }}
-```
+### Benefits
+
+1. **IDE Support**: By using actual file paths, you get better IDE support, including autocompletion and error checking.
+2. **Syntax Highlighting**: Your Markdown editor can provide proper syntax highlighting for these links, as they use standard Markdown syntax.
+3. **Easy Navigation**: You can easily navigate to the source files by clicking on the links in your IDE.
+
+### Limitations
+
+- This syntax doesn't support linking to dynamic routes. For such cases, you may need to use a different approach.
+- If you move or rename source files, make sure to update any Markdown links referencing them to avoid broken links.
+- While this approach provides better IDE support and syntax highlighting, it does couple your content to your project structure. Consider this trade-off when deciding to use this feature.
+
+### Best Practices
 
-As you can see, we throw an exception if the route doesn't exist, to provide immediate feedback during development.
+1. Always use the leading slash (`/`) in your links to ensure consistency and avoid potential issues with relative paths.
+2. Keep your file structure organized and consistent to make it easier to manage links.
+3. Regularly check for broken links in your content, especially after moving or renaming files.
 
+By following these guidelines and understanding the limitations, you can effectively use dynamic Markdown links to create more maintainable and flexible content in your HydePHP projects.
 
 ## Configuration
 
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 0bbe7643826..5ab0541ad2c 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,38 +5,49 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
+use Illuminate\Support\Str;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
-        foreach (static::patterns() as $pattern => $replacement) {
-            $html = preg_replace_callback($pattern, $replacement, $html);
+        // Todo cache in static property bound to kernel version (but evaluation is tied to rendering page)
+
+        $map = [];
+
+        /** @var \Hyde\Support\Models\Route $route */
+        foreach (Hyde::routes() as $route) {
+            $map[$route->getSourcePath()] = $route;
         }
 
-        return $html;
-    }
+        foreach ($map as $sourcePath => $route) {
+            $patterns = [
+                '<a href="'.$sourcePath.'">',
+                '<a href="/'.$sourcePath.'">',
+            ];
 
-    /** @return array<string, callable(array<int, string>): string> */
-    protected static function patterns(): array
-    {
-        return [
-            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                $route = Hyde::route($matches[2]);
-                if ($route === null) {
-                    // While the other patterns work regardless of if input is valid,
-                    // this method returns null, which silently fails to an empty string.
-                    // So we instead throw an exception to alert the developer of the issue.
-                    throw new RouteNotFoundException($matches[2]);
-                }
-
-                return '<a href="'.$route.'"';
-            },
-            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                return '<img src="'.Hyde::asset($matches[2]).'"';
-            },
-        ];
+            $html = str_replace($patterns, '<a href="'.$route->getLink().'">', $html);
+        }
+
+        // maybe we just need to cache this, as the kernel is already a singleton, but this is not
+        $assetMap = [];
+
+        foreach (MediaFile::all() as $mediaFile) {
+            $assetMap[$mediaFile->getPath()] = $mediaFile;
+        }
+
+        foreach ($assetMap as $path => $mediaFile) {
+            $patterns = [
+                '<img src="'.$path.'"',
+                '<img src="/'.$path.'"',
+            ];
+
+            $localPath = Str::after($mediaFile->getPath(), '_media/');
+            $html = str_replace($patterns, '<img src="'.Hyde::asset($localPath).'"', $html);
+        }
+
+        return $html;
     }
 }
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index a4d57aa76a5..c88cf429291 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -8,58 +8,41 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
-use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
  * @covers \Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter
- *
- * @see \Hyde\Framework\Testing\Feature\Services\Markdown\DynamicMarkdownLinkProcessorTest
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
-    protected function setUp(): void
+    public static function setUpBeforeClass(): void
     {
-        parent::setUp();
+        parent::setUpBeforeClass();
 
-        Routes::addRoute(new Route(new InMemoryPage('home')));
-        Routes::addRoute(new Route(new InMemoryPage('blog/post')));
+        touch('_media/logo.png');
+        touch('_media/image.jpg');
     }
 
-    public function testBasicDynamicMarkdownLinks()
+    public static function tearDownAfterClass(): void
     {
-        $input = <<<'MARKDOWN'
-        [Home](hyde::route('home'))
-        ![Logo](hyde::asset('logo.png'))
-        
-        [Home](hyde::route(home))
-        ![Logo](hyde::asset(logo.png))
-        MARKDOWN;
-
-        $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
-        <img src="media/logo.png" alt="Logo" /></p>
-        <p><a href="home.html">Home</a>
-        <img src="media/logo.png" alt="Logo" /></p>
-
-        HTML;
+        unlink('_media/logo.png');
+        unlink('_media/image.jpg');
 
-        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+        parent::tearDownAfterClass();
     }
 
-    public function testDynamicMarkdownLinksWithDoubleQuotes()
+    public function testBasicDynamicMarkdownLinks()
     {
-        $this->markTestSkipped('https://github.com/hydephp/develop/pull/1590#discussion_r1690082732');
-
         $input = <<<'MARKDOWN'
-        [Home](hyde::route("home"))
-        ![Logo](hyde::asset("logo.png"))
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
+        <p><a href="index.html">Home</a>
         <img src="media/logo.png" alt="Logo" /></p>
 
         HTML;
@@ -70,13 +53,13 @@ public function testDynamicMarkdownLinksWithDoubleQuotes()
     public function testDynamicMarkdownLinksInParagraphs()
     {
         $input = <<<'MARKDOWN'
-        This is a paragraph with a [link to home](hyde::route('home')).
+        This is a paragraph with a [link to home](/_pages/index.blade.php).
 
-        Another paragraph with an ![image](hyde::asset('image.jpg')).
+        Another paragraph with an ![image](/_media/image.jpg).
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p>This is a paragraph with a <a href="home.html">link to home</a>.</p>
+        <p>This is a paragraph with a <a href="index.html">link to home</a>.</p>
         <p>Another paragraph with an <img src="media/image.jpg" alt="image" />.</p>
 
         HTML;
@@ -87,14 +70,14 @@ public function testDynamicMarkdownLinksInParagraphs()
     public function testDynamicMarkdownLinksInLists()
     {
         $input = <<<'MARKDOWN'
-        - [Home](hyde::route('home'))
-        - ![Logo](hyde::asset('logo.png'))
+        - [Home](/_pages/index.blade.php)
+        - ![Logo](/_media/logo.png)
         MARKDOWN;
 
         $expected = <<<'HTML'
         <ul>
         <li>
-        <a href="home.html">Home</a>
+        <a href="index.html">Home</a>
         </li>
         <li>
         <img src="media/logo.png" alt="Logo" />
@@ -108,12 +91,14 @@ public function testDynamicMarkdownLinksInLists()
 
     public function testDynamicMarkdownLinksWithNestedRoutes()
     {
+        Routes::addRoute(new Route(new MarkdownPage('about/contact')));
+
         $input = <<<'MARKDOWN'
-        [Blog Post](hyde::route('blog/post'))
+        [Contact](/_pages/about/contact.md)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="blog/post.html">Blog Post</a></p>
+        <p><a href="about/contact.html">Contact</a></p>
 
         HTML;
 
@@ -123,15 +108,15 @@ public function testDynamicMarkdownLinksWithNestedRoutes()
     public function testMixOfDynamicAndRegularMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
-        [Home](hyde::route('home'))
+        [Home](/_pages/index.blade.php)
         [External](https://example.com)
         [Regular](regular-link.html)
-        ![Logo](hyde::asset('logo.png'))
+        ![Logo](/_media/logo.png)
         ![External Image](https://example.com/image.jpg)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
+        <p><a href="index.html">Home</a>
         <a href="https://example.com">External</a>
         <a href="regular-link.html">Regular</a>
         <img src="media/logo.png" alt="Logo" />
@@ -141,4 +126,20 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testLinksWithLeadingSlash()
+    {
+        $input = <<<'MARKDOWN'
+        [Home with slash](/_pages/index.blade.php)
+        ![Logo with slash](/_media/logo.png)
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="index.html">Home with slash</a>
+        <img src="media/logo.png" alt="Logo with slash" /></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index daca2d7ea34..002ba287a8a 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,13 +6,13 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\RenderData;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
@@ -31,37 +31,40 @@ protected function setUp(): void
 
         Render::swap(new RenderData());
 
-        Routes::addRoute(new Route(new InMemoryPage('home')));
+        Routes::addRoute(new Route(new BladePage('index')));
+        Routes::addRoute(new Route(new MarkdownPost('post')));
+
+        // Todo: No way to mock media files, so we are using app.css as a test asset for now.
     }
 
     public function testRouteReplacement()
     {
-        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
-        $expected = '<p><a href="home.html">Home</a></p>';
+        $input = '<p><a href="_pages/index.blade.php">Home</a></p>';
+        $expected = '<p><a href="index.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRouteReplacementWithoutQuotes()
+    public function testRouteReplacementWithLeadingSlash()
     {
-        $input = '<p><a href="hyde::route(home)">Home</a></p>';
-        $expected = '<p><a href="home.html">Home</a></p>';
+        $input = '<p><a href="/_pages/index.blade.php">Home</a></p>';
+        $expected = '<p><a href="index.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacement()
     {
-        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
-        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
+        $input = '<p><img src="_media/app.css" alt="Logo" /></p>';
+        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testAssetReplacementWithoutQuotes()
+    public function testAssetReplacementWithLeadingSlash()
     {
-        $input = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
-        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
+        $input = '<p><img src="/_media/app.css" alt="Logo" /></p>';
+        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -69,13 +72,13 @@ public function testAssetReplacementWithoutQuotes()
     public function testMultipleReplacements()
     {
         $input = <<<'HTML'
-        <a href="hyde::route('home')">Home</a>
-        <img src="hyde::asset('logo.png')" alt="Logo" />
+        <a href="_pages/index.blade.php">Home</a>
+        <img src="_media/app.css" alt="Logo" />
         HTML;
 
         $expected = <<<'HTML'
-        <a href="home.html">Home</a>
-        <img src="media/logo.png" alt="Logo" />
+        <a href="index.html">Home</a>
+        <img src="media/app.css" alt="Logo" />
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
@@ -88,61 +91,28 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testNonExistentRouteThrowsException()
-    {
-        $this->expectException(RouteNotFoundException::class);
-        $this->expectExceptionMessage('Route [non-existent] not found.');
-
-        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
-        DynamicMarkdownLinkProcessor::postprocess($input);
-    }
-
-    // Fault tolerance tests
-
-    public function testMalformedRouteLink()
-    {
-        $input = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMalformedRouteLink2()
-    {
-        $input = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMalformedRouteLink3()
+    public function testNestedRouteReplacement()
     {
-        $input = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
+        $input = '<p><a href="_posts/post.md">Blog Post</a></p>';
+        $expected = '<p><a href="posts/post.html">Blog Post</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testMalformedAssetLink()
-    {
-        $input = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
-        $expected = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
+    // Fault tolerance tests
 
-    public function testEmptyRouteLink()
+    public function testNonExistentRouteIsNotReplaced()
     {
-        $input = '<p><a href="hyde::route()">Empty Route</a></p>';
-        $expected = '<p><a href="hyde::route()">Empty Route</a></p>';
+        $input = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
+        $expected = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testEmptyAssetLink()
+    public function testNonExistentAssetIsNotReplaced()
     {
-        $input = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
-        $expected = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
+        $input = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
+        $expected = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -150,35 +120,19 @@ public function testEmptyAssetLink()
     public function testMixedValidAndInvalidLinks()
     {
         $input = <<<'HTML'
-        <a href="hyde::route('home')">Valid Home</a>
-        <a href="hyde::route(invalid'">Invalid Route</a>
-        <img src="hyde::asset('logo.png')" alt="Valid Logo" />
-        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
+        <a href="_pages/index.blade.php">Valid Home</a>
+        <a href="_pages/invalid.blade.php">Invalid Route</a>
+        <img src="_media/app.css" alt="Valid Logo" />
+        <img src="_media/invalid.jpg" alt="Invalid Asset" />
         HTML;
 
         $expected = <<<'HTML'
-        <a href="home.html">Valid Home</a>
-        <a href="hyde::route(invalid'">Invalid Route</a>
-        <img src="media/logo.png" alt="Valid Logo" />
-        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
+        <a href="index.html">Valid Home</a>
+        <a href="_pages/invalid.blade.php">Invalid Route</a>
+        <img src="media/app.css" alt="Valid Logo" />
+        <img src="_media/invalid.jpg" alt="Invalid Asset" />
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
-
-    public function testMalformedHydeSyntax()
-    {
-        $input = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
-        $expected = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testNonExistentRouteFunction()
-    {
-        $input = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
-        $expected = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
 }

From 9e613daae4995f0b078c91b1a481db45933b0cce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 24 Jul 2024 22:28:58 +0200
Subject: [PATCH 2752/2811] Improve proof of concept

---
 docs/digging-deeper/advanced-markdown.md      |  55 ++++-----
 .../DynamicMarkdownLinkProcessor.php          |  56 ++++++---
 .../DynamicMarkdownLinksFeatureTest.php       | 107 ++++++++++++++++++
 .../tests/Unit/IncludesFacadeUnitTest.php     |   9 ++
 4 files changed, 176 insertions(+), 51 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index ce04af98bfd..1278f1702a4 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -163,51 +163,40 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 ## Dynamic Markdown Links
 
-HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using source file paths, which are then converted to the appropriate routes in the built site.
+## Overview
+HydePHP automatically resolves links in your Markdown files using source file paths, converting them to appropriate routes in the built site.
 
-### Usage
-
-You can use the following syntax options in your Markdown files:
+## Usage
+In your Markdown files, use source file paths for links:
 
 ```markdown
-<!-- Resolving a page route -->
 [Home](/_pages/index.blade.php)
-
-<!-- Resolving a media asset -->
 ![Logo](/_media/logo.svg)
 ```
 
-By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links. The feature is always enabled in the Markdown converter.
-
-### How It Works
-
-When you use a source file path in your Markdown links, HydePHP will automatically convert it to the appropriate route or asset path in the built site. For example:
+## How It Works
+During the build process, HydePHP converts source paths to their corresponding routes:
 
-- `/_pages/index.blade.php` will be converted to `index.html`
-- `/_pages/blog/post.blade.php` will be converted to `blog/post.html`
-- `/_media/logo.svg` will be converted to `media/logo.svg`
-
-This conversion happens during the build process, ensuring that your links are always up-to-date with your current site structure.
-
-### Benefits
-
-1. **IDE Support**: By using actual file paths, you get better IDE support, including autocompletion and error checking.
-2. **Syntax Highlighting**: Your Markdown editor can provide proper syntax highlighting for these links, as they use standard Markdown syntax.
-3. **Easy Navigation**: You can easily navigate to the source files by clicking on the links in your IDE.
-
-### Limitations
+- `/_pages/index.blade.php` becomes `index.html`
+- `/_pages/blog/post.blade.php` becomes `blog/post.html`
+- `/_media/logo.svg` becomes `media/logo.svg`
 
-- This syntax doesn't support linking to dynamic routes. For such cases, you may need to use a different approach.
-- If you move or rename source files, make sure to update any Markdown links referencing them to avoid broken links.
-- While this approach provides better IDE support and syntax highlighting, it does couple your content to your project structure. Consider this trade-off when deciding to use this feature.
+## Benefits
+- Enhanced IDE support (autocompletion, error checking)
+- Proper syntax highlighting in Markdown editors
+- Easy navigation to source files
 
-### Best Practices
+## Limitations
+- Doesn't support dynamic routes
+- Content becomes coupled to project structure
+- Requires manual updates if files are moved or renamed
 
-1. Always use the leading slash (`/`) in your links to ensure consistency and avoid potential issues with relative paths.
-2. Keep your file structure organized and consistent to make it easier to manage links.
-3. Regularly check for broken links in your content, especially after moving or renaming files.
+## Best Practices
+1. Use leading slashes in links for consistency
+2. Maintain an organized file structure
+3. Regularly check for broken links, especially after file operations
 
-By following these guidelines and understanding the limitations, you can effectively use dynamic Markdown links to create more maintainable and flexible content in your HydePHP projects.
+By leveraging this feature, you can create more maintainable content while enjoying improved developer tooling support.
 
 ## Configuration
 
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 5ab0541ad2c..0a12e54b03c 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -12,6 +12,32 @@
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
+    {
+        foreach (static::routeMap() as $sourcePath => $route) {
+            $patterns = [
+                sprintf('<a href="%s">', $sourcePath),
+                sprintf('<a href="/%s">', $sourcePath),
+            ];
+
+            $html = str_replace($patterns, sprintf('<a href="%s">', $route->getLink()), $html);
+        }
+
+        foreach (static::assetMap() as $path => $mediaFile) {
+            $patterns = [
+                sprintf('<img src="%s"', $path),
+                sprintf('<img src="/%s"', $path),
+            ];
+
+            $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);
+        }
+
+        return $html;
+    }
+
+    /**
+     * @return array<string, \Hyde\Support\Models\Route>
+     */
+    protected static function routeMap(): array
     {
         // Todo cache in static property bound to kernel version (but evaluation is tied to rendering page)
 
@@ -22,15 +48,14 @@ public static function postprocess(string $html): string
             $map[$route->getSourcePath()] = $route;
         }
 
-        foreach ($map as $sourcePath => $route) {
-            $patterns = [
-                '<a href="'.$sourcePath.'">',
-                '<a href="/'.$sourcePath.'">',
-            ];
-
-            $html = str_replace($patterns, '<a href="'.$route->getLink().'">', $html);
-        }
+        return $map;
+    }
 
+    /**
+     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
+     */
+    protected static function assetMap(): array
+    {
         // maybe we just need to cache this, as the kernel is already a singleton, but this is not
         $assetMap = [];
 
@@ -38,16 +63,11 @@ public static function postprocess(string $html): string
             $assetMap[$mediaFile->getPath()] = $mediaFile;
         }
 
-        foreach ($assetMap as $path => $mediaFile) {
-            $patterns = [
-                '<img src="'.$path.'"',
-                '<img src="/'.$path.'"',
-            ];
-
-            $localPath = Str::after($mediaFile->getPath(), '_media/');
-            $html = str_replace($patterns, '<img src="'.Hyde::asset($localPath).'"', $html);
-        }
+        return $assetMap;
+    }
 
-        return $html;
+    protected static function assetPath(MediaFile $mediaFile): string
+    {
+        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
     }
 }
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index c88cf429291..dd0c4f408c5 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -8,6 +8,7 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
+use Hyde\Support\Includes;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
@@ -15,6 +16,8 @@
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
  * @covers \Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter
+ *
+ * @see \Hyde\Framework\Testing\Feature\Services\Markdown\DynamicMarkdownLinkProcessorTest
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
@@ -142,4 +145,108 @@ public function testLinksWithLeadingSlash()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testCanRenderPageWithDynamicMarkdownLinks()
+    {
+        $this->file('_pages/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $page = MarkdownPage::get('test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="index.html">Home</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderNestedPageWithDynamicMarkdownLinks()
+    {
+        $this->file('_pages/nested/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $page = MarkdownPage::get('nested/test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="../index.html">Home</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderIncludeWithDynamicMarkdownLinks()
+    {
+        // if there is no current path data, we assume the file is included from the root
+
+        $this->file('resources/includes/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $html = Includes::markdown('test')->toHtml();
+
+        $expected = [
+            '<a href="index.html">Home</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderIncludeFromNestedPageWithDynamicMarkdownLinks()
+    {
+        $this->mockCurrentPage('nested/test');
+
+        $this->file('resources/includes/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $html = Includes::markdown('test')->toHtml();
+
+        $expected = [
+            '<a href="../index.html">Home</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
 }
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 1da30c9d435..6dac17db2f5 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,9 +9,12 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
+use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
+use Hyde\Testing\MocksKernelFeatures;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -20,6 +23,8 @@
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {
+    use MocksKernelFeatures;
+
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
@@ -28,6 +33,10 @@ protected function setUp(): void
         parent::setUp();
 
         Blade::swap(Mockery::mock());
+
+        $this->setupTestKernel();
+        $this->kernel->setRoutes(collect());
+        Render::swap(new RenderData());
     }
 
     protected function tearDown(): void

From 6a5f159d2bd4f6cea4901af7bd4b0e8cb97871c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:31:32 +0200
Subject: [PATCH 2753/2811] Prepare to refactor proof of concept

Want to reimplement these a bit better

Revert "New proof of concept"

This reverts commit d4d8762640544f0402c651797715b0303384940e.

Revert "Improve proof of concept"

This reverts commit 9e613daae4995f0b078c91b1a481db45933b0cce.
---
 docs/digging-deeper/advanced-markdown.md      |  45 ++---
 .../DynamicMarkdownLinkProcessor.php          |  73 ++-----
 .../DynamicMarkdownLinksFeatureTest.php       | 186 ++++--------------
 .../DynamicMarkdownLinkProcessorTest.php      | 122 ++++++++----
 .../tests/Unit/IncludesFacadeUnitTest.php     |   9 -
 5 files changed, 165 insertions(+), 270 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 1278f1702a4..f8d59d14267 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -163,40 +163,37 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 ## Dynamic Markdown Links
 
-## Overview
-HydePHP automatically resolves links in your Markdown files using source file paths, converting them to appropriate routes in the built site.
+HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using a special Hyde Markdown link syntax, designed to match the syntax of the `Hyde` facade.
 
-## Usage
-In your Markdown files, use source file paths for links:
+### Usage
+
+You can use the following syntax options in your Markdown files:
 
 ```markdown
-[Home](/_pages/index.blade.php)
-![Logo](/_media/logo.svg)
+<!-- Resolving a page route -->
+[Home](hyde::route('home'))
+
+<!-- Resolving a media asset -->
+![Logo](hyde::asset('logo.png'))
 ```
 
-## How It Works
-During the build process, HydePHP converts source paths to their corresponding routes:
+By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links. The feature is always enabled in the Markdown converter.
 
-- `/_pages/index.blade.php` becomes `index.html`
-- `/_pages/blog/post.blade.php` becomes `blog/post.html`
-- `/_media/logo.svg` becomes `media/logo.svg`
 
-## Benefits
-- Enhanced IDE support (autocompletion, error checking)
-- Proper syntax highlighting in Markdown editors
-- Easy navigation to source files
+### Breakdown
 
-## Limitations
-- Doesn't support dynamic routes
-- Content becomes coupled to project structure
-- Requires manual updates if files are moved or renamed
+The example above is equivalent to the following Blade syntax:
+
+```blade
+<!-- Resolving a page route -->
+{{ Hyde::route('route.name') ?? throw new RouteNotFoundException() }}
+
+<!-- Resolving a media asset -->
+{{ Hyde::asset('path') }}
+```
 
-## Best Practices
-1. Use leading slashes in links for consistency
-2. Maintain an organized file structure
-3. Regularly check for broken links, especially after file operations
+As you can see, we throw an exception if the route doesn't exist, to provide immediate feedback during development.
 
-By leveraging this feature, you can create more maintainable content while enjoying improved developer tooling support.
 
 ## Configuration
 
diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 0a12e54b03c..0bbe7643826 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,69 +5,38 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
-use Illuminate\Support\Str;
-use Hyde\Support\Filesystem\MediaFile;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
-        foreach (static::routeMap() as $sourcePath => $route) {
-            $patterns = [
-                sprintf('<a href="%s">', $sourcePath),
-                sprintf('<a href="/%s">', $sourcePath),
-            ];
-
-            $html = str_replace($patterns, sprintf('<a href="%s">', $route->getLink()), $html);
-        }
-
-        foreach (static::assetMap() as $path => $mediaFile) {
-            $patterns = [
-                sprintf('<img src="%s"', $path),
-                sprintf('<img src="/%s"', $path),
-            ];
-
-            $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);
+        foreach (static::patterns() as $pattern => $replacement) {
+            $html = preg_replace_callback($pattern, $replacement, $html);
         }
 
         return $html;
     }
 
-    /**
-     * @return array<string, \Hyde\Support\Models\Route>
-     */
-    protected static function routeMap(): array
-    {
-        // Todo cache in static property bound to kernel version (but evaluation is tied to rendering page)
-
-        $map = [];
-
-        /** @var \Hyde\Support\Models\Route $route */
-        foreach (Hyde::routes() as $route) {
-            $map[$route->getSourcePath()] = $route;
-        }
-
-        return $map;
-    }
-
-    /**
-     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
-     */
-    protected static function assetMap(): array
-    {
-        // maybe we just need to cache this, as the kernel is already a singleton, but this is not
-        $assetMap = [];
-
-        foreach (MediaFile::all() as $mediaFile) {
-            $assetMap[$mediaFile->getPath()] = $mediaFile;
-        }
-
-        return $assetMap;
-    }
-
-    protected static function assetPath(MediaFile $mediaFile): string
+    /** @return array<string, callable(array<int, string>): string> */
+    protected static function patterns(): array
     {
-        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
+        return [
+            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+                $route = Hyde::route($matches[2]);
+                if ($route === null) {
+                    // While the other patterns work regardless of if input is valid,
+                    // this method returns null, which silently fails to an empty string.
+                    // So we instead throw an exception to alert the developer of the issue.
+                    throw new RouteNotFoundException($matches[2]);
+                }
+
+                return '<a href="'.$route.'"';
+            },
+            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
+                return '<img src="'.Hyde::asset($matches[2]).'"';
+            },
+        ];
     }
 }
diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index dd0c4f408c5..a4d57aa76a5 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -8,8 +8,7 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
-use Hyde\Support\Includes;
-use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 
@@ -21,31 +20,46 @@
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
-    public static function setUpBeforeClass(): void
+    protected function setUp(): void
     {
-        parent::setUpBeforeClass();
+        parent::setUp();
 
-        touch('_media/logo.png');
-        touch('_media/image.jpg');
+        Routes::addRoute(new Route(new InMemoryPage('home')));
+        Routes::addRoute(new Route(new InMemoryPage('blog/post')));
     }
 
-    public static function tearDownAfterClass(): void
+    public function testBasicDynamicMarkdownLinks()
     {
-        unlink('_media/logo.png');
-        unlink('_media/image.jpg');
+        $input = <<<'MARKDOWN'
+        [Home](hyde::route('home'))
+        ![Logo](hyde::asset('logo.png'))
+        
+        [Home](hyde::route(home))
+        ![Logo](hyde::asset(logo.png))
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="home.html">Home</a>
+        <img src="media/logo.png" alt="Logo" /></p>
+        <p><a href="home.html">Home</a>
+        <img src="media/logo.png" alt="Logo" /></p>
+
+        HTML;
 
-        parent::tearDownAfterClass();
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
 
-    public function testBasicDynamicMarkdownLinks()
+    public function testDynamicMarkdownLinksWithDoubleQuotes()
     {
+        $this->markTestSkipped('https://github.com/hydephp/develop/pull/1590#discussion_r1690082732');
+
         $input = <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
-        ![Logo](/_media/logo.png)
+        [Home](hyde::route("home"))
+        ![Logo](hyde::asset("logo.png"))
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="index.html">Home</a>
+        <p><a href="home.html">Home</a>
         <img src="media/logo.png" alt="Logo" /></p>
 
         HTML;
@@ -56,13 +70,13 @@ public function testBasicDynamicMarkdownLinks()
     public function testDynamicMarkdownLinksInParagraphs()
     {
         $input = <<<'MARKDOWN'
-        This is a paragraph with a [link to home](/_pages/index.blade.php).
+        This is a paragraph with a [link to home](hyde::route('home')).
 
-        Another paragraph with an ![image](/_media/image.jpg).
+        Another paragraph with an ![image](hyde::asset('image.jpg')).
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p>This is a paragraph with a <a href="index.html">link to home</a>.</p>
+        <p>This is a paragraph with a <a href="home.html">link to home</a>.</p>
         <p>Another paragraph with an <img src="media/image.jpg" alt="image" />.</p>
 
         HTML;
@@ -73,14 +87,14 @@ public function testDynamicMarkdownLinksInParagraphs()
     public function testDynamicMarkdownLinksInLists()
     {
         $input = <<<'MARKDOWN'
-        - [Home](/_pages/index.blade.php)
-        - ![Logo](/_media/logo.png)
+        - [Home](hyde::route('home'))
+        - ![Logo](hyde::asset('logo.png'))
         MARKDOWN;
 
         $expected = <<<'HTML'
         <ul>
         <li>
-        <a href="index.html">Home</a>
+        <a href="home.html">Home</a>
         </li>
         <li>
         <img src="media/logo.png" alt="Logo" />
@@ -94,14 +108,12 @@ public function testDynamicMarkdownLinksInLists()
 
     public function testDynamicMarkdownLinksWithNestedRoutes()
     {
-        Routes::addRoute(new Route(new MarkdownPage('about/contact')));
-
         $input = <<<'MARKDOWN'
-        [Contact](/_pages/about/contact.md)
+        [Blog Post](hyde::route('blog/post'))
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="about/contact.html">Contact</a></p>
+        <p><a href="blog/post.html">Blog Post</a></p>
 
         HTML;
 
@@ -111,15 +123,15 @@ public function testDynamicMarkdownLinksWithNestedRoutes()
     public function testMixOfDynamicAndRegularMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
+        [Home](hyde::route('home'))
         [External](https://example.com)
         [Regular](regular-link.html)
-        ![Logo](/_media/logo.png)
+        ![Logo](hyde::asset('logo.png'))
         ![External Image](https://example.com/image.jpg)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="index.html">Home</a>
+        <p><a href="home.html">Home</a>
         <a href="https://example.com">External</a>
         <a href="regular-link.html">Regular</a>
         <img src="media/logo.png" alt="Logo" />
@@ -129,124 +141,4 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
-
-    public function testLinksWithLeadingSlash()
-    {
-        $input = <<<'MARKDOWN'
-        [Home with slash](/_pages/index.blade.php)
-        ![Logo with slash](/_media/logo.png)
-        MARKDOWN;
-
-        $expected = <<<'HTML'
-        <p><a href="index.html">Home with slash</a>
-        <img src="media/logo.png" alt="Logo with slash" /></p>
-
-        HTML;
-
-        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
-    }
-
-    public function testCanRenderPageWithDynamicMarkdownLinks()
-    {
-        $this->file('_pages/test.md', <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
-        ![Logo](/_media/logo.png)
-
-        [non-existent](/_pages/non-existent.md)
-        ![non-existent](/_media/non-existent.png)
-        MARKDOWN);
-
-        $page = MarkdownPage::get('test');
-        Hyde::shareViewData($page);
-        $html = $page->compile();
-
-        $expected = [
-            '<a href="index.html">Home</a>',
-            '<img src="media/logo.png" alt="Logo" />',
-            '<a href="/_pages/non-existent.md">non-existent</a>',
-            '<img src="/_media/non-existent.png" alt="non-existent" />',
-        ];
-
-        foreach ($expected as $expectation) {
-            $this->assertStringContainsString($expectation, $html);
-        }
-    }
-
-    public function testCanRenderNestedPageWithDynamicMarkdownLinks()
-    {
-        $this->file('_pages/nested/test.md', <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
-        ![Logo](/_media/logo.png)
-
-        [non-existent](/_pages/non-existent.md)
-        ![non-existent](/_media/non-existent.png)
-        MARKDOWN);
-
-        $page = MarkdownPage::get('nested/test');
-        Hyde::shareViewData($page);
-        $html = $page->compile();
-
-        $expected = [
-            '<a href="../index.html">Home</a>',
-            '<img src="../media/logo.png" alt="Logo" />',
-            '<a href="/_pages/non-existent.md">non-existent</a>',
-            '<img src="/_media/non-existent.png" alt="non-existent" />',
-        ];
-
-        foreach ($expected as $expectation) {
-            $this->assertStringContainsString($expectation, $html);
-        }
-    }
-
-    public function testCanRenderIncludeWithDynamicMarkdownLinks()
-    {
-        // if there is no current path data, we assume the file is included from the root
-
-        $this->file('resources/includes/test.md', <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
-        ![Logo](/_media/logo.png)
-
-        [non-existent](/_pages/non-existent.md)
-        ![non-existent](/_media/non-existent.png)
-        MARKDOWN);
-
-        $html = Includes::markdown('test')->toHtml();
-
-        $expected = [
-            '<a href="index.html">Home</a>',
-            '<img src="media/logo.png" alt="Logo" />',
-            '<a href="/_pages/non-existent.md">non-existent</a>',
-            '<img src="/_media/non-existent.png" alt="non-existent" />',
-        ];
-
-        foreach ($expected as $expectation) {
-            $this->assertStringContainsString($expectation, $html);
-        }
-    }
-
-    public function testCanRenderIncludeFromNestedPageWithDynamicMarkdownLinks()
-    {
-        $this->mockCurrentPage('nested/test');
-
-        $this->file('resources/includes/test.md', <<<'MARKDOWN'
-        [Home](/_pages/index.blade.php)
-        ![Logo](/_media/logo.png)
-
-        [non-existent](/_pages/non-existent.md)
-        ![non-existent](/_media/non-existent.png)
-        MARKDOWN);
-
-        $html = Includes::markdown('test')->toHtml();
-
-        $expected = [
-            '<a href="../index.html">Home</a>',
-            '<img src="../media/logo.png" alt="Logo" />',
-            '<a href="/_pages/non-existent.md">non-existent</a>',
-            '<img src="/_media/non-existent.png" alt="non-existent" />',
-        ];
-
-        foreach ($expected as $expectation) {
-            $this->assertStringContainsString($expectation, $html);
-        }
-    }
 }
diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 002ba287a8a..daca2d7ea34 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,13 +6,13 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Pages\BladePage;
-use Hyde\Pages\MarkdownPost;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\RenderData;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
@@ -31,40 +31,37 @@ protected function setUp(): void
 
         Render::swap(new RenderData());
 
-        Routes::addRoute(new Route(new BladePage('index')));
-        Routes::addRoute(new Route(new MarkdownPost('post')));
-
-        // Todo: No way to mock media files, so we are using app.css as a test asset for now.
+        Routes::addRoute(new Route(new InMemoryPage('home')));
     }
 
     public function testRouteReplacement()
     {
-        $input = '<p><a href="_pages/index.blade.php">Home</a></p>';
-        $expected = '<p><a href="index.html">Home</a></p>';
+        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
+        $expected = '<p><a href="home.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRouteReplacementWithLeadingSlash()
+    public function testRouteReplacementWithoutQuotes()
     {
-        $input = '<p><a href="/_pages/index.blade.php">Home</a></p>';
-        $expected = '<p><a href="index.html">Home</a></p>';
+        $input = '<p><a href="hyde::route(home)">Home</a></p>';
+        $expected = '<p><a href="home.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacement()
     {
-        $input = '<p><img src="_media/app.css" alt="Logo" /></p>';
-        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
+        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
+        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testAssetReplacementWithLeadingSlash()
+    public function testAssetReplacementWithoutQuotes()
     {
-        $input = '<p><img src="/_media/app.css" alt="Logo" /></p>';
-        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
+        $input = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
+        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -72,13 +69,13 @@ public function testAssetReplacementWithLeadingSlash()
     public function testMultipleReplacements()
     {
         $input = <<<'HTML'
-        <a href="_pages/index.blade.php">Home</a>
-        <img src="_media/app.css" alt="Logo" />
+        <a href="hyde::route('home')">Home</a>
+        <img src="hyde::asset('logo.png')" alt="Logo" />
         HTML;
 
         $expected = <<<'HTML'
-        <a href="index.html">Home</a>
-        <img src="media/app.css" alt="Logo" />
+        <a href="home.html">Home</a>
+        <img src="media/logo.png" alt="Logo" />
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
@@ -91,28 +88,61 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testNestedRouteReplacement()
+    public function testNonExistentRouteThrowsException()
     {
-        $input = '<p><a href="_posts/post.md">Blog Post</a></p>';
-        $expected = '<p><a href="posts/post.html">Blog Post</a></p>';
+        $this->expectException(RouteNotFoundException::class);
+        $this->expectExceptionMessage('Route [non-existent] not found.');
 
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
+        DynamicMarkdownLinkProcessor::postprocess($input);
     }
 
     // Fault tolerance tests
 
-    public function testNonExistentRouteIsNotReplaced()
+    public function testMalformedRouteLink()
+    {
+        $input = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedRouteLink2()
+    {
+        $input = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedRouteLink3()
+    {
+        $input = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
+        $expected = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMalformedAssetLink()
+    {
+        $input = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
+        $expected = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testEmptyRouteLink()
     {
-        $input = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
-        $expected = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
+        $input = '<p><a href="hyde::route()">Empty Route</a></p>';
+        $expected = '<p><a href="hyde::route()">Empty Route</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testNonExistentAssetIsNotReplaced()
+    public function testEmptyAssetLink()
     {
-        $input = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
-        $expected = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
+        $input = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
+        $expected = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -120,19 +150,35 @@ public function testNonExistentAssetIsNotReplaced()
     public function testMixedValidAndInvalidLinks()
     {
         $input = <<<'HTML'
-        <a href="_pages/index.blade.php">Valid Home</a>
-        <a href="_pages/invalid.blade.php">Invalid Route</a>
-        <img src="_media/app.css" alt="Valid Logo" />
-        <img src="_media/invalid.jpg" alt="Invalid Asset" />
+        <a href="hyde::route('home')">Valid Home</a>
+        <a href="hyde::route(invalid'">Invalid Route</a>
+        <img src="hyde::asset('logo.png')" alt="Valid Logo" />
+        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
         HTML;
 
         $expected = <<<'HTML'
-        <a href="index.html">Valid Home</a>
-        <a href="_pages/invalid.blade.php">Invalid Route</a>
-        <img src="media/app.css" alt="Valid Logo" />
-        <img src="_media/invalid.jpg" alt="Invalid Asset" />
+        <a href="home.html">Valid Home</a>
+        <a href="hyde::route(invalid'">Invalid Route</a>
+        <img src="media/logo.png" alt="Valid Logo" />
+        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
+
+    public function testMalformedHydeSyntax()
+    {
+        $input = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
+        $expected = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testNonExistentRouteFunction()
+    {
+        $input = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
+        $expected = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 }
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 6dac17db2f5..1da30c9d435 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,12 +9,9 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
-use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
-use Hyde\Testing\MocksKernelFeatures;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -23,8 +20,6 @@
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {
-    use MocksKernelFeatures;
-
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
@@ -33,10 +28,6 @@ protected function setUp(): void
         parent::setUp();
 
         Blade::swap(Mockery::mock());
-
-        $this->setupTestKernel();
-        $this->kernel->setRoutes(collect());
-        Render::swap(new RenderData());
     }
 
     protected function tearDown(): void

From 9c19e5025063d8575c8e1b0a6972e3a2d1499cb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:40:28 +0200
Subject: [PATCH 2754/2811] Document new dynamic Markdown link feature spec

---
 docs/digging-deeper/advanced-markdown.md | 47 +++++++++++++++---------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index f8d59d14267..e0ce47a5a37 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -163,37 +163,48 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 ## Dynamic Markdown Links
 
-HydePHP provides a powerful feature for automatically resolving dynamic links within your pages and posts using a special Hyde Markdown link syntax, designed to match the syntax of the `Hyde` facade.
+## Overview
 
-### Usage
+HydePHP provides a powerful feature for automatically converting Markdown links to source files to the corresponding routes in the built site.
 
-You can use the following syntax options in your Markdown files:
+This allows for much better writing experience when using an IDE, as you can easily navigate to the source file by clicking on the link.
 
-```markdown
-<!-- Resolving a page route -->
-[Home](hyde::route('home'))
+## Usage
+
+Using the feature is simple: Just use source file paths for links:
 
-<!-- Resolving a media asset -->
-![Logo](hyde::asset('logo.png'))
+```markdown
+[Home](/_pages/index.blade.php)
+![Logo](/_media/logo.svg)
 ```
 
-By using these dynamic Markdown links, you can create more maintainable and flexible content, allowing your site structure to evolve without breaking internal links. The feature is always enabled in the Markdown converter.
+As you can see, it works for both pages and media assets. The leading slash is optional and will be ignored by Hyde, but including it often gives better IDE support.
 
+### Behind the Scenes
 
-### Breakdown
+During the build process, HydePHP converts source paths to their corresponding routes, and evaluates them depending on the page being rendered.
 
-The example above is equivalent to the following Blade syntax:
+If your page is in the site root then:
 
-```blade
-<!-- Resolving a page route -->
-{{ Hyde::route('route.name') ?? throw new RouteNotFoundException() }}
+- `/_pages/index.blade.php` becomes `index.html`
+- `/_media/logo.svg` becomes `media/logo.svg`
 
-<!-- Resolving a media asset -->
-{{ Hyde::asset('path') }}
-```
+If your page is in a subdirectory then:
+
+- `/_pages/index.blade.php` becomes `../index.html`
+- `/_media/logo.svg` becomes `../media/logo.svg`
+
+Of course, if your page is in a more deeply nested directory, the number of `../` will increase accordingly.
+
+We will of course also match your configured preference for `pretty_urls` and only include the `.html` extension when desired.
+
+### Limitations
 
-As you can see, we throw an exception if the route doesn't exist, to provide immediate feedback during development.
+There are some limitations and considerations to keep in mind when using this feature:
 
+- This feature won't work for dynamic routes (not backed by a file)
+- If you rename a file, links will break. Your IDE may warn about this.
+- If a file is not found, we won't be able to see it when evaluating links.
 
 ## Configuration
 

From 70deb8ca82137a5fd01a77f5e0571afe749d5352 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:43:22 +0200
Subject: [PATCH 2755/2811] Remove the patterns method

---
 .../DynamicMarkdownLinkProcessor.php          | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 0bbe7643826..ab0dc0a7236 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -18,25 +18,4 @@ public static function postprocess(string $html): string
 
         return $html;
     }
-
-    /** @return array<string, callable(array<int, string>): string> */
-    protected static function patterns(): array
-    {
-        return [
-            '/<a href="hyde::route\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                $route = Hyde::route($matches[2]);
-                if ($route === null) {
-                    // While the other patterns work regardless of if input is valid,
-                    // this method returns null, which silently fails to an empty string.
-                    // So we instead throw an exception to alert the developer of the issue.
-                    throw new RouteNotFoundException($matches[2]);
-                }
-
-                return '<a href="'.$route.'"';
-            },
-            '/<img src="hyde::asset\(([\'"]?)([^\'"]+)\1\)"/' => function (array $matches): string {
-                return '<img src="'.Hyde::asset($matches[2]).'"';
-            },
-        ];
-    }
 }

From 780b871d0c7e5fc366518dfce45508c437a221a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:44:25 +0200
Subject: [PATCH 2756/2811] Remove the patterns loop

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index ab0dc0a7236..cd2888e6bfa 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -12,9 +12,6 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
-        foreach (static::patterns() as $pattern => $replacement) {
-            $html = preg_replace_callback($pattern, $replacement, $html);
-        }
 
         return $html;
     }

From dee2c96d87af33711b6636ddc213abe3d802f030 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:44:37 +0200
Subject: [PATCH 2757/2811] Remove unused import

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index cd2888e6bfa..29ad4a388fa 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,7 +5,6 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract

From 642ec731c2bacfb9872234c0999e8ddb3e588358 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:44:56 +0200
Subject: [PATCH 2758/2811] Draft new processing loop

---
 .../Processing/DynamicMarkdownLinkProcessor.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 29ad4a388fa..784e8a46e4b 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -11,6 +11,23 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
     public static function postprocess(string $html): string
     {
+        foreach (static::routeMap() as $sourcePath => $route) {
+            $patterns = [
+                '<a href="'.$sourcePath.'">',
+                '<a href="/'.$sourcePath.'">',
+            ];
+
+            $html = str_replace($patterns, '<a href="'.$route->getLink().'">', $html);
+        }
+
+        foreach (static::assetMap() as $path => $mediaFile) {
+            $patterns = [
+                '<img src="'.$path.'"',
+                '<img src="/'.$path.'"',
+            ];
+
+            $html = str_replace($patterns, '<img src="'.static::assetPath($mediaFile).'"', $html);
+        }
 
         return $html;
     }

From 2b35be29d405747f8d5d500d0e25816ae183a54f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:45:48 +0200
Subject: [PATCH 2759/2811] Convert concatenation to 'sprintf()' calls

---
 .../Processing/DynamicMarkdownLinkProcessor.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 784e8a46e4b..e6a3483a1ba 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -13,20 +13,20 @@ public static function postprocess(string $html): string
     {
         foreach (static::routeMap() as $sourcePath => $route) {
             $patterns = [
-                '<a href="'.$sourcePath.'">',
-                '<a href="/'.$sourcePath.'">',
+                sprintf('<a href="%s">', $sourcePath),
+                sprintf('<a href="/%s">', $sourcePath),
             ];
 
-            $html = str_replace($patterns, '<a href="'.$route->getLink().'">', $html);
+            $html = str_replace($patterns, sprintf('<a href="%s">', $route->getLink()), $html);
         }
 
         foreach (static::assetMap() as $path => $mediaFile) {
             $patterns = [
-                '<img src="'.$path.'"',
-                '<img src="/'.$path.'"',
+                sprintf('<img src="%s"', $path),
+                sprintf('<img src="/%s"', $path),
             ];
 
-            $html = str_replace($patterns, '<img src="'.static::assetPath($mediaFile).'"', $html);
+            $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);
         }
 
         return $html;

From 2afc335e06ac1ff09fd1bac354d31efbaa9a4e05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:46:12 +0200
Subject: [PATCH 2760/2811] Implement the route map method

---
 .../Processing/DynamicMarkdownLinkProcessor.php   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index e6a3483a1ba..5efab805bd6 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -31,4 +31,19 @@ public static function postprocess(string $html): string
 
         return $html;
     }
+
+    /**
+     * @return array<string, \Hyde\Support\Models\Route>
+     */
+    protected static function routeMap(): array
+    {
+        $map = [];
+
+        /** @var \Hyde\Support\Models\Route $route */
+        foreach (Hyde::routes() as $route) {
+            $map[$route->getSourcePath()] = $route;
+        }
+
+        return $map;
+    }
 }

From 04a0a7c09f9d57530e7b2da17251fa476ffe54db Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:46:47 +0200
Subject: [PATCH 2761/2811] Implement the asset map method

---
 .../Processing/DynamicMarkdownLinkProcessor.php   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 5efab805bd6..a334a5cbf06 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,6 +5,7 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
+use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
@@ -46,4 +47,18 @@ protected static function routeMap(): array
 
         return $map;
     }
+
+    /**
+     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
+     */
+    protected static function assetMap(): array
+    {
+        $assetMap = [];
+
+        foreach (MediaFile::all() as $mediaFile) {
+            $assetMap[$mediaFile->getPath()] = $mediaFile;
+        }
+
+        return $assetMap;
+    }
 }

From 48efa5ea4f2824aa49a0ed8ce6b9c01ddbc1405d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:47:04 +0200
Subject: [PATCH 2762/2811] Implement the asset path method

---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index a334a5cbf06..4086e23e03b 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -5,6 +5,7 @@
 namespace Hyde\Markdown\Processing;
 
 use Hyde\Hyde;
+use Illuminate\Support\Str;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -61,4 +62,9 @@ protected static function assetMap(): array
 
         return $assetMap;
     }
+
+    protected static function assetPath(MediaFile $mediaFile): string
+    {
+        return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
+    }
 }

From f8c2c22db84aad3ebb8dfc0bc8c783b8ed385770 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 10:47:08 +0200
Subject: [PATCH 2763/2811] Add todo

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 4086e23e03b..247a41d3c14 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -50,6 +50,8 @@ protected static function routeMap(): array
     }
 
     /**
+     * @todo Consider adding caching, since this is not a singleton like the routes.
+     *
      * @return array<string, \Hyde\Support\Filesystem\MediaFile>
      */
     protected static function assetMap(): array

From b5d8f71096019d61b3b7101a3306e755b140cac7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:01:53 +0200
Subject: [PATCH 2764/2811] Update imports

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index daca2d7ea34..e50098cfcc6 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,13 +6,12 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Support\Models\RenderData;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**

From 37b8f84caf1214fa5043aaa56d4aa8b653e2d60f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:02:01 +0200
Subject: [PATCH 2765/2811] Add import

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index e50098cfcc6..3fdf5cee477 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -6,6 +6,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
+use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;

From a44357d96441b925b29d61e1abcf1ded977d0762 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:02:12 +0200
Subject: [PATCH 2766/2811] Update route mocks

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 3fdf5cee477..d5c82d9ed89 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -31,7 +31,8 @@ protected function setUp(): void
 
         Render::swap(new RenderData());
 
-        Routes::addRoute(new Route(new InMemoryPage('home')));
+        Routes::addRoute(new Route(new BladePage('index')));
+        Routes::addRoute(new Route(new MarkdownPost('post')));
     }
 
     public function testRouteReplacement()

From c175cb585ec4c88ca092a6c6876dad4f13202613 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:02:53 +0200
Subject: [PATCH 2767/2811] Remove old exception test

---
 .../Markdown/DynamicMarkdownLinkProcessorTest.php        | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index d5c82d9ed89..81e9e3fa443 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -89,15 +89,6 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testNonExistentRouteThrowsException()
-    {
-        $this->expectException(RouteNotFoundException::class);
-        $this->expectExceptionMessage('Route [non-existent] not found.');
-
-        $input = '<p><a href="hyde::route(\'non-existent\')">Non-existent Route</a></p>';
-        DynamicMarkdownLinkProcessor::postprocess($input);
-    }
-
     // Fault tolerance tests
 
     public function testMalformedRouteLink()

From a8be72d63cba247dc80f470271c7b0652d28dcfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:03:22 +0200
Subject: [PATCH 2768/2811] Remove old fault tolerance tests

---
 .../DynamicMarkdownLinkProcessorTest.php         | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 81e9e3fa443..a11e4b07083 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -157,20 +157,4 @@ public function testMixedValidAndInvalidLinks()
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
-
-    public function testMalformedHydeSyntax()
-    {
-        $input = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
-        $expected = '<p><a href="hyde:route(\'home\')">Malformed Hyde Syntax</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testNonExistentRouteFunction()
-    {
-        $input = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
-        $expected = '<p><a href="hyde::nonexistent(\'home\')">Non-existent Function</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
 }

From 77af426995451c0133cf1ae34929c2894a4f540d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:04:18 +0200
Subject: [PATCH 2769/2811] Remove old fault tolerance tests

---
 .../DynamicMarkdownLinkProcessorTest.php      | 69 -------------------
 1 file changed, 69 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index a11e4b07083..3da31d46cd2 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -88,73 +88,4 @@ public function testNoReplacements()
 
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
-
-    // Fault tolerance tests
-
-    public function testMalformedRouteLink()
-    {
-        $input = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home">Malformed Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMalformedRouteLink2()
-    {
-        $input = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home)">Malformed Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMalformedRouteLink3()
-    {
-        $input = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
-        $expected = '<p><a href="hyde::route(\'home\'">Malformed Home</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMalformedAssetLink()
-    {
-        $input = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
-        $expected = '<p><img src="hyde::asset(\'image.jpg" alt="Malformed Image" /></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testEmptyRouteLink()
-    {
-        $input = '<p><a href="hyde::route()">Empty Route</a></p>';
-        $expected = '<p><a href="hyde::route()">Empty Route</a></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testEmptyAssetLink()
-    {
-        $input = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
-        $expected = '<p><img src="hyde::asset()" alt="Empty Asset" /></p>';
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
-
-    public function testMixedValidAndInvalidLinks()
-    {
-        $input = <<<'HTML'
-        <a href="hyde::route('home')">Valid Home</a>
-        <a href="hyde::route(invalid'">Invalid Route</a>
-        <img src="hyde::asset('logo.png')" alt="Valid Logo" />
-        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
-        HTML;
-
-        $expected = <<<'HTML'
-        <a href="home.html">Valid Home</a>
-        <a href="hyde::route(invalid'">Invalid Route</a>
-        <img src="media/logo.png" alt="Valid Logo" />
-        <img src="hyde::asset('image.jpg" alt="Invalid Asset" />
-        HTML;
-
-        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
-    }
 }

From c3a46c957d803433c18356cf7419a06049bc134b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:05:05 +0200
Subject: [PATCH 2770/2811] Add new fault tolerance tests

---
 .../DynamicMarkdownLinkProcessorTest.php      | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 3da31d46cd2..cf90f6ccd1d 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -88,4 +88,41 @@ public function testNoReplacements()
 
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
+
+    // Fault tolerance tests
+
+    public function testNonExistentRouteIsNotReplaced()
+    {
+        $input = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
+        $expected = '<p><a href="_pages/non-existent.blade.php">Non-existent Route</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testNonExistentAssetIsNotReplaced()
+    {
+        $input = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
+        $expected = '<p><img src="_media/non-existent.png" alt="Non-existent Asset" /></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
+    public function testMixedValidAndInvalidLinks()
+    {
+        $input = <<<'HTML'
+        <a href="_pages/index.blade.php">Valid Home</a>
+        <a href="_pages/invalid.blade.php">Invalid Route</a>
+        <img src="_media/logo.png" alt="Valid Logo" />
+        <img src="_media/invalid.jpg" alt="Invalid Asset" />
+        HTML;
+
+        $expected = <<<'HTML'
+        <a href="index.html">Valid Home</a>
+        <a href="_pages/invalid.blade.php">Invalid Route</a>
+        <img src="media/logo.png" alt="Valid Logo" />
+        <img src="_media/invalid.jpg" alt="Invalid Asset" />
+        HTML;
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
 }

From b79d983f5a112c01892d739e744ba25685a76db5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:06:06 +0200
Subject: [PATCH 2771/2811] Update test for the new dynamic Markdown link
 feature

---
 .../DynamicMarkdownLinkProcessorTest.php      | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index cf90f6ccd1d..6e5969a2e05 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -37,32 +37,32 @@ protected function setUp(): void
 
     public function testRouteReplacement()
     {
-        $input = '<p><a href="hyde::route(\'home\')">Home</a></p>';
-        $expected = '<p><a href="home.html">Home</a></p>';
+        $input = '<p><a href="_pages/index.blade.php">Home</a></p>';
+        $expected = '<p><a href="index.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testRouteReplacementWithoutQuotes()
+    public function testRouteReplacementWithLeadingSlash()
     {
-        $input = '<p><a href="hyde::route(home)">Home</a></p>';
-        $expected = '<p><a href="home.html">Home</a></p>';
+        $input = '<p><a href="/_pages/index.blade.php">Home</a></p>';
+        $expected = '<p><a href="index.html">Home</a></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacement()
     {
-        $input = '<p><img src="hyde::asset(\'image.jpg\')" alt="Image" /></p>';
-        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
+        $input = '<p><img src="_media/logo.png" alt="Logo" /></p>';
+        $expected = '<p><img src="media/logo.png" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
-    public function testAssetReplacementWithoutQuotes()
+    public function testAssetReplacementWithLeadingSlash()
     {
-        $input = '<p><img src="hyde::asset(image.jpg)" alt="Image" /></p>';
-        $expected = '<p><img src="media/image.jpg" alt="Image" /></p>';
+        $input = '<p><img src="/_media/logo.png" alt="Logo" /></p>';
+        $expected = '<p><img src="media/logo.png" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -70,12 +70,12 @@ public function testAssetReplacementWithoutQuotes()
     public function testMultipleReplacements()
     {
         $input = <<<'HTML'
-        <a href="hyde::route('home')">Home</a>
-        <img src="hyde::asset('logo.png')" alt="Logo" />
+        <a href="_pages/index.blade.php">Home</a>
+        <img src="_media/logo.png" alt="Logo" />
         HTML;
 
         $expected = <<<'HTML'
-        <a href="home.html">Home</a>
+        <a href="index.html">Home</a>
         <img src="media/logo.png" alt="Logo" />
         HTML;
 
@@ -89,6 +89,14 @@ public function testNoReplacements()
         $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
+    public function testNestedRouteReplacement()
+    {
+        $input = '<p><a href="_posts/post.md">Blog Post</a></p>';
+        $expected = '<p><a href="posts/post.html">Blog Post</a></p>';
+
+        $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+    }
+
     // Fault tolerance tests
 
     public function testNonExistentRouteIsNotReplaced()

From c6445010ee6ada62cd13c584c94736d08f8912ff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:06:26 +0200
Subject: [PATCH 2772/2811] Use existing file pending mock support

---
 .../DynamicMarkdownLinkProcessorTest.php       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 6e5969a2e05..002ba287a8a 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -33,6 +33,8 @@ protected function setUp(): void
 
         Routes::addRoute(new Route(new BladePage('index')));
         Routes::addRoute(new Route(new MarkdownPost('post')));
+
+        // Todo: No way to mock media files, so we are using app.css as a test asset for now.
     }
 
     public function testRouteReplacement()
@@ -53,16 +55,16 @@ public function testRouteReplacementWithLeadingSlash()
 
     public function testAssetReplacement()
     {
-        $input = '<p><img src="_media/logo.png" alt="Logo" /></p>';
-        $expected = '<p><img src="media/logo.png" alt="Logo" /></p>';
+        $input = '<p><img src="_media/app.css" alt="Logo" /></p>';
+        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
 
     public function testAssetReplacementWithLeadingSlash()
     {
-        $input = '<p><img src="/_media/logo.png" alt="Logo" /></p>';
-        $expected = '<p><img src="media/logo.png" alt="Logo" /></p>';
+        $input = '<p><img src="/_media/app.css" alt="Logo" /></p>';
+        $expected = '<p><img src="media/app.css" alt="Logo" /></p>';
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
@@ -71,12 +73,12 @@ public function testMultipleReplacements()
     {
         $input = <<<'HTML'
         <a href="_pages/index.blade.php">Home</a>
-        <img src="_media/logo.png" alt="Logo" />
+        <img src="_media/app.css" alt="Logo" />
         HTML;
 
         $expected = <<<'HTML'
         <a href="index.html">Home</a>
-        <img src="media/logo.png" alt="Logo" />
+        <img src="media/app.css" alt="Logo" />
         HTML;
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
@@ -120,14 +122,14 @@ public function testMixedValidAndInvalidLinks()
         $input = <<<'HTML'
         <a href="_pages/index.blade.php">Valid Home</a>
         <a href="_pages/invalid.blade.php">Invalid Route</a>
-        <img src="_media/logo.png" alt="Valid Logo" />
+        <img src="_media/app.css" alt="Valid Logo" />
         <img src="_media/invalid.jpg" alt="Invalid Asset" />
         HTML;
 
         $expected = <<<'HTML'
         <a href="index.html">Valid Home</a>
         <a href="_pages/invalid.blade.php">Invalid Route</a>
-        <img src="media/logo.png" alt="Valid Logo" />
+        <img src="media/app.css" alt="Valid Logo" />
         <img src="_media/invalid.jpg" alt="Invalid Asset" />
         HTML;
 

From 6e50913ecefa775945a039d2024d7e41f0a5e076 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:08:11 +0200
Subject: [PATCH 2773/2811] Replace feature test setup with lower level
 filesystem configuration

---
 .../tests/Feature/DynamicMarkdownLinksFeatureTest.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index a4d57aa76a5..f2cd450f7bd 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -20,12 +20,12 @@
  */
 class DynamicMarkdownLinksFeatureTest extends TestCase
 {
-    protected function setUp(): void
+    public static function setUpBeforeClass(): void
     {
-        parent::setUp();
+        parent::setUpBeforeClass();
 
-        Routes::addRoute(new Route(new InMemoryPage('home')));
-        Routes::addRoute(new Route(new InMemoryPage('blog/post')));
+        touch('_media/logo.png');
+        touch('_media/image.jpg');
     }
 
     public function testBasicDynamicMarkdownLinks()

From 6d6d75388e0a617434247b780f167487ba280d36 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:08:58 +0200
Subject: [PATCH 2774/2811] Tear down filesystem after class

---
 .../tests/Feature/DynamicMarkdownLinksFeatureTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index f2cd450f7bd..acebe47a10c 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -28,6 +28,14 @@ public static function setUpBeforeClass(): void
         touch('_media/image.jpg');
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        unlink('_media/logo.png');
+        unlink('_media/image.jpg');
+
+        parent::tearDownAfterClass();
+    }
+
     public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'

From 48558faec24b40118ff28877a7f23abf939b0cb8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:09:37 +0200
Subject: [PATCH 2775/2811] Update test for the new dynamic Markdown link
 feature

---
 .../DynamicMarkdownLinksFeatureTest.php       | 72 +++++++++----------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index acebe47a10c..b720b006b4a 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -8,7 +8,8 @@
 
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
-use Hyde\Pages\InMemoryPage;
+use Hyde\Support\Includes;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
 
@@ -39,35 +40,12 @@ public static function tearDownAfterClass(): void
     public function testBasicDynamicMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
-        [Home](hyde::route('home'))
-        ![Logo](hyde::asset('logo.png'))
-        
-        [Home](hyde::route(home))
-        ![Logo](hyde::asset(logo.png))
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
-        <img src="media/logo.png" alt="Logo" /></p>
-        <p><a href="home.html">Home</a>
-        <img src="media/logo.png" alt="Logo" /></p>
-
-        HTML;
-
-        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
-    }
-
-    public function testDynamicMarkdownLinksWithDoubleQuotes()
-    {
-        $this->markTestSkipped('https://github.com/hydephp/develop/pull/1590#discussion_r1690082732');
-
-        $input = <<<'MARKDOWN'
-        [Home](hyde::route("home"))
-        ![Logo](hyde::asset("logo.png"))
-        MARKDOWN;
-
-        $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
+        <p><a href="index.html">Home</a>
         <img src="media/logo.png" alt="Logo" /></p>
 
         HTML;
@@ -78,13 +56,13 @@ public function testDynamicMarkdownLinksWithDoubleQuotes()
     public function testDynamicMarkdownLinksInParagraphs()
     {
         $input = <<<'MARKDOWN'
-        This is a paragraph with a [link to home](hyde::route('home')).
+        This is a paragraph with a [link to home](/_pages/index.blade.php).
 
-        Another paragraph with an ![image](hyde::asset('image.jpg')).
+        Another paragraph with an ![image](/_media/image.jpg).
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p>This is a paragraph with a <a href="home.html">link to home</a>.</p>
+        <p>This is a paragraph with a <a href="index.html">link to home</a>.</p>
         <p>Another paragraph with an <img src="media/image.jpg" alt="image" />.</p>
 
         HTML;
@@ -95,14 +73,14 @@ public function testDynamicMarkdownLinksInParagraphs()
     public function testDynamicMarkdownLinksInLists()
     {
         $input = <<<'MARKDOWN'
-        - [Home](hyde::route('home'))
-        - ![Logo](hyde::asset('logo.png'))
+        - [Home](/_pages/index.blade.php)
+        - ![Logo](/_media/logo.png)
         MARKDOWN;
 
         $expected = <<<'HTML'
         <ul>
         <li>
-        <a href="home.html">Home</a>
+        <a href="index.html">Home</a>
         </li>
         <li>
         <img src="media/logo.png" alt="Logo" />
@@ -116,12 +94,14 @@ public function testDynamicMarkdownLinksInLists()
 
     public function testDynamicMarkdownLinksWithNestedRoutes()
     {
+        Routes::addRoute(new Route(new MarkdownPage('about/contact')));
+
         $input = <<<'MARKDOWN'
-        [Blog Post](hyde::route('blog/post'))
+        [Contact](/_pages/about/contact.md)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="blog/post.html">Blog Post</a></p>
+        <p><a href="about/contact.html">Contact</a></p>
 
         HTML;
 
@@ -131,15 +111,15 @@ public function testDynamicMarkdownLinksWithNestedRoutes()
     public function testMixOfDynamicAndRegularMarkdownLinks()
     {
         $input = <<<'MARKDOWN'
-        [Home](hyde::route('home'))
+        [Home](/_pages/index.blade.php)
         [External](https://example.com)
         [Regular](regular-link.html)
-        ![Logo](hyde::asset('logo.png'))
+        ![Logo](/_media/logo.png)
         ![External Image](https://example.com/image.jpg)
         MARKDOWN;
 
         $expected = <<<'HTML'
-        <p><a href="home.html">Home</a>
+        <p><a href="index.html">Home</a>
         <a href="https://example.com">External</a>
         <a href="regular-link.html">Regular</a>
         <img src="media/logo.png" alt="Logo" />
@@ -149,4 +129,20 @@ public function testMixOfDynamicAndRegularMarkdownLinks()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testLinksWithLeadingSlash()
+    {
+        $input = <<<'MARKDOWN'
+        [Home with slash](/_pages/index.blade.php)
+        ![Logo with slash](/_media/logo.png)
+        MARKDOWN;
+
+        $expected = <<<'HTML'
+        <p><a href="index.html">Home with slash</a>
+        <img src="media/logo.png" alt="Logo with slash" /></p>
+
+        HTML;
+
+        $this->assertSame($expected, Hyde::markdown($input)->toHtml());
+    }
 }

From 60786a556133fc1b26e131b7e34deb23a5149e58 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:10:00 +0200
Subject: [PATCH 2776/2811] Add more high level feature test cases

---
 .../DynamicMarkdownLinksFeatureTest.php       | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index b720b006b4a..dd0c4f408c5 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -145,4 +145,108 @@ public function testLinksWithLeadingSlash()
 
         $this->assertSame($expected, Hyde::markdown($input)->toHtml());
     }
+
+    public function testCanRenderPageWithDynamicMarkdownLinks()
+    {
+        $this->file('_pages/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $page = MarkdownPage::get('test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="index.html">Home</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderNestedPageWithDynamicMarkdownLinks()
+    {
+        $this->file('_pages/nested/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $page = MarkdownPage::get('nested/test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="../index.html">Home</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderIncludeWithDynamicMarkdownLinks()
+    {
+        // if there is no current path data, we assume the file is included from the root
+
+        $this->file('resources/includes/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $html = Includes::markdown('test')->toHtml();
+
+        $expected = [
+            '<a href="index.html">Home</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testCanRenderIncludeFromNestedPageWithDynamicMarkdownLinks()
+    {
+        $this->mockCurrentPage('nested/test');
+
+        $this->file('resources/includes/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        ![Logo](/_media/logo.png)
+
+        [non-existent](/_pages/non-existent.md)
+        ![non-existent](/_media/non-existent.png)
+        MARKDOWN);
+
+        $html = Includes::markdown('test')->toHtml();
+
+        $expected = [
+            '<a href="../index.html">Home</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+            '<a href="/_pages/non-existent.md">non-existent</a>',
+            '<img src="/_media/non-existent.png" alt="non-existent" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
 }

From 75fc296b167e9f1f3ea83675eb76ace0b737e499 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:10:18 +0200
Subject: [PATCH 2777/2811] Update unit test to mock the kernel routes

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 1da30c9d435..6dac17db2f5 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,9 +9,12 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
+use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
+use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
+use Hyde\Testing\MocksKernelFeatures;
 
 /**
  * @covers \Hyde\Support\Includes
@@ -20,6 +23,8 @@
  */
 class IncludesFacadeUnitTest extends UnitTestCase
 {
+    use MocksKernelFeatures;
+
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
 
@@ -28,6 +33,10 @@ protected function setUp(): void
         parent::setUp();
 
         Blade::swap(Mockery::mock());
+
+        $this->setupTestKernel();
+        $this->kernel->setRoutes(collect());
+        Render::swap(new RenderData());
     }
 
     protected function tearDown(): void

From f0e006475de0fcf40a601e0279622e50917f5b97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 11:26:24 +0200
Subject: [PATCH 2778/2811] Add static variable to cache the asset map in
 memory

This change makes it go from a constant ~2ms per call to essentially zero (0.000ms avg on 100 000 iterations)
---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 247a41d3c14..db0e4fc411a 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -50,13 +50,15 @@ protected static function routeMap(): array
     }
 
     /**
-     * @todo Consider adding caching, since this is not a singleton like the routes.
-     *
      * @return array<string, \Hyde\Support\Filesystem\MediaFile>
      */
     protected static function assetMap(): array
     {
-        $assetMap = [];
+        static $assetMap = null;
+
+        if ($assetMap !== null) {
+            return $assetMap;
+        }
 
         foreach (MediaFile::all() as $mediaFile) {
             $assetMap[$mediaFile->getPath()] = $mediaFile;

From 25a7328633e76e218abfc84e1b8a1b2001bf4fbe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:05:10 +0200
Subject: [PATCH 2779/2811] Refactor static variable to a static property

---
 .../DynamicMarkdownLinkProcessor.php          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index db0e4fc411a..a69b2561d48 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -11,6 +11,11 @@
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
+    /**
+     * @var array<string, \Hyde\Support\Filesystem\MediaFile>|null
+     */
+    protected static ?array $assetMapCache = null;
+
     public static function postprocess(string $html): string
     {
         foreach (static::routeMap() as $sourcePath => $route) {
@@ -54,17 +59,15 @@ protected static function routeMap(): array
      */
     protected static function assetMap(): array
     {
-        static $assetMap = null;
-
-        if ($assetMap !== null) {
-            return $assetMap;
-        }
+        if (static::$assetMapCache === null) {
+            static::$assetMapCache = [];
 
-        foreach (MediaFile::all() as $mediaFile) {
-            $assetMap[$mediaFile->getPath()] = $mediaFile;
+            foreach (MediaFile::all() as $mediaFile) {
+                static::$assetMapCache[$mediaFile->getPath()] = $mediaFile;
+            }
         }
 
-        return $assetMap;
+        return static::$assetMapCache;
     }
 
     protected static function assetPath(MediaFile $mediaFile): string

From ae464632e21f8e1ea80dda750d54a4c9b1a5c908 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:05:47 +0200
Subject: [PATCH 2780/2811] Add internal testing helper to reset the asset map
 cache

---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index a69b2561d48..b1e2ed237a7 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -74,4 +74,12 @@ protected static function assetPath(MediaFile $mediaFile): string
     {
         return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
     }
+
+    /**
+     * @internal Testing helper to reset the asset map cache.
+     */
+    public static function resetAssetMapCache(): void
+    {
+        static::$assetMapCache = null;
+    }
 }

From 8755f49db95e38f85f9a7210a729e08f10874573 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:06:18 +0200
Subject: [PATCH 2781/2811] Reset the asset map cache

---
 .../tests/Feature/DynamicMarkdownLinksFeatureTest.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index dd0c4f408c5..cdf9a416eca 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -12,6 +12,7 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Hyde\Foundation\Facades\Routes;
+use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
  * @covers \Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor
@@ -27,6 +28,8 @@ public static function setUpBeforeClass(): void
 
         touch('_media/logo.png');
         touch('_media/image.jpg');
+
+        DynamicMarkdownLinkProcessor::resetAssetMapCache();
     }
 
     public static function tearDownAfterClass(): void

From 1b7bfcb2840efdf2909c6c55ea21999ac46f4604 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:16:45 +0200
Subject: [PATCH 2782/2811] Ignore coverage

---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index b1e2ed237a7..a7f3971617c 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -77,6 +77,8 @@ protected static function assetPath(MediaFile $mediaFile): string
 
     /**
      * @internal Testing helper to reset the asset map cache.
+     *
+     * @codeCoverageIgnore Only used in tests, where it's implicitly covered.
      */
     public static function resetAssetMapCache(): void
     {

From 7e7927b094e10d2fe4e77de21eb6b79f466d49d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:19:54 +0200
Subject: [PATCH 2783/2811] Revert "Ignore coverage"

This reverts commit 1b7bfcb2840efdf2909c6c55ea21999ac46f4604.
---
 .../src/Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index a7f3971617c..b1e2ed237a7 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -77,8 +77,6 @@ protected static function assetPath(MediaFile $mediaFile): string
 
     /**
      * @internal Testing helper to reset the asset map cache.
-     *
-     * @codeCoverageIgnore Only used in tests, where it's implicitly covered.
      */
     public static function resetAssetMapCache(): void
     {

From 76672b26571309cd6ea6c7aa34af74626375450e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:20:40 +0200
Subject: [PATCH 2784/2811] Test the method

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 002ba287a8a..67acd7ffe39 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -135,4 +135,11 @@ public function testMixedValidAndInvalidLinks()
 
         $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
     }
+
+    public function testResetAssetMapCache()
+    {
+        DynamicMarkdownLinkProcessor::resetAssetMapCache();
+
+        $this->assertTrue(true);
+    }
 }

From 7ed5a854debdd3725605bec460a43ad7728f3bf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:22:07 +0200
Subject: [PATCH 2785/2811] Compress PHPDoc annotations

---
 .../Processing/DynamicMarkdownLinkProcessor.php  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index b1e2ed237a7..39a083cb7c6 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -11,9 +11,7 @@
 
 class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 {
-    /**
-     * @var array<string, \Hyde\Support\Filesystem\MediaFile>|null
-     */
+    /** @var array<string, \Hyde\Support\Filesystem\MediaFile>|null */
     protected static ?array $assetMapCache = null;
 
     public static function postprocess(string $html): string
@@ -39,9 +37,7 @@ public static function postprocess(string $html): string
         return $html;
     }
 
-    /**
-     * @return array<string, \Hyde\Support\Models\Route>
-     */
+    /** @return array<string, \Hyde\Support\Models\Route> */
     protected static function routeMap(): array
     {
         $map = [];
@@ -54,9 +50,7 @@ protected static function routeMap(): array
         return $map;
     }
 
-    /**
-     * @return array<string, \Hyde\Support\Filesystem\MediaFile>
-     */
+    /** @return array<string, \Hyde\Support\Filesystem\MediaFile> */
     protected static function assetMap(): array
     {
         if (static::$assetMapCache === null) {
@@ -75,9 +69,7 @@ protected static function assetPath(MediaFile $mediaFile): string
         return Hyde::asset(Str::after($mediaFile->getPath(), '_media/'));
     }
 
-    /**
-     * @internal Testing helper to reset the asset map cache.
-     */
+    /** @internal Testing helper to reset the asset map cache. */
     public static function resetAssetMapCache(): void
     {
         static::$assetMapCache = null;

From 376d3eccbae2b418c3c9d5f6fbd2dc6f664e27e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:25:18 +0200
Subject: [PATCH 2786/2811] Normalize the signatures to be looser and match
 images

---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 39a083cb7c6..f31f1db76fb 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -18,11 +18,11 @@ public static function postprocess(string $html): string
     {
         foreach (static::routeMap() as $sourcePath => $route) {
             $patterns = [
-                sprintf('<a href="%s">', $sourcePath),
-                sprintf('<a href="/%s">', $sourcePath),
+                sprintf('<a href="%s"', $sourcePath),
+                sprintf('<a href="/%s"', $sourcePath),
             ];
 
-            $html = str_replace($patterns, sprintf('<a href="%s">', $route->getLink()), $html);
+            $html = str_replace($patterns, sprintf('<a href="%s"', $route->getLink()), $html);
         }
 
         foreach (static::assetMap() as $path => $mediaFile) {

From 831c83c6aa9a36d0d63f4f948dc0deb3f23bc958 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:25:57 +0200
Subject: [PATCH 2787/2811] Normalize the loop variable name

---
 .../Markdown/Processing/DynamicMarkdownLinkProcessor.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index f31f1db76fb..7dc220855e0 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -25,10 +25,10 @@ public static function postprocess(string $html): string
             $html = str_replace($patterns, sprintf('<a href="%s"', $route->getLink()), $html);
         }
 
-        foreach (static::assetMap() as $path => $mediaFile) {
+        foreach (static::assetMap() as $sourcePath => $mediaFile) {
             $patterns = [
-                sprintf('<img src="%s"', $path),
-                sprintf('<img src="/%s"', $path),
+                sprintf('<img src="%s"', $sourcePath),
+                sprintf('<img src="/%s"', $sourcePath),
             ];
 
             $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);

From 851b17a5e0dec626ae56c3a7ed20bc6e2d482a50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:31:39 +0200
Subject: [PATCH 2788/2811] Refactor to extract methods for common logic

---
 .../DynamicMarkdownLinkProcessor.php          | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index 7dc220855e0..fc9e6b45330 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -6,6 +6,7 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -16,27 +17,35 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 
     public static function postprocess(string $html): string
     {
-        foreach (static::routeMap() as $sourcePath => $route) {
-            $patterns = [
-                sprintf('<a href="%s"', $sourcePath),
-                sprintf('<a href="/%s"', $sourcePath),
-            ];
+        $html = static::processMap(static::routeMap(), $html, 'a', 'href');
+        $html = static::processMap(static::assetMap(), $html, 'img', 'src');
 
-            $html = str_replace($patterns, sprintf('<a href="%s"', $route->getLink()), $html);
-        }
+        return $html;
+    }
 
-        foreach (static::assetMap() as $sourcePath => $mediaFile) {
+    /**
+     * @param array<string, \Hyde\Support\Models\Route|\Hyde\Support\Filesystem\MediaFile> $map
+     */
+    protected static function processMap(array $map, string $html, string $tag, string $attribute): string
+    {
+        foreach ($map as $sourcePath => $item) {
             $patterns = [
-                sprintf('<img src="%s"', $sourcePath),
-                sprintf('<img src="/%s"', $sourcePath),
+                sprintf('<%s %s="%s"', $tag, $attribute, $sourcePath),
+                sprintf('<%s %s="/%s"', $tag, $attribute, $sourcePath),
             ];
 
-            $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);
+            $replacement = sprintf('<%s %s="%s"', $tag, $attribute, static::getItemPath($item));
+            $html = str_replace($patterns, $replacement, $html);
         }
 
         return $html;
     }
 
+    protected static function getItemPath(MediaFile|Route $item): string
+    {
+        return $item instanceof MediaFile ? static::assetPath($item) : $item->getLink();
+    }
+
     /** @return array<string, \Hyde\Support\Models\Route> */
     protected static function routeMap(): array
     {

From ede0cdf2b0c7259044f38e2593cf54b464fd874b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:31:42 +0200
Subject: [PATCH 2789/2811] Revert "Refactor to extract methods for common
 logic"

This reverts commit 851b17a5e0dec626ae56c3a7ed20bc6e2d482a50. Cleaner is not always better.
---
 .../DynamicMarkdownLinkProcessor.php          | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
index fc9e6b45330..7dc220855e0 100644
--- a/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
+++ b/packages/framework/src/Markdown/Processing/DynamicMarkdownLinkProcessor.php
@@ -6,7 +6,6 @@
 
 use Hyde\Hyde;
 use Illuminate\Support\Str;
-use Hyde\Support\Models\Route;
 use Hyde\Support\Filesystem\MediaFile;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 
@@ -17,35 +16,27 @@ class DynamicMarkdownLinkProcessor implements MarkdownPostProcessorContract
 
     public static function postprocess(string $html): string
     {
-        $html = static::processMap(static::routeMap(), $html, 'a', 'href');
-        $html = static::processMap(static::assetMap(), $html, 'img', 'src');
+        foreach (static::routeMap() as $sourcePath => $route) {
+            $patterns = [
+                sprintf('<a href="%s"', $sourcePath),
+                sprintf('<a href="/%s"', $sourcePath),
+            ];
 
-        return $html;
-    }
+            $html = str_replace($patterns, sprintf('<a href="%s"', $route->getLink()), $html);
+        }
 
-    /**
-     * @param array<string, \Hyde\Support\Models\Route|\Hyde\Support\Filesystem\MediaFile> $map
-     */
-    protected static function processMap(array $map, string $html, string $tag, string $attribute): string
-    {
-        foreach ($map as $sourcePath => $item) {
+        foreach (static::assetMap() as $sourcePath => $mediaFile) {
             $patterns = [
-                sprintf('<%s %s="%s"', $tag, $attribute, $sourcePath),
-                sprintf('<%s %s="/%s"', $tag, $attribute, $sourcePath),
+                sprintf('<img src="%s"', $sourcePath),
+                sprintf('<img src="/%s"', $sourcePath),
             ];
 
-            $replacement = sprintf('<%s %s="%s"', $tag, $attribute, static::getItemPath($item));
-            $html = str_replace($patterns, $replacement, $html);
+            $html = str_replace($patterns, sprintf('<img src="%s"', static::assetPath($mediaFile)), $html);
         }
 
         return $html;
     }
 
-    protected static function getItemPath(MediaFile|Route $item): string
-    {
-        return $item instanceof MediaFile ? static::assetPath($item) : $item->getLink();
-    }
-
     /** @return array<string, \Hyde\Support\Models\Route> */
     protected static function routeMap(): array
     {

From 4a46a584cc93be51cf7df6b4484819526886f798 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 16:33:24 +0200
Subject: [PATCH 2790/2811] Document that relative links is not supported here

Would take a ton of complexity
---
 docs/digging-deeper/advanced-markdown.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index e0ce47a5a37..791213a6a39 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -205,6 +205,7 @@ There are some limitations and considerations to keep in mind when using this fe
 - This feature won't work for dynamic routes (not backed by a file)
 - If you rename a file, links will break. Your IDE may warn about this.
 - If a file is not found, we won't be able to see it when evaluating links.
+- Relative links are not supported (so ../_pages/index.blade.php won't work)
 
 ## Configuration
 

From 5cbde9cc429c54b9e95fce3928f9258fc1edfa81 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 18:10:55 +0200
Subject: [PATCH 2791/2811] Add more feature tests

---
 .../DynamicMarkdownLinksFeatureTest.php       | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)

diff --git a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
index cdf9a416eca..60208243185 100644
--- a/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
+++ b/packages/framework/tests/Feature/DynamicMarkdownLinksFeatureTest.php
@@ -10,7 +10,9 @@
 use Hyde\Testing\TestCase;
 use Hyde\Support\Includes;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Support\Models\Route;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
@@ -252,4 +254,147 @@ public function testCanRenderIncludeFromNestedPageWithDynamicMarkdownLinks()
             $this->assertStringContainsString($expectation, $html);
         }
     }
+
+    public function testDynamicMarkdownLinksForDifferentPageTypes()
+    {
+        $this->file('_pages/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        [Documentation](/_docs/index.md)
+        [Readme](/_docs/readme.md)
+        [Example](/_pages/example.md)
+        [Contact](/_pages/about/contact.md)
+        [About](/_pages/about/index.md)
+        [Post](/_posts/hello-world.md)
+        
+        ![Logo](/_media/logo.png)
+        MARKDOWN);
+
+        Routes::addRoute(new Route(new MarkdownPage('example')));
+        Routes::addRoute(new Route(new MarkdownPage('about/index')));
+        Routes::addRoute(new Route(new MarkdownPage('about/contact')));
+        Routes::addRoute(new Route(new MarkdownPost('hello-world')));
+        Routes::addRoute(new Route(new DocumentationPage('index')));
+        Routes::addRoute(new Route(new DocumentationPage('readme')));
+
+        $page = MarkdownPage::get('test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="index.html">Home</a>',
+            '<a href="docs/index.html">Documentation</a>',
+            '<a href="docs/readme.html">Readme</a>',
+            '<a href="example.html">Example</a>',
+            '<a href="about/contact.html">Contact</a>',
+            '<a href="about/index.html">About</a>',
+            '<a href="posts/hello-world.html">Post</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testDynamicMarkdownLinksUseTheSitePrettyUrlConfiguration()
+    {
+        config(['hyde.pretty_urls' => true]);
+
+        $this->file('_pages/test.md', <<<'MARKDOWN'
+        [Home](/_pages/index.blade.php)
+        [Documentation](/_docs/index.md)
+        [Readme](/_docs/readme.md)
+        [Example](/_pages/example.md)
+        [Contact](/_pages/about/contact.md)
+        [About](/_pages/about/index.md)
+        [Post](/_posts/hello-world.md)
+        
+        ![Logo](/_media/logo.png)
+        MARKDOWN);
+
+        Routes::addRoute(new Route(new MarkdownPage('example')));
+        Routes::addRoute(new Route(new MarkdownPage('about/index')));
+        Routes::addRoute(new Route(new MarkdownPage('about/contact')));
+        Routes::addRoute(new Route(new MarkdownPost('hello-world')));
+        Routes::addRoute(new Route(new DocumentationPage('index')));
+        Routes::addRoute(new Route(new DocumentationPage('readme')));
+
+        $page = MarkdownPage::get('test');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="./">Home</a>',
+            '<a href="docs/">Documentation</a>',
+            '<a href="docs/readme">Readme</a>',
+            '<a href="example">Example</a>',
+            '<a href="about/contact">Contact</a>',
+            '<a href="about/">About</a>',
+            '<a href="posts/hello-world">Post</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
+
+    public function testDynamicMarkdownLinksFromDifferentPageTypes()
+    {
+        $links = <<<'MARKDOWN'
+        [Docs](/_docs/docs.md)
+        [Post](/_posts/post.md)
+        [Page](/_pages/page.md)
+        ![Logo](/_media/logo.png)
+        MARKDOWN;
+
+        $this->file('_docs/docs.md', $links);
+        $this->file('_posts/post.md', $links);
+        $this->file('_pages/page.md', $links);
+
+        $page = DocumentationPage::get('docs');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="../docs/docs.html">Docs</a>',
+            '<a href="../posts/post.html">Post</a>',
+            '<a href="../page.html">Page</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+
+        $page = MarkdownPost::get('post');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="../docs/docs.html">Docs</a>',
+            '<a href="../posts/post.html">Post</a>',
+            '<a href="../page.html">Page</a>',
+            '<img src="../media/logo.png" alt="Logo" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+
+        $page = MarkdownPage::get('page');
+        Hyde::shareViewData($page);
+        $html = $page->compile();
+
+        $expected = [
+            '<a href="docs/docs.html">Docs</a>',
+            '<a href="posts/post.html">Post</a>',
+            '<a href="page.html">Page</a>',
+            '<img src="media/logo.png" alt="Logo" />',
+        ];
+
+        foreach ($expected as $expectation) {
+            $this->assertStringContainsString($expectation, $html);
+        }
+    }
 }

From a2bd4468a04a4ee45e53c6db39428ac7487b9653 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 18:11:44 +0200
Subject: [PATCH 2792/2811] Clean up the documentation

---
 docs/digging-deeper/advanced-markdown.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index 791213a6a39..b2852df3828 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -163,18 +163,18 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 ## Dynamic Markdown Links
 
-## Overview
-
 HydePHP provides a powerful feature for automatically converting Markdown links to source files to the corresponding routes in the built site.
 
-This allows for much better writing experience when using an IDE, as you can easily navigate to the source file by clicking on the link.
+This allows for much better writing experience when using an IDE, as you can easily navigate to the source file by clicking on the link. Hyde will then automatically resolve the link to the correct route when building the site, formatting the links properly using dynamic relative paths and your configured `pretty_urls` setting.
 
 ## Usage
 
-Using the feature is simple: Just use source file paths for links:
+Using the feature is simple: Just use the source file path when linking to the page you want to resolve:
 
 ```markdown
 [Home](/_pages/index.blade.php)
+[Docs](/_docs/index.md)
+[Featured Post](/_posts/hello-world.md)
 ![Logo](/_media/logo.svg)
 ```
 

From a307b8899169eb3e553db3bd369c4c9ba97a4e51 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 18:11:58 +0200
Subject: [PATCH 2793/2811] Proof the documentation

---
 docs/digging-deeper/advanced-markdown.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/digging-deeper/advanced-markdown.md b/docs/digging-deeper/advanced-markdown.md
index b2852df3828..2fe8bd3648d 100644
--- a/docs/digging-deeper/advanced-markdown.md
+++ b/docs/digging-deeper/advanced-markdown.md
@@ -165,7 +165,7 @@ The filepaths are hidden on mobile devices using CSS to prevent them from overla
 
 HydePHP provides a powerful feature for automatically converting Markdown links to source files to the corresponding routes in the built site.
 
-This allows for much better writing experience when using an IDE, as you can easily navigate to the source file by clicking on the link. Hyde will then automatically resolve the link to the correct route when building the site, formatting the links properly using dynamic relative paths and your configured `pretty_urls` setting.
+This allows for a much better writing experience when using an IDE, as you can easily navigate to the source file by clicking on the link. Hyde will then automatically resolve the link to the correct route when building the site, formatting the links properly using dynamic relative paths and your configured `pretty_urls` setting.
 
 ## Usage
 
@@ -182,7 +182,7 @@ As you can see, it works for both pages and media assets. The leading slash is o
 
 ### Behind the Scenes
 
-During the build process, HydePHP converts source paths to their corresponding routes, and evaluates them depending on the page being rendered.
+During the build process, HydePHP converts source paths to their corresponding routes and evaluates them depending on the page being rendered.
 
 If your page is in the site root then:
 
@@ -196,16 +196,16 @@ If your page is in a subdirectory then:
 
 Of course, if your page is in a more deeply nested directory, the number of `../` will increase accordingly.
 
-We will of course also match your configured preference for `pretty_urls` and only include the `.html` extension when desired.
+We will also match your configured preference for `pretty_urls` and only include the `.html` extension when desired.
 
 ### Limitations
 
 There are some limitations and considerations to keep in mind when using this feature:
 
-- This feature won't work for dynamic routes (not backed by a file)
+- This feature will not work for dynamic routes (not backed by a file)
 - If you rename a file, links will break. Your IDE may warn about this.
-- If a file is not found, we won't be able to see it when evaluating links.
-- Relative links are not supported (so ../_pages/index.blade.php won't work)
+- If a file is not found, we will not be able to see it when evaluating links.
+- Relative links are not supported (so `../_pages/index.blade.php` will not work)
 
 ## Configuration
 

From 2ae3ef998f8710a819e1722cd7ebc338c5f86ff0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 25 Jul 2024 18:12:02 +0200
Subject: [PATCH 2794/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 3871aafcb54..86740ca0d9c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,6 +11,7 @@ This serves two purposes:
 
 ### Added
 - You can now specify navigation priorities by adding a numeric prefix to the source file names in https://github.com/hydephp/develop/pull/1709
+- Added support for resolving dynamic links to source files in Markdown documents in https://github.com/hydephp/develop/pull/1590
 - Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
 - Added a new `\Hyde\Framework\Exceptions\ParseException` exception class to handle parsing exceptions in data collection files in https://github.com/hydephp/develop/pull/1732
 - Added a new `\Hyde\Framework\Exceptions\InvalidConfigurationException` exception class to handle invalid configuration exceptions in https://github.com/hydephp/develop/pull/1799

From 51b604ad55e819515a4912730160946fb4998ae6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 13:11:40 +0200
Subject: [PATCH 2795/2811] Bind the MarkdownService class in the Hyde service
 provider

---
 .../src/Framework/HydeServiceProvider.php      |  2 ++
 .../tests/Feature/HydeServiceProviderTest.php  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index c2896efdc9b..df67c1785df 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -11,6 +11,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Framework\Services\AssetService;
+use Hyde\Framework\Services\MarkdownService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Illuminate\Support\ServiceProvider;
@@ -31,6 +32,7 @@ public function register(): void
 
         $this->app->singleton(AssetService::class, AssetService::class);
         $this->app->singleton(BuildTaskService::class, BuildTaskService::class);
+        $this->app->bind(MarkdownService::class, MarkdownService::class);
 
         $this->kernel->setSourceRoot(Config::getString('hyde.source_root', ''));
 
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index 6904c5b11d6..adbd5a04812 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Services\MarkdownService;
 use Hyde\Framework\Features\Navigation\MainNavigationMenu;
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Illuminate\Contracts\Container\BindingResolutionException;
@@ -68,6 +69,23 @@ public function testProviderRegistersBuildTaskServiceAsSingleton()
         $this->assertSame($this->app->make(BuildTaskService::class), $this->app->make(BuildTaskService::class));
     }
 
+    public function testProviderRegistersMarkdownServiceAsBasicBinding()
+    {
+        $args = ['markdown' => 'foo'];
+
+        $this->assertTrue($this->app->bound(MarkdownService::class));
+        $this->assertInstanceOf(MarkdownService::class, $this->app->make(MarkdownService::class, $args));
+        $this->assertNotSame($this->app->make(MarkdownService::class, $args), $this->app->make(MarkdownService::class, $args));
+    }
+
+    public function testCanSwapMarkdownServiceBinding()
+    {
+        $this->app->bind(MarkdownService::class, fn () => 'foo');
+
+        $this->assertTrue($this->app->bound(MarkdownService::class));
+        $this->assertSame('foo', $this->app->make(MarkdownService::class));
+    }
+
     public function testProviderRegistersSourceDirectories()
     {
         BladePage::setSourceDirectory('');

From aa76b40edc6f3aeb4882e24a112f5399df11abfa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 13:32:22 +0200
Subject: [PATCH 2796/2811] Improve Markdown document testing

---
 .../tests/Unit/MarkdownDocumentTest.php       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/framework/tests/Unit/MarkdownDocumentTest.php b/packages/framework/tests/Unit/MarkdownDocumentTest.php
index ae88a4a464c..9fcd32d572f 100644
--- a/packages/framework/tests/Unit/MarkdownDocumentTest.php
+++ b/packages/framework/tests/Unit/MarkdownDocumentTest.php
@@ -108,4 +108,30 @@ public function testCarriageReturnsAreNormalized()
         $markdown = new Markdown("foo\nbar");
         $this->assertSame("foo\nbar", $markdown->body());
     }
+
+    public function testRender(): void
+    {
+        $html = Markdown::render('# Hello World!');
+
+        $this->assertIsString($html);
+        $this->assertSame("<h1>Hello World!</h1>\n", $html);
+    }
+
+    public function testRenderWithCustomHydeMarkdownFeatures()
+    {
+        $html = Markdown::render(<<<'MARKDOWN'
+        # Hello World
+        
+        >info Colored blockquote
+        
+        [Home](/_pages/index.blade.php)
+        MARKDOWN);
+
+        $this->assertSame(<<<'HTML'
+        <h1>Hello World</h1>
+        <blockquote class="info"><p>Colored blockquote</p></blockquote>
+        <p><a href="index.html">Home</a></p>
+
+        HTML, $html);
+    }
 }

From 45050ba1f451c154af84d3cbfda866ecda58154a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 13:36:46 +0200
Subject: [PATCH 2797/2811] Rename test to be more generic to match dual usage

Doesn't feel worth it to split out this test into two, so rename is better
---
 .../Unit/{MarkdownDocumentTest.php => MarkdownHelpersTest.php}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Unit/{MarkdownDocumentTest.php => MarkdownHelpersTest.php} (98%)

diff --git a/packages/framework/tests/Unit/MarkdownDocumentTest.php b/packages/framework/tests/Unit/MarkdownHelpersTest.php
similarity index 98%
rename from packages/framework/tests/Unit/MarkdownDocumentTest.php
rename to packages/framework/tests/Unit/MarkdownHelpersTest.php
index 9fcd32d572f..0d3ac1982cc 100644
--- a/packages/framework/tests/Unit/MarkdownDocumentTest.php
+++ b/packages/framework/tests/Unit/MarkdownHelpersTest.php
@@ -15,7 +15,7 @@
  * @covers \Hyde\Markdown\Models\MarkdownDocument
  * @covers \Hyde\Markdown\Models\Markdown
  */
-class MarkdownDocumentTest extends TestCase
+class MarkdownHelpersTest extends TestCase
 {
     public function testConstructorCreatesNewMarkdownDocument()
     {

From cfb8184332606969071bf52b868c6c20fcb8341f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 13:59:43 +0200
Subject: [PATCH 2798/2811] Revert "Rename test to be more generic to match
 dual usage"

This reverts commit 45050ba1f451c154af84d3cbfda866ecda58154a.
---
 .../Unit/{MarkdownHelpersTest.php => MarkdownDocumentTest.php}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Unit/{MarkdownHelpersTest.php => MarkdownDocumentTest.php} (98%)

diff --git a/packages/framework/tests/Unit/MarkdownHelpersTest.php b/packages/framework/tests/Unit/MarkdownDocumentTest.php
similarity index 98%
rename from packages/framework/tests/Unit/MarkdownHelpersTest.php
rename to packages/framework/tests/Unit/MarkdownDocumentTest.php
index 0d3ac1982cc..9fcd32d572f 100644
--- a/packages/framework/tests/Unit/MarkdownHelpersTest.php
+++ b/packages/framework/tests/Unit/MarkdownDocumentTest.php
@@ -15,7 +15,7 @@
  * @covers \Hyde\Markdown\Models\MarkdownDocument
  * @covers \Hyde\Markdown\Models\Markdown
  */
-class MarkdownHelpersTest extends TestCase
+class MarkdownDocumentTest extends TestCase
 {
     public function testConstructorCreatesNewMarkdownDocument()
     {

From 19b8b14dc3f1cea38091f8218644d70a6e5c3ab3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 13:59:52 +0200
Subject: [PATCH 2799/2811] Update the Markdown render method to get service
 from container

This allows it to be mocked in unit tests
---
 packages/framework/src/Markdown/Models/Markdown.php  |  5 ++++-
 packages/framework/tests/Unit/MarkdownFacadeTest.php | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Markdown/Models/Markdown.php b/packages/framework/src/Markdown/Models/Markdown.php
index e9c6c80c6a7..1d63f4fb1af 100644
--- a/packages/framework/src/Markdown/Models/Markdown.php
+++ b/packages/framework/src/Markdown/Models/Markdown.php
@@ -90,6 +90,9 @@ public static function fromFile(string $path): static
      */
     public static function render(string $markdown, ?string $pageClass = null): string
     {
-        return (new MarkdownService($markdown, $pageClass))->parse();
+        return app(MarkdownService::class, [
+            'markdown' => $markdown,
+            'pageClass' => $pageClass,
+        ])->parse();
     }
 }
diff --git a/packages/framework/tests/Unit/MarkdownFacadeTest.php b/packages/framework/tests/Unit/MarkdownFacadeTest.php
index 88903630f90..3f6a442e957 100644
--- a/packages/framework/tests/Unit/MarkdownFacadeTest.php
+++ b/packages/framework/tests/Unit/MarkdownFacadeTest.php
@@ -4,22 +4,27 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Mockery;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Markdown\Models\Markdown;
+use Hyde\Framework\Services\MarkdownService;
 
 /**
  * @covers \Hyde\Markdown\Models\Markdown
  */
 class MarkdownFacadeTest extends UnitTestCase
 {
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
-
     public function testRender(): void
     {
+        $mock = Mockery::mock(MarkdownService::class);
+        $mock->shouldReceive('parse')->once()->andReturn("<h1>Hello World!</h1>\n");
+        app()->bind(MarkdownService::class, fn () => $mock);
+
         $html = Markdown::render('# Hello World!');
 
         $this->assertIsString($html);
         $this->assertSame("<h1>Hello World!</h1>\n", $html);
+
+        Mockery::close();
     }
 }

From b47ad4a06615bbe1746acbe18f35e31bb18a0b6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 14:14:38 +0200
Subject: [PATCH 2800/2811] Rename test to be more generic to match dual usage

---
 .../Unit/{MarkdownDocumentTest.php => MarkdownHelpersTest.php}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Unit/{MarkdownDocumentTest.php => MarkdownHelpersTest.php} (98%)

diff --git a/packages/framework/tests/Unit/MarkdownDocumentTest.php b/packages/framework/tests/Unit/MarkdownHelpersTest.php
similarity index 98%
rename from packages/framework/tests/Unit/MarkdownDocumentTest.php
rename to packages/framework/tests/Unit/MarkdownHelpersTest.php
index 9fcd32d572f..0d3ac1982cc 100644
--- a/packages/framework/tests/Unit/MarkdownDocumentTest.php
+++ b/packages/framework/tests/Unit/MarkdownHelpersTest.php
@@ -15,7 +15,7 @@
  * @covers \Hyde\Markdown\Models\MarkdownDocument
  * @covers \Hyde\Markdown\Models\Markdown
  */
-class MarkdownDocumentTest extends TestCase
+class MarkdownHelpersTest extends TestCase
 {
     public function testConstructorCreatesNewMarkdownDocument()
     {

From 3982f6505fd668540bd85bcea7a7e9cc361a17a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 30 Jul 2024 14:16:37 +0200
Subject: [PATCH 2801/2811] Update RELEASE_NOTES.md

---
 RELEASE_NOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 86740ca0d9c..0970fc75495 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -59,6 +59,7 @@ This serves two purposes:
 - Moved the sidebar documentation to the documentation pages section for better organization.
 - The build command now groups together all `InMemoryPage` instances under one progress bar group in https://github.com/hydephp/develop/pull/1897
 - The `Markdown::render()` method will now always render Markdown using the custom HydePHP Markdown service (thus getting smart features like our Markdown processors) in https://github.com/hydephp/develop/pull/1900
+- Improved how the `MarkdownService` class is accessed, by binding it into the service container, in https://github.com/hydephp/develop/pull/1922
 
 ### Deprecated
 - for soon-to-be removed features.

From 5a569b322653aa3da4166f70cc8605a583fcac49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 20 Aug 2024 12:43:16 +0200
Subject: [PATCH 2802/2811] Update FileNotFoundException to support appending
 strings

---
 .../src/Framework/Exceptions/FileNotFoundException.php       | 4 ++--
 packages/framework/tests/Unit/CustomExceptionsTest.php       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Exceptions/FileNotFoundException.php b/packages/framework/src/Framework/Exceptions/FileNotFoundException.php
index 417a18e3ea7..434c3c582e4 100644
--- a/packages/framework/src/Framework/Exceptions/FileNotFoundException.php
+++ b/packages/framework/src/Framework/Exceptions/FileNotFoundException.php
@@ -17,8 +17,8 @@ class FileNotFoundException extends Exception
     /** @var int */
     protected $code = 404;
 
-    public function __construct(?string $path = null, ?string $customMessage = null)
+    public function __construct(?string $path = null, ?string $customMessage = null, ?string $appendAfterPath = '.')
     {
-        parent::__construct($customMessage ?? ($path ? sprintf('File [%s] not found.', Hyde::pathToRelative($path)) : $this->message));
+        parent::__construct($customMessage ?? ($path ? sprintf('File [%s] not found'.$appendAfterPath, Hyde::pathToRelative($path)) : $this->message));
     }
 }
diff --git a/packages/framework/tests/Unit/CustomExceptionsTest.php b/packages/framework/tests/Unit/CustomExceptionsTest.php
index 97927a1760b..d0ac2ae007d 100644
--- a/packages/framework/tests/Unit/CustomExceptionsTest.php
+++ b/packages/framework/tests/Unit/CustomExceptionsTest.php
@@ -62,6 +62,11 @@ public function testFileNotFoundExceptionWithCustomPath()
         $this->assertSame('foo', (new FileNotFoundException(customMessage: 'foo'))->getMessage());
     }
 
+    public function testFileNotFoundExceptionWithAppendAfterPath()
+    {
+        $this->assertSame('File [foo] not found!', (new FileNotFoundException('foo', null, '!'))->getMessage());
+    }
+
     public function testRouteNotFoundExceptionWithDefaultMessage()
     {
         $this->assertSame('Route not found.', (new RouteNotFoundException())->getMessage());

From be59948e073b6f0137e9ce1cd8447108ece58392 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 17:26:09 +0200
Subject: [PATCH 2803/2811] Update tests to use new render mocking helpers

---
 .../Services/Markdown/DynamicMarkdownLinkProcessorTest.php   | 5 +----
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php     | 4 +---
 packages/framework/tests/Unit/NavigationItemTest.php         | 2 +-
 packages/framework/tests/Unit/RenderHelperTest.php           | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
index 67acd7ffe39..3d9c2f60769 100644
--- a/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/DynamicMarkdownLinkProcessorTest.php
@@ -10,9 +10,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\UnitTestCase;
 use Hyde\Support\Models\Route;
-use Hyde\Support\Facades\Render;
 use Hyde\Foundation\Facades\Routes;
-use Hyde\Support\Models\RenderData;
 use Hyde\Markdown\Processing\DynamicMarkdownLinkProcessor;
 
 /**
@@ -24,13 +22,12 @@ class DynamicMarkdownLinkProcessorTest extends UnitTestCase
 {
     protected static bool $needsConfig = true;
     protected static bool $needsKernel = true;
+    protected static bool $needsRender = true;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        Render::swap(new RenderData());
-
         Routes::addRoute(new Route(new BladePage('index')));
         Routes::addRoute(new Route(new MarkdownPost('post')));
 
diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index 6dac17db2f5..d7d8efb0032 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -9,9 +9,7 @@
 use Hyde\Hyde;
 use Hyde\Support\Includes;
 use Hyde\Testing\UnitTestCase;
-use Hyde\Support\Facades\Render;
 use Illuminate\Support\HtmlString;
-use Hyde\Support\Models\RenderData;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Filesystem\Filesystem;
 use Hyde\Testing\MocksKernelFeatures;
@@ -27,6 +25,7 @@ class IncludesFacadeUnitTest extends UnitTestCase
 
     protected static bool $needsKernel = true;
     protected static bool $needsConfig = true;
+    protected static bool $needsRender = true;
 
     protected function setUp(): void
     {
@@ -36,7 +35,6 @@ protected function setUp(): void
 
         $this->setupTestKernel();
         $this->kernel->setRoutes(collect());
-        Render::swap(new RenderData());
     }
 
     protected function tearDown(): void
diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 22742802644..f9ac63f692b 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -35,7 +35,7 @@ public static function setUpBeforeClass(): void
 
     protected function setUp(): void
     {
-        Render::swap(new RenderData());
+        self::mockRender();
     }
 
     public function testConstruct()
diff --git a/packages/framework/tests/Unit/RenderHelperTest.php b/packages/framework/tests/Unit/RenderHelperTest.php
index ee0cc280ecb..be9d14076af 100644
--- a/packages/framework/tests/Unit/RenderHelperTest.php
+++ b/packages/framework/tests/Unit/RenderHelperTest.php
@@ -26,9 +26,8 @@ class RenderHelperTest extends UnitTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
+        self::mockRender();
 
-        Render::swap(new RenderData());
         View::swap(Mockery::mock(Factory::class)->makePartial());
     }
 

From cba42be989afdb272b906a4fb543dd0ed444ed97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 17:35:29 +0200
Subject: [PATCH 2804/2811] Refactor testing helper to be fluent

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 3 +--
 packages/testing/src/MocksKernelFeatures.php             | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index d7d8efb0032..f5536bd42f3 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -33,8 +33,7 @@ protected function setUp(): void
 
         Blade::swap(Mockery::mock());
 
-        $this->setupTestKernel();
-        $this->kernel->setRoutes(collect());
+        $this->setupTestKernel()->setRoutes(collect());
     }
 
     protected function tearDown(): void
diff --git a/packages/testing/src/MocksKernelFeatures.php b/packages/testing/src/MocksKernelFeatures.php
index 3f89d509021..3e942a12419 100644
--- a/packages/testing/src/MocksKernelFeatures.php
+++ b/packages/testing/src/MocksKernelFeatures.php
@@ -42,11 +42,13 @@ protected function withPages(array $pages): static
         return $this;
     }
 
-    protected function setupTestKernel(): void
+    protected function setupTestKernel(): TestKernel
     {
         $this->kernel = new TestKernel();
 
         HydeKernel::setInstance($this->kernel);
+
+        return $this->kernel;
     }
 }
 

From 46f1c9e2615bb318f765ca643c0aa334837a234c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 17:35:51 +0200
Subject: [PATCH 2805/2811] Simplify test setup

---
 packages/framework/tests/Unit/NavigationItemTest.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index f9ac63f692b..cc60362d26f 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -25,16 +25,11 @@
  */
 class NavigationItemTest extends UnitTestCase
 {
-    public static function setUpBeforeClass(): void
+    protected function setUp(): void
     {
-        self::$hasSetUpKernel = false;
 
         self::needsKernel();
         self::mockConfig();
-    }
-
-    protected function setUp(): void
-    {
         self::mockRender();
     }
 

From f41615df4fddd1be9bfdb93f3368ab1933422e98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 17:38:00 +0200
Subject: [PATCH 2806/2811] Update NavigationItemTest.php

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index cc60362d26f..d1da9d90355 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -27,6 +27,8 @@ class NavigationItemTest extends UnitTestCase
 {
     protected function setUp(): void
     {
+        // Todo: Figure out why in the world we need this
+        self::$hasSetUpKernel = false;
 
         self::needsKernel();
         self::mockConfig();

From 4005b75896c1fb1b04eb5f18dbcbabaae5b60f8e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 20:12:31 +0200
Subject: [PATCH 2807/2811] Try static

---
 packages/framework/tests/Unit/NavigationItemTest.php | 2 +-
 packages/testing/src/UnitTestCase.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index d1da9d90355..07e929f99c6 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -28,7 +28,7 @@ class NavigationItemTest extends UnitTestCase
     protected function setUp(): void
     {
         // Todo: Figure out why in the world we need this
-        self::$hasSetUpKernel = false;
+        static::$hasSetUpKernel = false;
 
         self::needsKernel();
         self::mockConfig();
diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index 764334bec74..3453e3a5267 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -21,7 +21,7 @@ abstract class UnitTestCase extends BaseTestCase
 
     protected static function needsKernel(): void
     {
-        if (! self::$hasSetUpKernel) {
+        if (! static::$hasSetUpKernel) {
             self::setupKernel();
         }
     }

From 1af6bca96d66bb0b8eba409cc75d62879b1b67a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 8 Sep 2024 20:15:17 +0200
Subject: [PATCH 2808/2811] Always reset kernel

---
 packages/framework/tests/Unit/NavigationItemTest.php | 4 +---
 packages/testing/src/UnitTestCase.php                | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index 07e929f99c6..c0893b864bc 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Hyde;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
@@ -27,9 +28,6 @@ class NavigationItemTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        // Todo: Figure out why in the world we need this
-        static::$hasSetUpKernel = false;
-
         self::needsKernel();
         self::mockConfig();
         self::mockRender();
diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index 3453e3a5267..76476a58935 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -21,9 +21,7 @@ abstract class UnitTestCase extends BaseTestCase
 
     protected static function needsKernel(): void
     {
-        if (! static::$hasSetUpKernel) {
             self::setupKernel();
-        }
     }
 
     public static function setUpBeforeClass(): void

From 9979c8479d0b268d05b36b9b668e1a72d0d96d1d Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 8 Sep 2024 18:15:28 +0000
Subject: [PATCH 2809/2811] Apply fixes from StyleCI

---
 packages/framework/tests/Unit/NavigationItemTest.php | 1 -
 packages/testing/src/UnitTestCase.php                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/NavigationItemTest.php b/packages/framework/tests/Unit/NavigationItemTest.php
index c0893b864bc..aab63b955cb 100644
--- a/packages/framework/tests/Unit/NavigationItemTest.php
+++ b/packages/framework/tests/Unit/NavigationItemTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Hyde;
 use Hyde\Foundation\Facades\Routes;
 use Hyde\Framework\Features\Navigation\NavigationItem;
 use Hyde\Pages\InMemoryPage;
diff --git a/packages/testing/src/UnitTestCase.php b/packages/testing/src/UnitTestCase.php
index 76476a58935..cc0bb811e34 100644
--- a/packages/testing/src/UnitTestCase.php
+++ b/packages/testing/src/UnitTestCase.php
@@ -21,7 +21,7 @@ abstract class UnitTestCase extends BaseTestCase
 
     protected static function needsKernel(): void
     {
-            self::setupKernel();
+        self::setupKernel();
     }
 
     public static function setUpBeforeClass(): void

From a0ca7f22eef5fb52b1704b406ec0144c65e3132f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Tue, 10 Sep 2024 18:05:34 +0200
Subject: [PATCH 2810/2811] Tear down using helper method

---
 packages/framework/tests/Unit/IncludesFacadeUnitTest.php | 2 +-
 packages/framework/tests/Unit/MarkdownFacadeTest.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
index f17d296a87e..072e6e710f7 100644
--- a/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
+++ b/packages/framework/tests/Unit/IncludesFacadeUnitTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        Mockery::close();
+        $this->verifyMockeryExpectations();
     }
 
     public function testPathReturnsTheIncludesDirectory()
diff --git a/packages/framework/tests/Unit/MarkdownFacadeTest.php b/packages/framework/tests/Unit/MarkdownFacadeTest.php
index 3f6a442e957..654a3e7f207 100644
--- a/packages/framework/tests/Unit/MarkdownFacadeTest.php
+++ b/packages/framework/tests/Unit/MarkdownFacadeTest.php
@@ -25,6 +25,6 @@ public function testRender(): void
         $this->assertIsString($html);
         $this->assertSame("<h1>Hello World!</h1>\n", $html);
 
-        Mockery::close();
+        $this->verifyMockeryExpectations();
     }
 }

From ebb9db82881c3fd9cf89bd81e5fad37ebb4790c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 5 Oct 2024 13:14:04 +0200
Subject: [PATCH 2811/2811] Rebuild documentation

---
 docs/architecture-concepts/the-hydekernel.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/architecture-concepts/the-hydekernel.md b/docs/architecture-concepts/the-hydekernel.md
index 9f470ed3835..4921cb88a37 100644
--- a/docs/architecture-concepts/the-hydekernel.md
+++ b/docs/architecture-concepts/the-hydekernel.md
@@ -58,7 +58,7 @@ But you could just as well chain the methods on the accessed kernel singleton in
 <section id="hyde-kernel-base-methods">
 
 <!-- Start generated docs for Hyde\Foundation\HydeKernel -->
-<!-- Generated by HydePHP DocGen script at 2024-07-08 20:47:38 in 2.89ms -->
+<!-- Generated by HydePHP DocGen script at 2024-07-09 07:44:59 in 3.36ms -->
 
 #### `version()`
 
@@ -89,7 +89,7 @@ Hyde::features(): Hyde\Facades\Features
 No description provided.
 
 ```php
-Hyde::hasFeature(Hyde\Enums\Feature|string $feature): bool
+Hyde::hasFeature(Hyde\Enums\Feature $feature): bool
 ```
 
 #### `toArray()`